diff options
| author | Michael Brown | 2007-07-14 16:42:26 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-07-14 16:42:26 +0200 |
| commit | e330db3c749c3ee638e8d652c5c3ae08c13af8e5 (patch) | |
| tree | a69cefca27d7abe7863b87cb765ab55e26bd0fc5 /src/drivers/net/sis900.c | |
| parent | Be more aggressive in attempts to enable A20, now that we have the (diff) | |
| download | ipxe-e330db3c749c3ee638e8d652c5c3ae08c13af8e5.tar.gz ipxe-e330db3c749c3ee638e8d652c5c3ae08c13af8e5.tar.xz ipxe-e330db3c749c3ee638e8d652c5c3ae08c13af8e5.zip | |
Dead code removal.
Kill off use of etherboot.h outside drivers/net.
Diffstat (limited to 'src/drivers/net/sis900.c')
| -rw-r--r-- | src/drivers/net/sis900.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c index 7e15f6d0..68ac511b 100644 --- a/src/drivers/net/sis900.c +++ b/src/drivers/net/sis900.c @@ -44,7 +44,6 @@ /* Includes */ #include "etherboot.h" -#include "dev.h" #include <gpxe/pci.h> #include "nic.h" #include "timer.h" @@ -250,22 +249,19 @@ static int sis96x_get_mac_addr(struct pci_device * pci_dev __unused, struct nic static int sis630e_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic) { +#if 0 u8 reg; int i; -#if 0 struct bus_loc bus_loc; -#endif union { struct bus_dev bus_dev; struct pci_device isa_bridge; } u; -#if 0 /* find PCI to ISA bridge */ memset(&bus_loc, 0, sizeof(bus_loc)); if ( ! find_by_driver ( &bus_loc, &u.bus_dev, &sis_bridge_driver, 0 ) ) return 0; -#endif pci_read_config_byte(&u.isa_bridge, 0x48, ®); pci_write_config_byte(&u.isa_bridge, 0x48, reg | 0x40); @@ -278,6 +274,11 @@ static int sis630e_get_mac_addr(struct pci_device * pci_dev __unused, struct nic pci_write_config_byte(&u.isa_bridge, 0x48, reg & ~0x40); return 1; +#endif + + /* Does not work with current bus/device model */ + memset ( nic->node_addr, 0, sizeof ( nic->node_addr ) ); + return 0; } /** |