Index: head/sys/dev/vx/if_vx_eisa.c =================================================================== --- head/sys/dev/vx/if_vx_eisa.c (revision 27127) +++ head/sys/dev/vx/if_vx_eisa.c (revision 27128) @@ -1,188 +1,186 @@ /* * Copyright (C) 1996 Naoki Hamada * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include "eisa.h" #if NEISA > 0 #include "vx.h" #if NVX > 0 #include #include #include #include #include #ifdef INET #include #include #endif #ifdef NS #include #include #endif -#include - #include #include #define EISA_DEVICE_ID_3COM_3C592 0x506d5920 #define EISA_DEVICE_ID_3COM_3C597_TX 0x506d5970 #define EISA_DEVICE_ID_3COM_3C597_T4 0x506d5971 #define EISA_DEVICE_ID_3COM_3C597_MII 0x506d5972 #define VX_EISA_SLOT_OFFSET 0x0c80 #define VX_EISA_IOSIZE 0x000a #define VX_RESOURCE_CONFIG 0x0008 static char *vx_match __P((eisa_id_t type)); static int vx_eisa_probe __P((void)); static int vx_eisa_attach __P((struct eisa_device *)); struct eisa_driver vx_eisa_driver = { "vx", vx_eisa_probe, vx_eisa_attach, /* shutdown */ NULL, &vx_count }; DATA_SET(eisadriver_set, vx_eisa_driver); static char* vx_match(type) eisa_id_t type; { switch (type) { case EISA_DEVICE_ID_3COM_3C592: return "3Com 3C592 Network Adapter"; break; case EISA_DEVICE_ID_3COM_3C597_TX: return "3Com 3C597-TX Network Adapter"; break; case EISA_DEVICE_ID_3COM_3C597_T4: return "3Com 3C597-T4 Network Adapter"; break; case EISA_DEVICE_ID_3COM_3C597_MII: return "3Com 3C597-MII Network Adapter"; break; default: break; } return (NULL); } static int vx_eisa_probe(void) { u_long iobase; struct eisa_device *e_dev = NULL; int count; count = 0; while ((e_dev = eisa_match_dev(e_dev, vx_match))) { u_long port; port = e_dev->ioconf.slot * EISA_SLOT_SIZE; iobase = port + VX_EISA_SLOT_OFFSET; eisa_add_iospace(e_dev, iobase, VX_EISA_IOSIZE, RESVADDR_NONE); eisa_add_iospace(e_dev, port, VX_IOSIZE, RESVADDR_NONE); /* Set irq */ eisa_add_intr(e_dev, inw(iobase + VX_RESOURCE_CONFIG) >> 12); eisa_registerdev(e_dev, &vx_eisa_driver); count++; } return count; } static int vx_eisa_attach(e_dev) struct eisa_device *e_dev; { struct vx_softc *sc; int unit = e_dev->unit; int irq = ffs(e_dev->ioconf.irq) - 1; resvaddr_t *ioport; resvaddr_t *eisa_ioport; u_char level_intr; ioport = e_dev->ioconf.ioaddrs.lh_first; if (!ioport) return -1; eisa_ioport = ioport->links.le_next; if (!eisa_ioport) return -1; eisa_reg_start(e_dev); if (eisa_reg_iospace(e_dev, ioport)) return -1; if (eisa_reg_iospace(e_dev, eisa_ioport)) return -1; if ((sc = vxalloc(unit)) == NULL) return -1; sc->vx_io_addr = ioport->addr; level_intr = FALSE; - if (eisa_reg_intr(e_dev, irq, (void *) vxintr, (void *) sc, &net_imask, + if (eisa_reg_intr(e_dev, irq, vxintr, (void *) sc, &net_imask, /* shared == */ level_intr)) { vxfree(sc); return -1; } eisa_reg_end(e_dev); /* Now the registers are availible through the lower ioport */ vxattach(sc); if (eisa_enable_intr(e_dev, irq)) { vxfree(sc); - eisa_release_intr(e_dev, irq, (void *) vxintr); + eisa_release_intr(e_dev, irq, vxintr); return -1; } return 0; } #endif /* NVX > 0 */ #endif /* NEISA > 0 */ Index: head/sys/dev/vx/if_vx_pci.c =================================================================== --- head/sys/dev/vx/if_vx_pci.c (revision 27127) +++ head/sys/dev/vx/if_vx_pci.c (revision 27128) @@ -1,145 +1,143 @@ /* * Copyright (C) 1996 Naoki Hamada * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include "pci.h" #if NPCI > 0 #include "vx.h" #if NVX > 0 #include #include #include #include #include #ifdef INET #include #include #endif #ifdef NS #include #include #endif -#include - #include #include static void vx_pci_shutdown(int, void *); static char *vx_pci_probe(pcici_t, pcidi_t); static void vx_pci_attach(pcici_t, int unit); static void vx_pci_shutdown( int howto, void *sc) { vxstop(sc); vxfree(sc); } static char* vx_pci_probe( pcici_t config_id, pcidi_t device_id) { if(device_id == 0x590010b7ul) return "3COM 3C590 Etherlink III PCI"; if(device_id == 0x595010b7ul || device_id == 0x595110b7ul || device_id == 0x595210b7ul) return "3COM 3C595 Fast Etherlink III PCI"; if(device_id == 0x900010b7ul || device_id == 0x900110b7ul) return "3COM 3C900 Etherlink XL PCI"; if(device_id == 0x905010b7ul || device_id == 0x905110b7ul) return "3COM 3C905 Fast Etherlink XL PCI"; return NULL; } static void vx_pci_attach( pcici_t config_id, int unit) { struct vx_softc *sc; if (unit >= NVX) { printf("vx%d: not configured; kernel is built for only %d device%s.\n", unit, NVX, NVX == 1 ? "" : "s"); return; } sc = vxalloc(unit); sc->vx_io_addr = pci_conf_read(config_id, 0x10) & 0xffffffe0; if (vxattach(sc) == 0) { return; } /* defect check for 3C590 */ if ((pci_conf_read(config_id, 0) >> 16) == 0x5900) { GO_WINDOW(0); if (vxbusyeeprom(sc)) return; outw(BASE + VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD | EEPROM_SOFT_INFO_2); if (vxbusyeeprom(sc)) return; if (!(inw(BASE + VX_W0_EEPROM_DATA) & NO_RX_OVN_ANOMALY)) { printf("Warning! Defective early revision adapter!\n"); } } /* * Add shutdown hook so that DMA is disabled prior to reboot. Not * doing do could allow DMA to corrupt kernel memory during the * reboot before the driver initializes. */ at_shutdown(vx_pci_shutdown, sc, SHUTDOWN_POST_SYNC); - pci_map_int(config_id, (void *) vxintr, (void *) sc, &net_imask); + pci_map_int(config_id, vxintr, (void *) sc, &net_imask); } static struct pci_device vxdevice = { "vx", vx_pci_probe, vx_pci_attach, &vx_count, NULL }; DATA_SET (pcidevice_set, vxdevice); #endif /* NVX */ #endif /* NPCI */ Index: head/sys/i386/eisa/if_vx_eisa.c =================================================================== --- head/sys/i386/eisa/if_vx_eisa.c (revision 27127) +++ head/sys/i386/eisa/if_vx_eisa.c (revision 27128) @@ -1,188 +1,186 @@ /* * Copyright (C) 1996 Naoki Hamada * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include "eisa.h" #if NEISA > 0 #include "vx.h" #if NVX > 0 #include #include #include #include #include #ifdef INET #include #include #endif #ifdef NS #include #include #endif -#include - #include #include #define EISA_DEVICE_ID_3COM_3C592 0x506d5920 #define EISA_DEVICE_ID_3COM_3C597_TX 0x506d5970 #define EISA_DEVICE_ID_3COM_3C597_T4 0x506d5971 #define EISA_DEVICE_ID_3COM_3C597_MII 0x506d5972 #define VX_EISA_SLOT_OFFSET 0x0c80 #define VX_EISA_IOSIZE 0x000a #define VX_RESOURCE_CONFIG 0x0008 static char *vx_match __P((eisa_id_t type)); static int vx_eisa_probe __P((void)); static int vx_eisa_attach __P((struct eisa_device *)); struct eisa_driver vx_eisa_driver = { "vx", vx_eisa_probe, vx_eisa_attach, /* shutdown */ NULL, &vx_count }; DATA_SET(eisadriver_set, vx_eisa_driver); static char* vx_match(type) eisa_id_t type; { switch (type) { case EISA_DEVICE_ID_3COM_3C592: return "3Com 3C592 Network Adapter"; break; case EISA_DEVICE_ID_3COM_3C597_TX: return "3Com 3C597-TX Network Adapter"; break; case EISA_DEVICE_ID_3COM_3C597_T4: return "3Com 3C597-T4 Network Adapter"; break; case EISA_DEVICE_ID_3COM_3C597_MII: return "3Com 3C597-MII Network Adapter"; break; default: break; } return (NULL); } static int vx_eisa_probe(void) { u_long iobase; struct eisa_device *e_dev = NULL; int count; count = 0; while ((e_dev = eisa_match_dev(e_dev, vx_match))) { u_long port; port = e_dev->ioconf.slot * EISA_SLOT_SIZE; iobase = port + VX_EISA_SLOT_OFFSET; eisa_add_iospace(e_dev, iobase, VX_EISA_IOSIZE, RESVADDR_NONE); eisa_add_iospace(e_dev, port, VX_IOSIZE, RESVADDR_NONE); /* Set irq */ eisa_add_intr(e_dev, inw(iobase + VX_RESOURCE_CONFIG) >> 12); eisa_registerdev(e_dev, &vx_eisa_driver); count++; } return count; } static int vx_eisa_attach(e_dev) struct eisa_device *e_dev; { struct vx_softc *sc; int unit = e_dev->unit; int irq = ffs(e_dev->ioconf.irq) - 1; resvaddr_t *ioport; resvaddr_t *eisa_ioport; u_char level_intr; ioport = e_dev->ioconf.ioaddrs.lh_first; if (!ioport) return -1; eisa_ioport = ioport->links.le_next; if (!eisa_ioport) return -1; eisa_reg_start(e_dev); if (eisa_reg_iospace(e_dev, ioport)) return -1; if (eisa_reg_iospace(e_dev, eisa_ioport)) return -1; if ((sc = vxalloc(unit)) == NULL) return -1; sc->vx_io_addr = ioport->addr; level_intr = FALSE; - if (eisa_reg_intr(e_dev, irq, (void *) vxintr, (void *) sc, &net_imask, + if (eisa_reg_intr(e_dev, irq, vxintr, (void *) sc, &net_imask, /* shared == */ level_intr)) { vxfree(sc); return -1; } eisa_reg_end(e_dev); /* Now the registers are availible through the lower ioport */ vxattach(sc); if (eisa_enable_intr(e_dev, irq)) { vxfree(sc); - eisa_release_intr(e_dev, irq, (void *) vxintr); + eisa_release_intr(e_dev, irq, vxintr); return -1; } return 0; } #endif /* NVX > 0 */ #endif /* NEISA > 0 */ Index: head/sys/pci/if_vx_pci.c =================================================================== --- head/sys/pci/if_vx_pci.c (revision 27127) +++ head/sys/pci/if_vx_pci.c (revision 27128) @@ -1,145 +1,143 @@ /* * Copyright (C) 1996 Naoki Hamada * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include "pci.h" #if NPCI > 0 #include "vx.h" #if NVX > 0 #include #include #include #include #include #ifdef INET #include #include #endif #ifdef NS #include #include #endif -#include - #include #include static void vx_pci_shutdown(int, void *); static char *vx_pci_probe(pcici_t, pcidi_t); static void vx_pci_attach(pcici_t, int unit); static void vx_pci_shutdown( int howto, void *sc) { vxstop(sc); vxfree(sc); } static char* vx_pci_probe( pcici_t config_id, pcidi_t device_id) { if(device_id == 0x590010b7ul) return "3COM 3C590 Etherlink III PCI"; if(device_id == 0x595010b7ul || device_id == 0x595110b7ul || device_id == 0x595210b7ul) return "3COM 3C595 Fast Etherlink III PCI"; if(device_id == 0x900010b7ul || device_id == 0x900110b7ul) return "3COM 3C900 Etherlink XL PCI"; if(device_id == 0x905010b7ul || device_id == 0x905110b7ul) return "3COM 3C905 Fast Etherlink XL PCI"; return NULL; } static void vx_pci_attach( pcici_t config_id, int unit) { struct vx_softc *sc; if (unit >= NVX) { printf("vx%d: not configured; kernel is built for only %d device%s.\n", unit, NVX, NVX == 1 ? "" : "s"); return; } sc = vxalloc(unit); sc->vx_io_addr = pci_conf_read(config_id, 0x10) & 0xffffffe0; if (vxattach(sc) == 0) { return; } /* defect check for 3C590 */ if ((pci_conf_read(config_id, 0) >> 16) == 0x5900) { GO_WINDOW(0); if (vxbusyeeprom(sc)) return; outw(BASE + VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD | EEPROM_SOFT_INFO_2); if (vxbusyeeprom(sc)) return; if (!(inw(BASE + VX_W0_EEPROM_DATA) & NO_RX_OVN_ANOMALY)) { printf("Warning! Defective early revision adapter!\n"); } } /* * Add shutdown hook so that DMA is disabled prior to reboot. Not * doing do could allow DMA to corrupt kernel memory during the * reboot before the driver initializes. */ at_shutdown(vx_pci_shutdown, sc, SHUTDOWN_POST_SYNC); - pci_map_int(config_id, (void *) vxintr, (void *) sc, &net_imask); + pci_map_int(config_id, vxintr, (void *) sc, &net_imask); } static struct pci_device vxdevice = { "vx", vx_pci_probe, vx_pci_attach, &vx_count, NULL }; DATA_SET (pcidevice_set, vxdevice); #endif /* NVX */ #endif /* NPCI */