Fix EN typos
- Corrections for en_US language. - Some whitespace sanitation. git-svn-id: svn://kolibrios.org@10065 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
a53bea545e
commit
c7231e7d53
@ -430,12 +430,12 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
; This device doesn't have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -457,7 +457,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
@ -693,7 +693,7 @@ probe:
|
||||
|
||||
DEBUGF 1,"Waiting for NIC to boot..\n"
|
||||
; wait for 2 seconds for NIC to boot
|
||||
mov esi, 2000 ; WTF? FIXME
|
||||
mov esi, 2000 ; Hack!? FIXME
|
||||
invoke Sleep ; 2 seconds
|
||||
|
||||
DEBUGF 1,"Ok!\n"
|
||||
@ -2390,7 +2390,7 @@ write_mac:
|
||||
mov ax, SELECT_REGISTER_WINDOW+2
|
||||
out dx, ax
|
||||
|
||||
; write MAC addres back into the station address registers
|
||||
; write MAC address back into the station address registers
|
||||
set_io [ebx + device.io_addr], REG_STATION_ADDRESS_LO
|
||||
lea esi, [ebx + device.mac]
|
||||
outsw
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; R6040 driver for KolibriOS ;;
|
||||
@ -269,7 +269,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte [eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -285,13 +285,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -313,7 +313,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2015. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; RTL8029/ne2000 driver for KolibriOS ;;
|
||||
@ -234,7 +234,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
@ -248,7 +248,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
@ -841,7 +841,7 @@ int_handler:
|
||||
|
||||
; calculate packet length in ecx
|
||||
shr ecx, 16
|
||||
sub ecx, 4 ; CRC doesnt count as data byte
|
||||
sub ecx, 4 ; CRC doesn't count as data byte
|
||||
mov edi, [esp+4]
|
||||
mov [edi + NET_BUFF.length], ecx
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; Realtek 8139 driver for KolibriOS ;;
|
||||
@ -286,7 +286,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte [eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -301,13 +301,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -329,7 +329,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
@ -794,9 +794,9 @@ int_handler:
|
||||
mov [eax + NET_BUFF.device], ebx
|
||||
mov [eax + NET_BUFF.offset], NET_BUFF.data
|
||||
|
||||
lea edi, [eax + NET_BUFF.data] ; Where we will copy too
|
||||
lea edi, [eax + NET_BUFF.data] ; Where we will copy to
|
||||
mov esi, [esp] ; The buffer we will copy from
|
||||
add esi, 4 ; Dont copy CRC
|
||||
add esi, 4 ; Don't copy CRC
|
||||
|
||||
push .abort ; return addr for Eth_input
|
||||
push eax ; buffer ptr for Eth_input
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; RTL8169 driver for KolibriOS ;;
|
||||
@ -426,7 +426,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte [eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -442,13 +442,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -470,7 +470,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
@ -1187,7 +1187,7 @@ int_handler:
|
||||
push ebx
|
||||
push .rx_loop
|
||||
and ecx, 0x00001FFF
|
||||
add ecx, -4 ; we dont need CRC
|
||||
add ecx, -4 ; we don't need CRC
|
||||
DEBUGF 1,"data length = %u\n", ecx
|
||||
mov eax, [esi + rx_desc.buf_soft_addr]
|
||||
push eax
|
||||
|
@ -423,7 +423,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; FORCEDETH.INC ;;
|
||||
@ -457,7 +457,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte [eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -473,13 +473,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte [ebx + device.pci_bus] ; compare with pci and device num in device list (notice the usage of word instead of byte)
|
||||
jne @f
|
||||
cmp ah, byte [ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -581,7 +581,7 @@ probe:
|
||||
invoke PciWrite8, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.max_latency, eax
|
||||
@@:
|
||||
|
||||
; Now, it's time to find the base mmio addres of the PCI device
|
||||
; Now, it's time to find the base mmio address of the PCI device
|
||||
stdcall PCI_find_mmio, [ebx + device.pci_bus], [ebx + device.pci_dev] ; returns in eax
|
||||
test eax, eax
|
||||
jnz @f
|
||||
@ -622,7 +622,7 @@ probe:
|
||||
; disable WOL
|
||||
mov [WakeUpFlags], 0
|
||||
mov [ebx + device.wolenabled], 0
|
||||
|
||||
|
||||
mov [ebx + device.txflags], (NV_TX2_LASTPACKET or NV_TX2_VALID)
|
||||
cmp [ebx + device.desc_ver], DESC_VER_1
|
||||
jne @f
|
||||
@ -715,7 +715,7 @@ probe:
|
||||
|
||||
; DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ
|
||||
mov [ebx + device.irqmask], (IRQMASK_WANTED_2 or IRQ_TIMER) ; was 0
|
||||
|
||||
|
||||
mov [ebx + device.needs_mac_reset], 1
|
||||
cmp [ebx + device.desc_ver], DESC_VER_1
|
||||
jne @f
|
||||
@ -767,7 +767,7 @@ probe:
|
||||
|
||||
; PHY in isolate mode? No phy attached and user wants to test loopback?
|
||||
; Very odd, but can be correct.
|
||||
|
||||
|
||||
DEBUGF 2,"Could not find a valid PHY.\n"
|
||||
jmp .no_phy
|
||||
|
||||
@ -791,7 +791,7 @@ probe:
|
||||
je @f
|
||||
call mac_reset
|
||||
@@:
|
||||
|
||||
|
||||
;***************************************************************************
|
||||
; Function
|
||||
; reset
|
||||
@ -870,7 +870,7 @@ reset:
|
||||
mov [MIIStatus], MIISTAT_MASK2
|
||||
|
||||
;
|
||||
|
||||
|
||||
mov [Misc1], (MISC1_FORCE or MISC1_HD)
|
||||
|
||||
mov eax, [TransmitterStatus]
|
||||
@ -907,7 +907,7 @@ reset:
|
||||
mov [MIISpeed], (MIISPEED_BIT8 or MIIDELAY)
|
||||
mov [UnknownSetupReg4], UNKSETUP4_VAL
|
||||
mov [WakeUpFlags], WAKEUPFLAGS_VAL
|
||||
|
||||
|
||||
or [PowerState], POWERSTATE_POWEREDUP
|
||||
call pci_push
|
||||
|
||||
@ -937,7 +937,7 @@ reset:
|
||||
mov [PacketFilterFlags], (PFF_ALWAYS or PFF_MYADDR)
|
||||
|
||||
call set_multicast
|
||||
|
||||
|
||||
; One manual link speed update: Interrupts are enabled, future link
|
||||
; speed changes cause interrupts and are handled by nv_link_irq().
|
||||
|
||||
@ -1097,7 +1097,7 @@ endp
|
||||
phy_init:
|
||||
|
||||
push ebx ecx
|
||||
|
||||
|
||||
; set advertise register
|
||||
mov edx, [ebx + device.phyaddr]
|
||||
mov eax, MII_ADVERTISE
|
||||
@ -1128,7 +1128,7 @@ phy_init:
|
||||
mov eax, MII_BMSR
|
||||
mov ecx, MII_READ
|
||||
call mii_rw
|
||||
|
||||
|
||||
test eax, PHY_GIGABIT
|
||||
jnz .gigabit
|
||||
mov [ebx + device.gigabit], 0
|
||||
@ -1140,7 +1140,7 @@ phy_init:
|
||||
mov eax, MII_CTRL1000
|
||||
mov ecx, MII_READ
|
||||
call mii_rw
|
||||
|
||||
|
||||
and eax, (not ADVERTISE_1000HALF)
|
||||
|
||||
test [PhyInterface], PHY_RGMII
|
||||
@ -1223,11 +1223,11 @@ phy_init:
|
||||
|
||||
cmp [ebx + device.phy_oui], PHY_OUI_CICADA
|
||||
jne .restart
|
||||
|
||||
|
||||
mov eax, MII_SREVISION
|
||||
mov ecx, MII_READ
|
||||
call mii_rw
|
||||
|
||||
|
||||
or eax, PHY_INIT6
|
||||
mov ecx, eax
|
||||
mov eax, MII_SREVISION
|
||||
@ -1411,7 +1411,7 @@ init_ring:
|
||||
pop ecx
|
||||
dec ecx
|
||||
jnz .rx_loop
|
||||
|
||||
|
||||
pop ecx esi
|
||||
|
||||
xor eax, eax
|
||||
@ -1565,7 +1565,7 @@ update_linkspeed:
|
||||
DEBUGF 1,"update linkspeed\n"
|
||||
|
||||
; BMSR_LSTATUS is latched, read it twice: we want the current value.
|
||||
|
||||
|
||||
mov edx, [ebx + device.phyaddr]
|
||||
mov eax, MII_BMSR
|
||||
mov ecx, MII_READ
|
||||
@ -1574,7 +1574,7 @@ update_linkspeed:
|
||||
mov eax, MII_BMSR
|
||||
mov ecx, MII_READ
|
||||
call mii_rw
|
||||
|
||||
|
||||
test ax, BMSR_LSTATUS ; Link up?
|
||||
jz .no_link
|
||||
|
||||
@ -1684,10 +1684,10 @@ set_speed:
|
||||
|
||||
.update:
|
||||
DEBUGF 1,"update_linkspeed: changing link to 0x%x/XD.\n", ecx
|
||||
|
||||
|
||||
mov [ebx + device.duplex], eax
|
||||
mov [ebx + device.linkspeed], ecx
|
||||
|
||||
|
||||
cmp [ebx + device.gigabit], PHY_GIGABIT
|
||||
jne .no_gigabit
|
||||
|
||||
@ -1740,7 +1740,7 @@ set_speed:
|
||||
|
||||
.end_if5:
|
||||
mov [PhyInterface], ecx
|
||||
|
||||
|
||||
cmp [ebx + device.duplex], 0
|
||||
je @f
|
||||
xor ecx, ecx
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; i8254x driver for KolibriOS ;;
|
||||
@ -343,7 +343,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte[eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -359,13 +359,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne .next
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
.next:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -387,7 +387,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base mmio addres of the PCI device
|
||||
; Now, it's time to find the base mmio address of the PCI device
|
||||
|
||||
stdcall PCI_find_mmio, [ebx + device.pci_bus], [ebx + device.pci_dev] ; returns in eax
|
||||
test eax, eax
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; MTD80x driver for KolibriOS ;;
|
||||
@ -344,7 +344,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte [eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -360,13 +360,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -388,7 +388,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
@ -1084,7 +1084,7 @@ int_handler:
|
||||
|
||||
mov ecx, [esi + descriptor.status]
|
||||
shr ecx, FLNGShift
|
||||
sub ecx, 4 ; we dont need CRC
|
||||
sub ecx, 4 ; we don't need CRC
|
||||
DEBUGF 1,"Received %u bytes\n", ecx
|
||||
mov eax, [esi + descriptor.skbuff]
|
||||
push eax
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; AMD PCnet driver for KolibriOS ;;
|
||||
@ -417,7 +417,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
|
||||
mov eax, [edx + IOCTL.input]
|
||||
cmp byte[eax], 1 ; 1 means device number and bus number (pci) are given
|
||||
jne .fail ; other types arent supported for this card yet
|
||||
jne .fail ; other types aren't supported for this card yet
|
||||
|
||||
; check if the device is already listed
|
||||
|
||||
@ -433,12 +433,12 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
; This device doesnt have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
@ -461,7 +461,7 @@ proc service_proc stdcall, ioctl:dword
|
||||
movzx ecx, byte[eax+2]
|
||||
mov [ebx + device.pci_dev], ecx
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
@ -1160,14 +1160,14 @@ int_handler:
|
||||
|
||||
test ax, RXSTAT_OWN ; If this bit is set, the controller OWN's the packet, if not, we do
|
||||
jnz .rx_done
|
||||
; Both Start of packet and End of packet bits should be set, we dont support multi frame packets
|
||||
; Both Start of packet and End of packet bits should be set, we don't support multi frame packets
|
||||
test ax, RXSTAT_ENP
|
||||
jz .rx_drop
|
||||
test ax, RXSTAT_STP
|
||||
jz .rx_drop
|
||||
|
||||
movzx ecx, [edi + descriptor.msg_length] ; get packet length in ecx
|
||||
sub ecx, 4 ; We dont need the CRC
|
||||
sub ecx, 4 ; We don't need the CRC
|
||||
DEBUGF 1,"Got %u bytes\n", ecx
|
||||
|
||||
; Set pointers for ETH_input
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2010-2021. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2010-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; rhine.asm ;;
|
||||
@ -600,13 +600,13 @@ proc service_proc stdcall, ioctl:dword
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
|
||||
|
||||
; This device doesn't have its own eth_device structure yet, lets create one
|
||||
; This device doesn't have its own eth_device structure yet, let's create one
|
||||
.firstdevice:
|
||||
cmp [devices], MAX_DEVICES ; First check if the driver can handle one more card
|
||||
jae .fail
|
||||
@ -1533,7 +1533,7 @@ int_handler:
|
||||
lea edi, [ebx + device.rx_ring]
|
||||
add edi, eax
|
||||
|
||||
; Check it's status
|
||||
; Check its status
|
||||
test [edi + rx_head.status], RX_SBITS_OWN_BIT
|
||||
jnz .not_RX
|
||||
|
||||
@ -1545,7 +1545,7 @@ int_handler:
|
||||
mov ecx, [edi + rx_head.status]
|
||||
and ecx, RX_SBITS_FRAME_LENGTH
|
||||
shr ecx, 16
|
||||
sub ecx, 4 ; We dont want CRC
|
||||
sub ecx, 4 ; We don't want CRC
|
||||
|
||||
; Update stats
|
||||
add dword [ebx + device.bytes_rx], ecx
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2015. All rights reserved. ;;
|
||||
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||
;; Distributed under terms of the GNU General Public License ;;
|
||||
;; ;;
|
||||
;; Ethernet driver for KolibriOS ;;
|
||||
@ -321,7 +321,7 @@ service_proc:
|
||||
cmp al, byte[ebx + device.pci_bus]
|
||||
jne @f
|
||||
cmp ah, byte[ebx + device.pci_dev]
|
||||
je .find_devicenum ; Device is already loaded, let's find it's device number
|
||||
je .find_devicenum ; Device is already loaded, let's find its device number
|
||||
@@:
|
||||
add esi, 4
|
||||
loop .nextdevice
|
||||
@ -345,10 +345,10 @@ service_proc:
|
||||
mov [ebx + device.unload], unload
|
||||
mov [ebx + device.name], my_service
|
||||
|
||||
; 4k. Now, it's time to find the base io addres of the PCI device
|
||||
; 4k. Now, it's time to find the base io address of the PCI device
|
||||
; TODO: implement check if bus and dev exist on this machine
|
||||
|
||||
; Now, it's time to find the base io addres of the PCI device
|
||||
; Now, it's time to find the base io address of the PCI device
|
||||
stdcall PCI_find_io, [ebx + device.pci_bus], [ebx + device.pci_dev]
|
||||
mov [ebx + device.io_addr], eax
|
||||
|
||||
@ -491,7 +491,7 @@ reset:
|
||||
DEBUGF 2,"Could not attach int handler!\n"
|
||||
or eax, -1
|
||||
ret
|
||||
@@:
|
||||
@@:
|
||||
|
||||
;--------------------------------------------
|
||||
; Disable Interrupts and reset Receive Filter
|
||||
|
Loading…
Reference in New Issue
Block a user