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

Rhine: Improved chip detection

Browse Source 
git-svn-id: svn://kolibrios.org@9751 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2022-03-26 22:16:23 +00:00
parent fb9897efe0
commit 02ac56354e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/ethernet/rhine.asm
View File

@ -510,7 +510,8 @@ struct device ETH_DEVICE
pci_bus dd ? pci_bus dd ?
revision db ? revision db ?
irq_line db ? irq_line db ?
chip_id dw ? chip_vid dw ?
chip_did dw ?
cur_rx dw ? cur_rx dw ?
cur_tx dw ? cur_tx dw ?
@ -706,17 +707,18 @@ probe:
invoke PciWrite32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.command, eax invoke PciWrite32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.command, eax
; get device id ; get device id
invoke PciRead16, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.device_id invoke PciRead32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.vendor_id
mov [ebx + device.chip_id], ax mov dword[ebx + device.chip_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, 2*4
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]
@ -735,7 +737,7 @@ probe:
cmp al, 0x40 cmp al, 0x40
jb .below_x40 jb .below_x40
mov ax, [ebx + device.chip_id] mov ax, [ebx + device.chip_did]
DEBUGF 1, "Enabling Sticky Bit Workaround for Chip_id: 0x%x\n", ax DEBUGF 1, "Enabling Sticky Bit Workaround for Chip_id: 0x%x\n", ax
; clear sticky bit before reset & read ethernet address ; clear sticky bit before reset & read ethernet address
@ -892,7 +894,7 @@ end if
@@: @@:
; set MII 10 FULL ON, only apply in vt3043 ; set MII 10 FULL ON, only apply in vt3043
cmp [ebx + device.chip_id], 0x3043 cmp [ebx + device.chip_did], 0x3043
jne @f jne @f
stdcall WriteMII, 0x17, 1 shl 1, 1 stdcall WriteMII, 0x17, 1 shl 1, 1
@@: @@: