Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4333 → Rev 4334

/drivers/ethernet/3c59x.asm
2228,7 → 2228,7
set_io REG_MASTER_STATUS
in ax, dx
test ah, 0x80
jnz .finish ; no DMA for sending
jnz .fail ; no DMA for sending
; program frame address to be sent
set_io REG_MASTER_ADDRESS
mov eax, [esp+4]
2244,12 → 2244,14
mov ax, (10100b shl 11) + 1 ; StartDMADown
out dx, ax
.finish:
call KernelFree
add esp, 4
ret
xor eax, eax
ret 8
 
.fail:
stdcall KernelFree, [esp+4]
or eax, -1
ret 8
 
 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Transmit (boomerang) ;;
/drivers/ethernet/R6040.asm
823,6 → 823,8
dec eax
.fail:
DEBUGF 1,"Send failed\n"
stdcall KernelFree, [esp+4]
or eax, -1
ret 8
 
 
/drivers/ethernet/RTL8029.asm
729,9 → 729,8
 
.err:
DEBUGF 2, "Transmit error!\n"
 
stdcall KernelFree, [esp+4]
or eax, -1
stdcall KernelFree, [esp+4]
ret 8
 
 
/drivers/ethernet/RTL8169.asm
633,7 → 633,7
call read_mac
call PHY_config
 
; DEBUGF 1,"K : Set MAC Reg C+CR Offset 0x82h = 0x01h\n"
DEBUGF 1,"Set MAC Reg C+CR Offset 0x82h = 0x01h\n"
set_io 0
set_io 0x82
mov al, 0x01
640,16 → 640,16
out dx, al
cmp [tpc.mcfg], MCFG_METHOD_03
jae @f
; DEBUGF 1,"K : Set PCI Latency=0x40\n"
; stdcall pci_write_config_byte,PCI_LATENCY_TIMER,0x40
DEBUGF 1,"Set PCI Latency=0x40\n"
PCI_adjust_latency 0x40
@@:
cmp [tpc.mcfg], MCFG_METHOD_02
jne @f
; DEBUGF 1,"K : Set MAC Reg C+CR Offset 0x82h = 0x01h\n"
DEBUGF 1,"Set MAC Reg C+CR Offset 0x82h = 0x01h\n"
set_io 0x82
mov al, 0x01
out dx, al
; DEBUGF 1,"K : Set PHY Reg 0x0bh = 0x00h\n"
DEBUGF 1,"Set PHY Reg 0x0bh = 0x00h\n"
WRITE_GMII_REG 0x0b, 0x0000 ; w 0x0b 15 0 0
@@:
; if TBI is not enabled
1103,8 → 1103,8
 
.fail:
DEBUGF 1,"transmit failed\n"
stdcall KernelFree, [esp+4]
or eax, -1
stdcall KernelFree, [esp+4]
ret 8
 
 
1122,7 → 1122,7
 
push ebx esi edi
 
DEBUGF 1,"\n%s int\n", my_service
DEBUGF 1,"INT\n"
 
; find pointer of device wich made IRQ occur
 
/drivers/ethernet/bcm57xx.asm
352,10 → 352,13
add dword [device.bytes_tx], eax
adc dword [device.bytes_tx + 4], 0
 
xor eax, eax
ret 8
 
.fail:
DEBUGF 1,"Send failed\n"
stdcall KernelFree, [esp+4]
or eax, -1
ret 8
 
 
/drivers/ethernet/dec21x4x.asm
622,7 → 622,7
stdcall AttachIntHandler, eax, int_handler, dword 0
test eax, eax
jnz @f
DEBUGF 1,"\nCould not attach int handler!\n"
DEBUGF 2,"Could not attach int handler!\n"
; or eax, -1
; ret
@@:
1010,8 → 1010,8
 
.fail:
DEBUGF 1,"transmit failed\n"
stdcall KernelFree, [esp+4]
or eax, -1
stdcall KernelFree, [esp+4]
ret 8
 
 
/drivers/ethernet/forcedeth.asm
1843,8 → 1843,8
ret 8
 
.fail:
xor eax, eax
inc eax
stdcall KernelFree, [esp+4]
or eax, -1
ret 8
 
 
/drivers/ethernet/i8254x.asm
656,7 → 656,6
cmp dword [esp + 8], 60
jb .fail
 
 
; Program the descriptor (use legacy mode)
lea edi, [device.tx_desc] ; Transmit Descriptor Base Address
mov dword [edi + 16], eax ; Store the data location (for driver)
680,10 → 679,13
add dword [device.bytes_tx], eax
adc dword [device.bytes_tx + 4], 0
 
xor eax, eax
ret 8
 
.fail:
DEBUGF 2,"Send failed\n"
stdcall KernelFree, [esp+4]
or eax, -1
ret 8
 
 
/drivers/ethernet/mtd80x.asm
1062,8 → 1062,8
 
.fail:
DEBUGF 1,"transmit failed\n"
stdcall KernelFree, [esp + 4]
or eax, -1
stdcall KernelFree, [esp + 4]
ret 8
 
 
/drivers/ethernet/rhine.asm
1461,6 → 1461,7
 
.fail:
DEBUGF 2, "Transmit Failed!\n"
stdcall KernelFree, [esp+4]
or eax, -1 ; Transmit failed
ret 8