Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9751 → Rev 9750

/drivers/ethernet/rhine.asm
510,8 → 510,7
pci_bus dd ?
revision db ?
irq_line db ?
chip_vid dw ?
chip_did dw ?
chip_id dw ?
 
cur_rx dw ?
cur_tx dw ?
707,18 → 706,17
invoke PciWrite32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.command, eax
 
; get device id
invoke PciRead32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.vendor_id
mov dword[ebx + device.chip_vid], eax
invoke PciRead16, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.device_id
mov [ebx + device.chip_id], ax
 
mov esi, chiplist
.loop:
cmp dword[esi], eax
cmp word[esi+2], ax
je .got_it
add esi, 2*4
cmp dword[esi], 0
jne .loop
DEBUGF 2, "Unknown chip: 0x%x, continuing anyway\n", eax
mov [ebx + device.name], my_service
add esi, 8
cmp esi, chiplist + 6*8
jbe .loop
DEBUGF 2, "Unknown chip: 0x%x, continuing anyway\n", ax
jmp .done
.got_it:
mov eax, dword[esi+4]
737,7 → 735,7
cmp al, 0x40
jb .below_x40
 
mov ax, [ebx + device.chip_did]
mov ax, [ebx + device.chip_id]
DEBUGF 1, "Enabling Sticky Bit Workaround for Chip_id: 0x%x\n", ax
 
; clear sticky bit before reset & read ethernet address
894,7 → 892,7
@@:
 
; set MII 10 FULL ON, only apply in vt3043
cmp [ebx + device.chip_did], 0x3043
cmp [ebx + device.chip_id], 0x3043
jne @f
stdcall WriteMII, 0x17, 1 shl 1, 1
@@: