From 373d7e9391e527615a86ca38e56d8ff1a5119bc1 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Sun, 4 Oct 2009 11:07:25 +0000 Subject: [PATCH] add support for more network cards to forcedeth driver git-svn-id: svn://kolibrios.org@1194 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../network/eth_drv/drivers/forcedeth.inc | 49 +++++++++++-------- kernel/trunk/network/eth_drv/ethernet.inc | 26 +++++++++- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/kernel/trunk/network/eth_drv/drivers/forcedeth.inc b/kernel/trunk/network/eth_drv/drivers/forcedeth.inc index fad665d023..a520b9b0db 100644 --- a/kernel/trunk/network/eth_drv/drivers/forcedeth.inc +++ b/kernel/trunk/network/eth_drv/drivers/forcedeth.inc @@ -925,19 +925,26 @@ forcedeth_probe: mov edi, eax mov eax, dword [edi+NvRegMacAddrA] mov dword [forcedeth_orig_mac0], eax - mov eax, dword [edi+NvRegMacAddrB] - mov dword [forcedeth_orig_mac1], eax + mov edx, dword [edi+NvRegMacAddrB] + mov dword [forcedeth_orig_mac1], edx ; save MAC-address to global variable node_addr - mov ecx, MAC_ADDR_LEN - xor ebx, ebx - mov edx, forcedeth_orig_mac0 - add edx, (MAC_ADDR_LEN-1) -@@: mov al, byte [edx] - mov byte [node_addr+ebx], al - inc ebx - dec edx - loop @b + mov dword [node_addr], eax + mov word [node_addr+4], dx + + ; reverse if desired + cmp word [forcedeth_device_id], 0x03E5 + jae .no_reverse_mac + mov al, byte [node_addr] + xchg al, byte [node_addr+5] + mov byte [node_addr], al + mov al, byte [node_addr+1] + xchg al, byte [node_addr+4] + mov byte [node_addr+4], al + mov al, byte [node_addr+2] + xchg al, byte [node_addr+3] + mov byte [node_addr+3], al +.no_reverse_mac: ; DEBUGF 1," K : FORCEDETH: orig_mac0= 0x%x\n", [forcedeth_orig_mac0]:8 ; DEBUGF 1," K : FORCEDETH: orig_mac1= 0x%x\n", [forcedeth_orig_mac1]:8 @@ -1015,16 +1022,18 @@ forcedeth_probe: jmp .end_switch .next_0x0268: +; cmp word [forcedeth_device_id], 0x0268 +; je @f +; cmp word [forcedeth_device_id], 0x0269 +; je @f +; cmp word [forcedeth_device_id], 0x0372 +; je @f +; cmp word [forcedeth_device_id], 0x0373 +; je @f +; jmp .default_switch +;@@: cmp word [forcedeth_device_id], 0x0268 - je @f - cmp word [forcedeth_device_id], 0x0269 - je @f - cmp word [forcedeth_device_id], 0x0372 - je @f - cmp word [forcedeth_device_id], 0x0373 - je @f - jmp .default_switch -@@: + jb .default_switch ; pci_read_config_byte(pci, PCI_REVISION_ID, &revision_id); mov al, 0 ; byte mov bh, [pci_dev] diff --git a/kernel/trunk/network/eth_drv/ethernet.inc b/kernel/trunk/network/eth_drv/ethernet.inc index e85c0b69b2..d113aaecb0 100644 --- a/kernel/trunk/network/eth_drv/ethernet.inc +++ b/kernel/trunk/network/eth_drv/ethernet.inc @@ -215,7 +215,31 @@ dd 0x026810de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_trans dd 0x026910de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested dd 0x037210de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested dd 0x037310de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested - +dd 0x03e510de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x03e610de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x03ee10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x03ef10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x045010de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x045110de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x045210de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x045310de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x054c10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x054d10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x054e10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x054f10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x07dc10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x07dd10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x07de10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x07df10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x076010de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; MCP77 Ethernet Controller +dd 0x076110de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x076210de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x076310de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x0ab010de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x0ab110de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x0ab210de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x0ab310de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested +dd 0x0d7d10de, forcedeth_probe, forcedeth_reset, forcedeth_poll, forcedeth_transmit, forcedeth_cable ; not tested rb PCICARDS_ENTRY_SIZE ; end of list marker, do not remove endg