KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

AR81XX: Fix chip detection

Browse Source 
git-svn-id: svn://kolibrios.org@9750 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2022-03-26 22:03:07 +00:00
parent fe6931589b
commit fb9897efe0
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/ethernet/ar81xx.asm
View File

@ -319,17 +319,18 @@ probe:
invoke PciWrite16, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header.command, eax invoke PciWrite16, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header.command, eax
; get device ID ; get device ID
invoke PciRead16, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header.device_id invoke PciRead32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header.vendor_id
mov [ebx + device.pci_did], ax mov dword[ebx + device.pci_vid], eax
mov esi, chiplist mov esi, chiplist
.loop: .loop:
cmp word[esi+2], ax cmp dword[esi], eax
je .got_it je .got_it
add esi, 8 add esi, 8
cmp esi, chiplist + 6*8 cmp dword[esi], 0
jbe .loop jne .loop
DEBUGF 2, "Unknown chip: 0x%x, continuing anyway\n", ax DEBUGF 2, "Unknown chip: 0x%x, continuing anyway\n", eax
mov [ebx + device.name], my_service
jmp .done jmp .done
.got_it: .got_it:
mov eax, dword[esi+4] mov eax, dword[esi+4]
@ -2027,7 +2028,6 @@ chiplist:
dd (ALX_DEV_ID_E2400 shl 16) or ALX_VEN_ID, e2400_sz dd (ALX_DEV_ID_E2400 shl 16) or ALX_VEN_ID, e2400_sz
dd (ALX_DEV_ID_E2500 shl 16) or ALX_VEN_ID, e2500_sz dd (ALX_DEV_ID_E2500 shl 16) or ALX_VEN_ID, e2500_sz
dd (ALX_DEV_ID_AR8162 shl 16) or ALX_VEN_ID, ar8162_sz dd (ALX_DEV_ID_AR8162 shl 16) or ALX_VEN_ID, ar8162_sz
dd (ALX_DEV_ID_AR8152 shl 16) or ALX_VEN_ID, ar8152_sz
dd (ALX_DEV_ID_AR8171 shl 16) or ALX_VEN_ID, ar8171_sz dd (ALX_DEV_ID_AR8171 shl 16) or ALX_VEN_ID, ar8171_sz
dd (ALX_DEV_ID_AR8172 shl 16) or ALX_VEN_ID, ar8172_sz dd (ALX_DEV_ID_AR8172 shl 16) or ALX_VEN_ID, ar8172_sz
dd 0 dd 0
@ -2040,7 +2040,6 @@ ar8152_1_sz db "AR8152 rev1", 0
ar8152_2_sz db "AR8152 rev2", 0 ar8152_2_sz db "AR8152 rev2", 0
ar8161_sz db "AR8161", 0 ar8161_sz db "AR8161", 0
ar8162_sz db "AR8162", 0 ar8162_sz db "AR8162", 0
ar8152_sz db "AR8152", 0
ar8171_sz db "QCA8171", 0 ar8171_sz db "QCA8171", 0
ar8172_sz db "QCA8172", 0 ar8172_sz db "QCA8172", 0
e2200_sz db "Killer E2200", 0 e2200_sz db "Killer E2200", 0

1
drivers/ethernet/ar81xx.inc
View File

@ -11,7 +11,6 @@ ALX_DEV_ID_E2200 = 0xe091
ALX_DEV_ID_E2400 = 0xe0a1 ALX_DEV_ID_E2400 = 0xe0a1
ALX_DEV_ID_E2500 = 0xe0b1 ALX_DEV_ID_E2500 = 0xe0b1
ALX_DEV_ID_AR8162 = 0x1090 ALX_DEV_ID_AR8162 = 0x1090
ALX_DEV_ID_AR8152 = 0x2062
ALX_DEV_ID_AR8171 = 0x10A1 ALX_DEV_ID_AR8171 = 0x10A1
ALX_DEV_ID_AR8172 = 0x10A0 ALX_DEV_ID_AR8172 = 0x10A0