badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fixed bug in PCNET32 driver which allowed it to be loaded multiple times.

Browse Source 
git-svn-id: svn://kolibrios.org@4629 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-03-11 14:29:10 +00:00
parent 0a1d397ded
commit 3e0422f2aa
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ethernet/RTL8029.asm
View File

@ -1183,12 +1183,12 @@ PIO_write:
;all initialized data place here ; place all initialized data here
align 4 align 4
devices dd 0 devices dd 0
version dd (DRIVER_VERSION shl 16) or (API_VERSION and 0xFFFF) version dd (DRIVER_VERSION shl 16) or (API_VERSION and 0xFFFF)
my_service db 'RTL8029',0 ;max 16 chars include zero my_service db 'RTL8029',0 ; max 16 chars include zero
;device_1 db 'Realtek 8029',0 ;device_1 db 'Realtek 8029',0
;device_2 db 'Realtek 8019',0 ;device_2 db 'Realtek 8019',0
@ -1198,7 +1198,8 @@ my_service db 'RTL8029',0 ;max 16 chars include zero
include_debug_strings include_debug_strings
section '.data' data readable writable align 16 ;place all uninitialized data place here section '.data' data readable writable align 16
; place all uninitialized data here
device_list rd MAX_DEVICES device_list rd MAX_DEVICES

2
drivers/ethernet/i8255x.asm
View File

@ -1181,7 +1181,7 @@ end data
include '../peimport.inc' include '../peimport.inc'
my_service db 'i8255x', 0 ; max 16 chars include zero my_service db 'I8255X', 0 ; max 16 chars include zero
devicename db 'Intel Etherexpress pro/100', 0 devicename db 'Intel Etherexpress pro/100', 0
confcmd_data db 22, 0x08, 0, 0, 0, 0x80, 0x32, 0x03, 1 confcmd_data db 22, 0x08, 0, 0, 0, 0x80, 0x32, 0x03, 1

2
drivers/ethernet/mtd80x.asm
View File

@ -494,7 +494,7 @@ 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
; Check vendor/device id's ; Check vendor/device id's
invoke PciRead32, [ebx + device.pci_bus], [ebx + device.pci_dev], 0 invoke PciRead32, [ebx + device.pci_bus], [ebx + device.pci_dev], 0
cmp ax, 0x1516 cmp ax, 0x1516
jne .notfound jne .notfound
shr eax, 16 shr eax, 16

2
drivers/ethernet/pcnet32.asm
View File

@ -1527,7 +1527,7 @@ end data
include '../peimport.inc' include '../peimport.inc'
my_service db 'PCnet',0 ; max 16 chars include zero my_service db 'PCNET32',0 ; max 16 chars include zero
device_l2 db "PCnet/PCI 79C970",0 device_l2 db "PCnet/PCI 79C970",0
device_l4 db "PCnet/PCI II 79C970A",0 device_l4 db "PCnet/PCI II 79C970A",0