Index: head/sys/dev/ral/if_ral_pccard.c =================================================================== --- head/sys/dev/ral/if_ral_pccard.c (revision 150439) +++ head/sys/dev/ral/if_ral_pccard.c (revision 150440) @@ -1,140 +1,121 @@ /* $FreeBSD$ */ /*- * Copyright (c) 2005 * Damien Bergamini * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include __FBSDID("$FreeBSD$"); /* * CardBus front-end for the Ralink RT2500 driver. + * XXX this is actually a PC Card front end. Maybe? */ #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 "card_if.h" #include "pccarddevs.h" MODULE_DEPEND(ral, wlan, 1, 1, 1); static const struct pccard_product ral_pccard_products[] = { PCMCIA_CARD(RALINK, RT2560), { NULL } }; -static int ral_pccard_match(device_t); static int ral_pccard_probe(device_t); static int ral_pccard_attach(device_t); static device_method_t ral_pccard_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, pccard_compat_probe), - DEVMETHOD(device_attach, pccard_compat_attach), + DEVMETHOD(device_probe, ral_pccard_probe), + DEVMETHOD(device_attach, ral_pccard_attach), DEVMETHOD(device_detach, ral_detach), DEVMETHOD(device_shutdown, ral_shutdown), - /* Card interface */ - DEVMETHOD(card_compat_match, ral_pccard_match), - DEVMETHOD(card_compat_probe, ral_pccard_probe), - DEVMETHOD(card_compat_attach, ral_pccard_attach), - { 0, 0 } }; static driver_t ral_pccard_driver = { "ral", ral_pccard_methods, sizeof (struct ral_softc) }; DRIVER_MODULE(ral, pccard, ral_pccard_driver, ral_devclass, 0, 0); static int -ral_pccard_match(device_t dev) +ral_pccard_probe(device_t dev) { const struct pccard_product *pp; if ((pp = pccard_product_lookup(dev, ral_pccard_products, sizeof (struct pccard_product), NULL)) != NULL) { if (pp->pp_name != NULL) device_set_desc(dev, pp->pp_name); return 0; } return ENXIO; -} - -static int -ral_pccard_probe(device_t dev) -{ - int error; - - error = ral_alloc(dev, 0); - if (error != 0) - return error; - - ral_free(dev); - - return 0; } static int ral_pccard_attach(device_t dev) { int error; error = ral_alloc(dev, 0); if (error != 0) return error; error = ral_attach(dev); if (error != 0) ral_free(dev); return error; } Index: head/sys/dev/stg/tmc18c30_pccard.c =================================================================== --- head/sys/dev/stg/tmc18c30_pccard.c (revision 150439) +++ head/sys/dev/stg/tmc18c30_pccard.c (revision 150440) @@ -1,165 +1,140 @@ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ /*- * [Ported for FreeBSD] * Copyright (c) 2000 * Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe. * All rights reserved. * [NetBSD for NEC PC-98 series] * Copyright (c) 1996, 1997, 1998 * NetBSD/pc98 porting staff. All rights reserved. * Copyright (c) 1996, 1997, 1998 * Naofumi HONDA. All rights reserved. * Copyright (c) 1996, 1997, 1998 * Kouichi Matsuda. 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. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "pccarddevs.h" static const struct pccard_product stg_products[] = { PCMCIA_CARD(FUTUREDOMAIN, SCSI2GO), PCMCIA_CARD(IBM, SCSICARD), PCMCIA_CARD(RATOC, REX5536), PCMCIA_CARD(RATOC, REX5536AM), PCMCIA_CARD(RATOC, REX5536M), { NULL } }; /* - * Additional code for FreeBSD new-bus PCCard frontend + * Additional code for FreeBSD new-bus PC Card frontend */ - -static int stg_pccard_match(device_t dev) +static int +stg_pccard_probe(device_t dev) { const struct pccard_product *pp; if ((pp = pccard_product_lookup(dev, stg_products, sizeof(stg_products[0]), NULL)) != NULL) { if (pp->pp_name != NULL) device_set_desc(dev, pp->pp_name); return(0); } return(EIO); } static int -stg_pccard_probe(DEVPORT_PDEVICE dev) +stg_pccard_attach(device_t dev) { struct stg_softc *sc = device_get_softc(dev); int error; sc->port_rid = 0; sc->irq_rid = 0; error = stg_alloc_resource(dev); if (error) { return(error); } if (stg_probe(dev) == 0) { stg_release_resource(dev); return(ENXIO); } - - stg_release_resource(dev); - - return(0); -} - -static int -stg_pccard_attach(DEVPORT_PDEVICE dev) -{ - struct stg_softc *sc = device_get_softc(dev); - int error; - - sc->port_rid = 0; - sc->irq_rid = 0; - error = stg_alloc_resource(dev); - if (error) { - return(error); - } - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CAM | INTR_ENTROPY, stg_intr, (void *)sc, &sc->stg_intrhand); if (error) { stg_release_resource(dev); return(error); } if (stg_attach(dev) == 0) { stg_release_resource(dev); return(ENXIO); } return(0); } static device_method_t stg_pccard_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, pccard_compat_probe), - DEVMETHOD(device_attach, pccard_compat_attach), + DEVMETHOD(device_probe, stg_pccard_probe), + DEVMETHOD(device_attach, stg_pccard_attach), DEVMETHOD(device_detach, stg_detach), - - /* Card interface */ - DEVMETHOD(card_compat_match, stg_pccard_match), - DEVMETHOD(card_compat_probe, stg_pccard_probe), - DEVMETHOD(card_compat_attach, stg_pccard_attach), - { 0, 0 } }; static driver_t stg_pccard_driver = { "stg", stg_pccard_methods, sizeof(struct stg_softc), }; DRIVER_MODULE(stg, pccard, stg_pccard_driver, stg_devclass, 0, 0); MODULE_DEPEND(stg, scsi_low, 1, 1, 1); Index: head/sys/dev/uart/uart_bus_pccard.c =================================================================== --- head/sys/dev/uart/uart_bus_pccard.c (revision 150439) +++ head/sys/dev/uart/uart_bus_pccard.c (revision 150440) @@ -1,102 +1,101 @@ /*- * Copyright (c) 2001 M. Warner Losh. All rights reserved. * Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe 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. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include "pccarddevs.h" -static int uart_pccard_match(device_t self); static int uart_pccard_probe(device_t dev); +static int uart_pccard_attach(device_t dev); static device_method_t uart_pccard_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, pccard_compat_probe), - DEVMETHOD(device_attach, pccard_compat_attach), + DEVMETHOD(device_probe, uart_pccard_probe), + DEVMETHOD(device_attach, uart_pccard_attach), DEVMETHOD(device_detach, uart_bus_detach), - /* Card interface */ - DEVMETHOD(card_compat_match, uart_pccard_match), - DEVMETHOD(card_compat_probe, uart_pccard_probe), - DEVMETHOD(card_compat_attach, uart_bus_attach), - { 0, 0 } }; static driver_t uart_pccard_driver = { uart_driver_name, uart_pccard_methods, sizeof(struct uart_softc), }; static int -uart_pccard_match(device_t dev) +uart_pccard_probe(device_t dev) { int error = 0; u_int32_t fcn = PCCARD_FUNCTION_UNSPEC; error = pccard_get_function(dev, &fcn); if (error != 0) return (error); /* * If a serial card, we are likely the right driver. However, * some serial cards are better servered by other drivers, so * allow other drivers to claim it, if they want. */ if (fcn == PCCARD_FUNCTION_SERIAL) return (-100); - return(ENXIO); + return (ENXIO); } static int -uart_pccard_probe(dev) - device_t dev; +uart_pccard_attach(device_t dev) { struct uart_softc *sc; + int err; + sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; /* Do not probe IRQ - pccard doesn't turn on the interrupt line */ /* until bus_setup_intr but how can I do so?*/ - return (uart_bus_probe(dev, 0, 0, 0, 0)); + err = uart_bus_probe(dev, 0, 0, 0, 0); + if (err) + return (err); + return (uart_bus_attach(dev)); } DRIVER_MODULE(uart, pccard, uart_pccard_driver, uart_devclass, 0, 0);