From 62be1357dd0f76726fadb0dcc772b687c16a2651 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Tue, 24 Apr 2007 11:06:47 +0000 Subject: [PATCH] - Cleanup header file inclusion. - Nuke no longer needed functions. - Nuke no longer needed fields in bge_softc. --- sys/dev/netif/bge/if_bge.c | 148 ++++-------------------------------------- sys/dev/netif/bge/if_bgereg.h | 4 +- 2 files changed, 14 insertions(+), 138 deletions(-) diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c index 0228d33b9c..41ceca4001 100644 --- a/sys/dev/netif/bge/if_bge.c +++ b/sys/dev/netif/bge/if_bge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.39 2005/07/03 03:41:18 silby Exp $ - * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.69 2007/04/23 15:14:37 sephe Exp $ + * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.70 2007/04/24 11:06:46 sephe Exp $ * */ @@ -73,53 +73,43 @@ */ #include -#include +#include #include -#include +#include #include #include -#include -#include #include +#include #include -#include +#include +#include +#include +#include #include -#include #include -#include #include #include - -#include - #include +#include #include -#include -#include -#include - -#include -#include - #include #include -#include #include #include #include #include -#include "if_bgereg.h" +#include + +/* "device miibus" required. See GENERIC if you get errors here. */ +#include "miibus_if.h" #define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) #define BGE_MIN_FRAME 60 -/* "controller miibus0" required. See GENERIC if you get errors here. */ -#include "miibus_if.h" - /* * Various supported device vendors/types and their names. Note: the * spec seems to indicate that the hardware still has Alteon's vendor @@ -223,7 +213,6 @@ static int bge_read_eeprom(struct bge_softc *, caddr_t, uint32_t, size_t); static void bge_setmulti(struct bge_softc *); static void bge_setpromisc(struct bge_softc *); -static void bge_handle_events(struct bge_softc *); static int bge_alloc_jumbo_mem(struct bge_softc *); static void bge_free_jumbo_mem(struct bge_softc *); static struct bge_jslot @@ -242,12 +231,6 @@ static int bge_init_tx_ring(struct bge_softc *); static int bge_chipinit(struct bge_softc *); static int bge_blockinit(struct bge_softc *); -#ifdef notdef -static uint8_t bge_vpd_readbyte(struct bge_softc *, uint32_t); -static void bge_vpd_read_res(struct bge_softc *, struct vpd_res *, uint32_t); -static void bge_vpd_read(struct bge_softc *); -#endif - static uint32_t bge_readmem_ind(struct bge_softc *, uint32_t); static void bge_writemem_ind(struct bge_softc *, uint32_t, uint32_t); #ifdef notdef @@ -344,89 +327,6 @@ bge_writereg_ind(struct bge_softc *sc, uint32_t off, uint32_t val) pci_write_config(dev, BGE_PCI_REG_DATA, val, 4); } -#ifdef notdef -static uint8_t -bge_vpd_readbyte(struct bge_softc *sc, uint32_t addr) -{ - device_t dev = sc->bge_dev; - uint32_t val; - int i; - - pci_write_config(dev, BGE_PCI_VPD_ADDR, addr, 2); - for (i = 0; i < BGE_TIMEOUT * 10; i++) { - DELAY(10); - if (pci_read_config(dev, BGE_PCI_VPD_ADDR, 2) & BGE_VPD_FLAG) - break; - } - - if (i == BGE_TIMEOUT) { - device_printf(sc->bge_dev, "VPD read timed out\n"); - return(0); - } - - val = pci_read_config(dev, BGE_PCI_VPD_DATA, 4); - - return((val >> ((addr % 4) * 8)) & 0xFF); -} - -static void -bge_vpd_read_res(struct bge_softc *sc, struct vpd_res *res, uint32_t addr) -{ - size_t i; - uint8_t *ptr; - - ptr = (uint8_t *)res; - for (i = 0; i < sizeof(struct vpd_res); i++) - ptr[i] = bge_vpd_readbyte(sc, i + addr); - - return; -} - -static void -bge_vpd_read(struct bge_softc *sc) -{ - int pos = 0, i; - struct vpd_res res; - - if (sc->bge_vpd_prodname != NULL) - kfree(sc->bge_vpd_prodname, M_DEVBUF); - if (sc->bge_vpd_readonly != NULL) - kfree(sc->bge_vpd_readonly, M_DEVBUF); - sc->bge_vpd_prodname = NULL; - sc->bge_vpd_readonly = NULL; - - bge_vpd_read_res(sc, &res, pos); - - if (res.vr_id != VPD_RES_ID) { - device_printf(sc->bge_dev, - "bad VPD resource id: expected %x got %x\n", - VPD_RES_ID, res.vr_id); - return; - } - - pos += sizeof(res); - sc->bge_vpd_prodname = kmalloc(res.vr_len + 1, M_DEVBUF, M_INTWAIT); - for (i = 0; i < res.vr_len; i++) - sc->bge_vpd_prodname[i] = bge_vpd_readbyte(sc, i + pos); - sc->bge_vpd_prodname[i] = '\0'; - pos += i; - - bge_vpd_read_res(sc, &res, pos); - - if (res.vr_id != VPD_RES_READ) { - device_printf(sc->bge_dev, - "bad VPD resource id: expected %x got %x\n", - VPD_RES_READ, res.vr_id); - return; - } - - pos += sizeof(res); - sc->bge_vpd_readonly = kmalloc(res.vr_len, M_DEVBUF, M_INTWAIT); - for (i = 0; i < res.vr_len + 1; i++) - sc->bge_vpd_readonly[i] = bge_vpd_readbyte(sc, i + pos); -} -#endif - /* * Read a byte of data stored in the EEPROM at address 'addr.' The * BCM570x supports both the traditional bitbang interface and an @@ -613,14 +513,6 @@ bge_miibus_statchg(device_t dev) } /* - * Handle events that have triggered interrupts. - */ -static void -bge_handle_events(struct bge_softc *sc) -{ -} - -/* * Memory management for jumbo frames. */ static int @@ -1597,12 +1489,6 @@ bge_probe(device_t dev) return(ENXIO); sc = device_get_softc(dev); -#ifdef notdef - sc->bge_dev = dev; - - bge_vpd_read(sc); - device_set_desc(dev, sc->bge_vpd_prodname); -#endif descbuf = kmalloc(BGE_DEVDESC_MAX, M_TEMP, M_WAITOK); ksnprintf(descbuf, BGE_DEVDESC_MAX, "%s, ASIC rev. %#04x", t->bge_name, pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >> 16); @@ -1882,12 +1768,6 @@ bge_release_resources(struct bge_softc *sc) dev = sc->bge_dev; - if (sc->bge_vpd_prodname != NULL) - kfree(sc->bge_vpd_prodname, M_DEVBUF); - - if (sc->bge_vpd_readonly != NULL) - kfree(sc->bge_vpd_readonly, M_DEVBUF); - if (sc->bge_irq != NULL) bus_release_resource(dev, SYS_RES_IRQ, 0, sc->bge_irq); @@ -2330,8 +2210,6 @@ bge_intr(void *xsc) bge_txeof(sc); } - bge_handle_events(sc); - /* Re-enable interrupts. */ CSR_WRITE_4(sc, BGE_MBX_IRQ0_LO, 0); } diff --git a/sys/dev/netif/bge/if_bgereg.h b/sys/dev/netif/bge/if_bgereg.h index 9ec98f7ca9..51ed5ce480 100644 --- a/sys/dev/netif/bge/if_bgereg.h +++ b/sys/dev/netif/bge/if_bgereg.h @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.1.2.16 2004/09/23 20:11:18 ps Exp $ - * $DragonFly: src/sys/dev/netif/bge/if_bgereg.h,v 1.18 2007/04/22 04:16:26 sephe Exp $ + * $DragonFly: src/sys/dev/netif/bge/if_bgereg.h,v 1.19 2007/04/24 11:06:47 sephe Exp $ */ /* @@ -2332,8 +2332,6 @@ struct bge_softc { int bge_txcnt; int bge_link; struct callout bge_stat_timer; - char *bge_vpd_prodname; - char *bge_vpd_readonly; }; #define BGE_NSEG_NEW 32 -- 2.11.4.GIT