diff options
| -rw-r--r-- | sys/dev/eisa/if_fea.c | 565 | ||||
| -rw-r--r-- | sys/dev/tc/if_fta.c | 110 |
2 files changed, 188 insertions, 487 deletions
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index 3dbaeecd7a4..4a1d40ffbf3 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fea.c,v 1.7 1999/11/23 04:49:29 jason Exp $ */ +/* $OpenBSD: if_fea.c,v 1.8 1999/11/30 04:00:44 jason Exp $ */ /* $NetBSD: if_fea.c,v 1.9 1996/10/21 22:31:05 thorpej Exp $ */ /*- @@ -42,11 +42,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> -#if defined(__FreeBSD__) -#include <sys/devconf.h> -#elif defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/device.h> -#endif #include <net/if.h> #include <net/if_types.h> @@ -67,30 +63,12 @@ #include <netinet/if_ether.h> #endif -#if defined(__FreeBSD__) -#include <netinet/if_fddi.h> -#else #include <net/if_fddi.h> -#endif #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/vm_param.h> -#if defined(__FreeBSD__) -#include <i386/eisa/eisaconf.h> -#include <i386/isa/icu.h> -#include <pci/pdqvar.h> -#include <pci/pdqreg.h> -#elif defined(__bsdi__) -#include <i386/isa/isa.h> -#include <i386/isa/icu.h> -#include <i386/isa/dma.h> -#include <i386/isa/isavar.h> -#include <i386/eisa/eisa.h> -#include <i386/eisa/pdqvar.h> -#include <i386/eisa/pdqreg.h> -#elif defined(__NetBSD__) || defined(__OpenBSD__) #include <machine/cpu.h> #include <machine/bus.h> @@ -100,456 +78,173 @@ #include <dev/eisa/eisareg.h> #include <dev/eisa/eisavar.h> #include <dev/eisa/eisadevs.h> -#endif /* * */ -#if defined(__FreeBSD__) -static pdq_softc_t *pdqs_eisa[16]; -#define PDQ_EISA_UNIT_TO_SOFTC(unit) (pdqs_eisa[unit]) -#define DEFEA_INTRENABLE 0x8 /* level interrupt */ -#define pdq_eisa_ifwatchdog NULL -static const int pdq_eisa_irqs[4] = { 9, 10, 11, 15 }; - -#elif defined(__bsdi__) -extern struct cfdriver feacd; -#define PDQ_EISA_UNIT_TO_SOFTC(unit) ((pdq_softc_t *)feacd.cd_devs[unit]) -#define DEFEA_INTRENABLE 0x28 /* edge interrupt */ -static const int pdq_eisa_irqs[4] = { IRQ9, IRQ10, IRQ11, IRQ15 }; +void pdq_eisa_subprobe __P((bus_space_tag_t, bus_space_handle_t, + u_int32_t *, u_int32_t *, u_int32_t *)); +void pdq_eisa_devinit __P((pdq_softc_t *)); +int pdq_eisa_match __P((struct device *, void *, void *)); +void pdq_eisa_attach __P((struct device *, struct device *, void *)); -#elif defined(__NetBSD__) || defined(__OpenBSD__) #define DEFEA_INTRENABLE 0x8 /* level interrupt */ -#define pdq_eisa_ifwatchdog NULL -static const int pdq_eisa_irqs[4] = { 9, 10, 11, 15 }; - -#else -#error unknown system -#endif - -#ifndef pdq_eisa_ifwatchdog -static ifnet_ret_t -pdq_eisa_ifwatchdog( - int unit) +static int pdq_eisa_irqs[4] = { 9, 10, 11, 15 }; + +void +pdq_eisa_subprobe(bc, iobase, maddr, msize, irq) + bus_space_tag_t bc; + bus_space_handle_t iobase; + u_int32_t *maddr; + u_int32_t *msize; + u_int32_t *irq; { - pdq_ifwatchdog(&PDQ_EISA_UNIT_TO_SOFTC(unit)->sc_if); -} -#endif + if (irq != NULL) + *irq = pdq_eisa_irqs[PDQ_OS_IORD_8(bc, iobase, + PDQ_EISA_IO_CONFIG_STAT_0) & 3]; -static void -pdq_eisa_subprobe( - pdq_bus_t bc, - pdq_bus_ioport_t iobase, - pdq_uint32_t *maddr, - pdq_uint32_t *msize, - pdq_uint32_t *irq) -{ - if (irq != NULL) - *irq = pdq_eisa_irqs[PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_IO_CONFIG_STAT_0) & 3]; - *maddr = (PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_MEM_ADD_CMP_0) << 8) - | (PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_MEM_ADD_CMP_1) << 16); - *msize = (PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_MEM_ADD_MASK_0) + 4) << 8; + *maddr = (PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_MEM_ADD_CMP_0) << 8) + | (PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_MEM_ADD_CMP_1) << 16); + *msize = (PDQ_OS_IORD_8(bc, iobase, PDQ_EISA_MEM_ADD_MASK_0) + 4) << 8; } -static void -pdq_eisa_devinit( - pdq_softc_t *sc) +void +pdq_eisa_devinit(sc) + pdq_softc_t *sc; { - pdq_uint8_t data; - pdq_bus_t tag; - -#if defined(__NetBSD__) - tag = sc->sc_iotag; -#else - tag = sc->sc_bc; -#endif - - /* - * Do the standard initialization for the DEFEA registers. - */ - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_FUNCTION_CTRL, 0x23); - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_IO_CMP_1_1, (sc->sc_iobase >> 8) & 0xF0); - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_IO_CMP_0_1, (sc->sc_iobase >> 8) & 0xF0); - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_SLOT_CTRL, 0x01); - data = PDQ_OS_IORD_8(tag, sc->sc_iobase, PDQ_EISA_BURST_HOLDOFF); + u_int8_t data; + bus_space_tag_t tag; + + tag = sc->sc_bc; + + /* + * Do the standard initialization for the DEFEA registers. + */ + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_FUNCTION_CTRL, 0x23); + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_IO_CMP_1_1, + (sc->sc_iobase >> 8) & 0xF0); + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_IO_CMP_0_1, + (sc->sc_iobase >> 8) & 0xF0); + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_SLOT_CTRL, 0x01); + data = PDQ_OS_IORD_8(tag, sc->sc_iobase, PDQ_EISA_BURST_HOLDOFF); #if defined(PDQ_IOMAPPED) - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_BURST_HOLDOFF, data & ~1); + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_BURST_HOLDOFF, data & ~1); #else - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_BURST_HOLDOFF, data | 1); + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_BURST_HOLDOFF, data | 1); #endif - data = PDQ_OS_IORD_8(tag, sc->sc_iobase, PDQ_EISA_IO_CONFIG_STAT_0); - PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_IO_CONFIG_STAT_0, data | DEFEA_INTRENABLE); + data = PDQ_OS_IORD_8(tag, sc->sc_iobase, PDQ_EISA_IO_CONFIG_STAT_0); + PDQ_OS_IOWR_8(tag, sc->sc_iobase, PDQ_EISA_IO_CONFIG_STAT_0, + data | DEFEA_INTRENABLE); } -#if defined(__FreeBSD__) -static int pdq_eisa_shutdown(struct kern_devconf *kdc, int force); -static int pdq_eisa_probe(void); -static int pdq_eisa_attach(struct eisa_device *ed); - -static unsigned long pdq_eisa_unit; - -static struct eisa_driver pdq_eisa_driver = { - "fea", pdq_eisa_probe, pdq_eisa_attach, NULL, &pdq_eisa_unit -}; - -DATA_SET(eisadriver_set, pdq_eisa_driver); - -static struct kern_devconf kdc_pdq_eisa = { - 0, 0, 0, /* filled in by dev_attach */ - "fea", 0, { MDDT_EISA, 0, "net" }, - eisa_generic_externalize, 0, pdq_eisa_shutdown, EISA_EXTERNALLEN, - &kdc_eisa0, /* parent */ - 0, /* parentdata */ - DC_BUSY, /* host adapters are always ``in use'' */ - "DEC DEFEA EISA FDDI Controller", - DC_CLS_NETIF -}; - -static const char * -pdq_eisa_match( - eisa_id_t type) +int +pdq_eisa_match(parent, match, aux) + struct device *parent; + void *match; + void *aux; { - if ((type >> 8) == 0x10a330) - return kdc_pdq_eisa.kdc_description; - return NULL; -} + struct eisa_attach_args *ea = (struct eisa_attach_args *) aux; -static int -pdq_eisa_probe( - void) -{ - struct eisa_device *ed = NULL; - int count; - - for (count = 0; (ed = eisa_match_dev(ed, pdq_eisa_match)) != NULL; count++) { - pdq_bus_ioport_t iobase = ed->ioconf.slot * EISA_SLOT_SIZE; - pdq_uint32_t irq, maddr, msize; - - eisa_add_iospace(ed, iobase, 0x200, RESVADDR_NONE); - pdq_eisa_subprobe(PDQ_BUS_EISA, iobase, &maddr, &msize, &irq); - eisa_add_mspace(ed, maddr, msize, RESVADDR_NONE); - eisa_add_intr(ed, irq); - eisa_registerdev(ed, &pdq_eisa_driver, &kdc_pdq_eisa); - } - return count; -} - -static void -pdq_eisa_interrupt( - void *arg) -{ - pdq_softc_t * const sc = (pdq_softc_t *) arg; - (void) pdq_interrupt(sc->sc_pdq); -} - -static int -pdq_eisa_attach( - struct eisa_device *ed) -{ - pdq_softc_t *sc; - resvaddr_t *iospace; - resvaddr_t *mspace; - int irq = ffs(ed->ioconf.irq) - 1; - - sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_WAITOK); - if (sc == NULL) { - printf("fea%d: malloc failed!\n", sc->sc_if.if_unit); - return -1; - } - pdqs_eisa[ed->unit] = sc; - - bzero(sc, sizeof(pdq_softc_t)); /* Zero out the softc*/ - sc->sc_if.if_name = "fea"; - sc->sc_if.if_unit = ed->unit; - - if ((iospace = ed->ioconf.ioaddrs.lh_first) == NULL) { - printf("fea%d: no iospace??\n", sc->sc_if.if_unit); - return -1; - } - if ((mspace = ed->ioconf.maddrs.lh_first) == NULL) { - printf("fea%d: no memory space??\n", sc->sc_if.if_unit); - return -1; - } - - sc->sc_iobase = (pdq_bus_ioport_t) iospace->addr; - sc->sc_membase = (pdq_bus_memaddr_t) pmap_mapdev(mspace->addr, mspace->size); - if (sc->sc_membase == NULL) { - printf("fea%d: failed to map memory 0x%x-0x%x!\n", - sc->sc_if.if_unit, mspace->addr, mspace->addr + mspace->size - 1); - return -1; - } - - eisa_reg_start(ed); - if (eisa_reg_iospace(ed, iospace)) { - printf("fea%d: failed to register iospace 0x%x-0x%x!\n", - sc->sc_if.if_unit, iospace->addr, iospace->addr + iospace->size - 1); - return -1; - } - if (eisa_reg_mspace(ed, mspace)) { - printf("fea%d: failed to register memory 0x%x-0x%x!\n", - sc->sc_if.if_unit, mspace->addr, mspace->addr + mspace->size - 1); - return -1; - } - - if (eisa_reg_intr(ed, irq, pdq_eisa_interrupt, sc, &net_imask, 1)) { - printf("fea%d: interrupt registration failed\n", sc->sc_if.if_unit); - return -1; - } - - eisa_reg_end(ed); - - pdq_eisa_devinit(sc); - sc->sc_pdq = pdq_initialize(PDQ_BUS_EISA, sc->sc_membase, - sc->sc_if.if_name, sc->sc_if.if_unit, - (void *) sc, PDQ_DEFEA); - if (sc->sc_pdq == NULL) { - printf("fea%d: initialization failed\n", sc->sc_if.if_unit); - return -1; - } - - if (eisa_enable_intr(ed, irq)) { - printf("fea%d: failed to enable interrupt\n", sc->sc_if.if_unit); - return -1; - } - - bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); - pdq_ifattach(sc, pdq_eisa_ifwatchdog); - - ed->kdc->kdc_state = DC_BUSY; /* host adapters always busy */ - - return 0; + if (strncmp(ea->ea_idstring, "DEC300", 6) == 0) + return (1); + return (0); } -static int -pdq_eisa_shutdown( - struct kern_devconf *kdc, - int force) +void +pdq_eisa_attach(parent, self, aux) + struct device *parent; + struct device *self; + void *aux; { - pdq_hwreset(PDQ_EISA_UNIT_TO_SOFTC(kdc->kdc_unit)->sc_pdq); - (void) dev_detach(kdc); - return 0; -} -#endif /* __FreeBSD__ */ - -#if defined(__bsdi__) -static int -pdq_eisa_probe( - struct device *parent, - struct cfdata *cf, - void *aux) -{ - struct isa_attach_args *ia = (struct isa_attach_args *) aux; - int slot; - pdq_uint32_t irq, maddr, msize; - - if (isa_bustype != BUS_EISA) - return 0; - - if ((slot = eisa_match(cf, ia)) == 0) - return 0; - ia->ia_iobase = slot << 12; - ia->ia_iosize = EISA_NPORT; - eisa_slotalloc(slot); - - pdq_eisa_subprobe(PDQ_BUS_EISA, ia->ia_iobase, &maddr, &msize, &irq); - if (ia->ia_irq != IRQUNK && irq != ia->ia_irq) { - printf("fea%d: error: desired IRQ of %d does not match device's actual IRQ (%d),\n", - cf->cf_unit, ffs(ia->ia_irq) - 1, ffs(irq) - 1); - return 0; - } - if (ia->ia_irq == IRQUNK) { - if ((ia->ia_irq = isa_irqalloc(irq)) == 0) { - if ((ia->ia_irq = isa_irqalloc(IRQ9|IRQ10|IRQ11|IRQ15)) == 0) { - printf("fea%d: error: IRQ %d is already in use\n", cf->cf_unit, - ffs(irq) - 1); - return 0; - } - irq = PDQ_OS_IORD_8(PDQ_BUS_EISA, ia->ia_iobase, PDQ_EISA_IO_CONFIG_STAT_0) & ~3; - switch (ia->ia_irq) { - case IRQ9: irq |= 0; - case IRQ10: irq |= 1; - case IRQ11: irq |= 2; - case IRQ15: irq |= 3; - } - PDQ_OS_IOWR_8(PDQ_BUS_EISA, ia->ia_iobase, PDQ_EISA_IO_CONFIG_STAT_0, irq); + pdq_softc_t *sc = (pdq_softc_t *) self; + struct eisa_attach_args *ea = (struct eisa_attach_args *) aux; + u_int32_t irq, maddr, msize; + eisa_intr_handle_t ih; + const char *intrstr; + + sc->sc_iotag = ea->ea_iot; + bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ); + sc->sc_if.if_flags = 0; + sc->sc_if.if_softc = sc; + + /* + * NOTE: sc_bc is an alias for sc_csrtag and sc_membase is + * an alias for sc_csrhandle. sc_iobase is used here to + * check the card's configuration. + */ + + if (bus_space_map(sc->sc_iotag, EISA_SLOT_ADDR(ea->ea_slot), + EISA_SLOT_SIZE, 0, &sc->sc_iobase)) { + printf("\n%s: failed to map I/O!\n", sc->sc_dev.dv_xname); + return; } - } - if (maddr == 0) { - printf("fea%d: error: memory not enabled! ECU reconfiguration required\n", - cf->cf_unit); - return 0; - } - - /* EISA bus masters don't use host DMA channels */ - ia->ia_drq = DRQNONE; - - ia->ia_maddr = (caddr_t) maddr; - ia->ia_msize = msize; - return 1; -} - -static void -pdq_eisa_attach( - struct device *parent, - struct device *self, - void *aux) -{ - pdq_softc_t *sc = (pdq_softc_t *) self; - register struct isa_attach_args *ia = (struct isa_attach_args *) aux; - register struct ifnet *ifp = &sc->sc_if; - - sc->sc_if.if_unit = sc->sc_dev.dv_unit; - sc->sc_if.if_name = "fea"; - sc->sc_if.if_flags = 0; - - sc->sc_iobase = ia->ia_iobase; - - pdq_eisa_devinit(sc); - sc->sc_pdq = pdq_initialize(PDQ_BUS_EISA, - (pdq_bus_memaddr_t) ISA_HOLE_VADDR(ia->ia_maddr), - sc->sc_if.if_name, sc->sc_if.if_unit, - (void *) sc, PDQ_DEFEA); - if (sc->sc_pdq == NULL) { - printf("fea%d: initialization failed\n", sc->sc_if.if_unit); - return; - } - bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); - - pdq_ifattach(sc, pdq_eisa_ifwatchdog); - - isa_establish(&sc->sc_id, &sc->sc_dev); - - sc->sc_ih.ih_fun = pdq_interrupt; - sc->sc_ih.ih_arg = (void *) sc->sc_pdq; - intr_establish(ia->ia_irq, &sc->sc_ih, DV_NET); - - sc->sc_ats.func = (void (*)(void *)) pdq_hwreset; - sc->sc_ats.arg = (void *) sc->sc_pdq; - atshutdown(&sc->sc_ats, ATSH_ADD); -} - -static char *pdq_eisa_ids[] = { - "DEC3001", /* 0x0130A310 */ - "DEC3002", /* 0x0230A310 */ - "DEC3003", /* 0x0330A310 */ - "DEC3004", /* 0x0430A310 */ -}; - -struct cfdriver feacd = { - 0, "fea", pdq_eisa_probe, pdq_eisa_attach, DV_IFNET, sizeof(pdq_softc_t), - pdq_eisa_ids -}; -#endif /* __bsdi__ */ - -#if defined(__NetBSD__) || defined(__OpenBSD__) -static int -pdq_eisa_match( - struct device *parent, - void *match, - void *aux) -{ - const struct eisa_attach_args * const ea = (struct eisa_attach_args *) aux; - - if (strncmp(ea->ea_idstring, "DEC300", 6) == 0) - return 1; - - return 0; -} - -static void -pdq_eisa_attach( - struct device *parent, - struct device *self, - void *aux) -{ - pdq_softc_t * const sc = (pdq_softc_t *) self; - struct eisa_attach_args * const ea = (struct eisa_attach_args *) aux; - pdq_uint32_t irq, maddr, msize; - eisa_intr_handle_t ih; - const char *intrstr; - - sc->sc_iotag = ea->ea_iot; - bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ); - sc->sc_if.if_flags = 0; - sc->sc_if.if_softc = sc; - - /* - * NOTE: sc_bc is an alias for sc_csrtag and sc_membase is - * an alias for sc_csrhandle. sc_iobase is used here to - * check the card's configuration. - */ - - if (bus_space_map(sc->sc_iotag, EISA_SLOT_ADDR(ea->ea_slot), - EISA_SLOT_SIZE, 0, &sc->sc_iobase)) { - printf("\n%s: failed to map I/O!\n", sc->sc_dev.dv_xname); - return; - } - - pdq_eisa_subprobe(sc->sc_iotag, sc->sc_iobase, &maddr, &msize, &irq); + pdq_eisa_subprobe(sc->sc_iotag, sc->sc_iobase, &maddr, &msize, &irq); #if defined(PDQ_IOMAPPED) - sc->sc_csrtag = sc->sc_iotag; - sc->sc_csrhandle = sc->sc_iobase; + sc->sc_csrtag = sc->sc_iotag; + sc->sc_csrhandle = sc->sc_iobase; #else - if (maddr == 0 || msize == 0) { - printf("\n%s: error: memory not enabled! ECU reconfiguration required\n", - sc->sc_dev.dv_xname); - return; - } - - if (bus_space_map(sc->sc_csrtag, maddr, msize, 0, &sc->sc_csrhandle)) { - bus_space_unmap(sc->sc_iotag, sc->sc_iobase, EISA_SLOT_SIZE); - printf("\n%s: failed to map memory (0x%x-0x%x)!\n", - sc->sc_dev.dv_xname, maddr, maddr + msize - 1); - return; - } + if (maddr == 0 || msize == 0) { + printf("\n%s: error: memory not enabled! ECU reconfiguration" + " required\n", sc->sc_dev.dv_xname); + return; + } + + if (bus_space_map(sc->sc_csrtag, maddr, msize, 0, &sc->sc_csrhandle)) { + bus_space_unmap(sc->sc_iotag, sc->sc_iobase, EISA_SLOT_SIZE); + printf("\n%s: failed to map memory (0x%x-0x%x)!\n", + sc->sc_dev.dv_xname, maddr, maddr + msize - 1); + return; + } #endif - pdq_eisa_devinit(sc); - sc->sc_pdq = pdq_initialize(sc->sc_bc, sc->sc_membase, - sc->sc_if.if_xname, 0, - (void *) sc, PDQ_DEFEA); - if (sc->sc_pdq == NULL) { - printf("%s: initialization failed\n", sc->sc_dev.dv_xname); - return; - } - - if (eisa_intr_map(ea->ea_ec, irq, &ih)) { - printf("%s: couldn't map interrupt (%d)\n", sc->sc_dev.dv_xname, irq); - return; - } - intrstr = eisa_intr_string(ea->ea_ec, ih); - sc->sc_ih = eisa_intr_establish(ea->ea_ec, ih, IST_LEVEL, IPL_NET, - (int (*)(void *)) pdq_interrupt, sc->sc_pdq, sc->sc_dev.dv_xname); - if (sc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", sc->sc_dev.dv_xname); + pdq_eisa_devinit(sc); + sc->sc_pdq = pdq_initialize(sc->sc_bc, sc->sc_membase, + sc->sc_if.if_xname, 0, (void *) sc, PDQ_DEFEA); + if (sc->sc_pdq == NULL) { + printf("%s: initialization failed\n", sc->sc_dev.dv_xname); + return; + } + + if (eisa_intr_map(ea->ea_ec, irq, &ih)) { + printf("%s: couldn't map interrupt (%d)\n", + sc->sc_dev.dv_xname, irq); + return; + } + intrstr = eisa_intr_string(ea->ea_ec, ih); + sc->sc_ih = eisa_intr_establish(ea->ea_ec, ih, IST_LEVEL, IPL_NET, + (int (*)(void *)) pdq_interrupt, sc->sc_pdq, sc->sc_dev.dv_xname); + if (sc->sc_ih == NULL) { + printf("%s: couldn't establish interrupt", sc->sc_dev.dv_xname); + if (intrstr != NULL) + printf(" at %s", intrstr); + printf("\n"); + return; + } if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); - return; - } - if (intrstr != NULL) - printf(": interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); + printf(": interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); - bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); + bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, + sc->sc_ac.ac_enaddr, 6); - pdq_ifattach(sc, pdq_eisa_ifwatchdog); + pdq_ifattach(sc, NULL); - sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq); - if (sc->sc_ats == NULL) - printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); + sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, + sc->sc_pdq); + if (sc->sc_ats == NULL) + printf("%s: warning: couldn't establish shutdown hook\n", + self->dv_xname); #if !defined(PDQ_IOMAPPED) - printf("%s: using iomem 0x%x-0x%x\n", sc->sc_dev.dv_xname, maddr, - maddr + msize - 1); + printf("%s: using iomem 0x%x-0x%x\n", sc->sc_dev.dv_xname, maddr, + maddr + msize - 1); #endif } struct cfattach fea_ca = { - sizeof(pdq_softc_t), pdq_eisa_match, pdq_eisa_attach + sizeof(pdq_softc_t), pdq_eisa_match, pdq_eisa_attach }; struct cfdriver fea_cd = { - 0, "fea", DV_IFNET + 0, "fea", DV_IFNET }; -#endif diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c index 3bdda137cd9..5a4981ed652 100644 --- a/sys/dev/tc/if_fta.c +++ b/sys/dev/tc/if_fta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fta.c,v 1.4 1999/11/23 04:49:30 jason Exp $ */ +/* $OpenBSD: if_fta.c,v 1.5 1999/11/30 04:00:44 jason Exp $ */ /* $NetBSD: if_fta.c,v 1.7 1996/10/22 21:37:26 cgd Exp $ */ /*- @@ -64,62 +64,68 @@ #include <dev/ic/pdqvar.h> #include <dev/ic/pdqreg.h> -static int -pdq_tc_match( - struct device *parent, - void *match, - void *aux) +int +pdq_tc_match(parent, match, aux) + struct device *parent; + void *match; + void *aux; { - struct tc_attach_args *ta = (struct tc_attach_args *) aux; + struct tc_attach_args *ta = (struct tc_attach_args *) aux; - if (strncmp("PMAF-F", ta->ta_modname, 6) == 0) - return 1; - - return 0; + if (strncmp("PMAF-F", ta->ta_modname, 6) == 0) + return (1); + return (0); } -static void -pdq_tc_attach( - struct device * const parent, - struct device * const self, - void * const aux) +void +pdq_tc_attach(parent, self, aux) + struct device *parent; + struct device *self; + void *aux; { - pdq_softc_t * const sc = (pdq_softc_t *) self; - struct tc_attach_args * const ta = (struct tc_attach_args *) aux; - - /* - * NOTE: sc_bc is an alias for sc_csrtag and sc_membase is an - * alias for sc_csrhandle. sc_iobase is not used in this front-end. - */ - sc->sc_csrtag = ta->ta_memt; - bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ); - sc->sc_if.if_flags = 0; - sc->sc_if.if_softc = sc; - - if (bus_space_map(sc->sc_csrtag, ta->ta_addr + PDQ_TC_CSR_OFFSET, + pdq_softc_t * const sc = (pdq_softc_t *) self; + struct tc_attach_args * const ta = (struct tc_attach_args *) aux; + + /* + * NOTE: sc_bc is an alias for sc_csrtag and sc_membase is an + * alias for sc_csrhandle. sc_iobase is not used in this front-end. + */ + sc->sc_csrtag = ta->ta_memt; + bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ); + sc->sc_if.if_flags = 0; + sc->sc_if.if_softc = sc; + + if (bus_space_map(sc->sc_csrtag, ta->ta_addr + PDQ_TC_CSR_OFFSET, PDQ_TC_CSR_SPACE, 0, &sc->sc_csrhandle)) { - printf("\n%s: can't map card memory!\n", sc->sc_dev.dv_xname); - return; - } - - sc->sc_pdq = pdq_initialize(sc->sc_csrtag, sc->sc_csrhandle, - sc->sc_if.if_xname, 0, - (void *) sc, PDQ_DEFTA); - if (sc->sc_pdq == NULL) { - printf("%s: initialization failed\n", sc->sc_dev.dv_xname); - return; - } - bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); - printf("\n"); - pdq_ifattach(sc, NULL); - - tc_intr_establish(parent, ta->ta_cookie, TC_IPL_NET, - (int (*)(void *)) pdq_interrupt, sc->sc_pdq); - - sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq); - if (sc->sc_ats == NULL) - printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); + printf("\n%s: can't map card memory!\n", sc->sc_dev.dv_xname); + return; + } + + sc->sc_pdq = pdq_initialize(sc->sc_csrtag, sc->sc_csrhandle, + sc->sc_if.if_xname, 0, (void *) sc, PDQ_DEFTA); + if (sc->sc_pdq == NULL) { + printf("%s: initialization failed\n", sc->sc_dev.dv_xname); + return; + } + bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, + sc->sc_ac.ac_enaddr, 6); + printf("\n"); + pdq_ifattach(sc, NULL); + + tc_intr_establish(parent, ta->ta_cookie, TC_IPL_NET, + (int (*)(void *)) pdq_interrupt, sc->sc_pdq); + + sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, + sc->sc_pdq); + if (sc->sc_ats == NULL) + printf("%s: warning: couldn't establish shutdown hook\n", + self->dv_xname); } -struct cfattach fta_ca = { sizeof(pdq_softc_t), pdq_tc_match, pdq_tc_attach }; -struct cfdriver fta_cd = { 0, "fta", DV_IFNET }; +struct cfattach fta_ca = { + sizeof(pdq_softc_t), pdq_tc_match, pdq_tc_attach +}; + +struct cfdriver fta_cd = { + 0, "fta", DV_IFNET +}; |