Deleted Added
full compact
sio_pccard.c (146734) sio_pccard.c (150306)
1/*-
2 * Copyright (c) 2001 M. Warner Losh. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 9 unchanged lines hidden (view full) ---

18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 M. Warner Losh. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 9 unchanged lines hidden (view full) ---

18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25#include <sys/cdefs.h>
26__FBSDID("$FreeBSD: head/sys/dev/sio/sio_pccard.c 146734 2005-05-29 04:42:30Z nyan $");
26__FBSDID("$FreeBSD: head/sys/dev/sio/sio_pccard.c 150306 2005-09-19 03:10:21Z imp $");
27
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/bus.h>
31#include <sys/conf.h>
32#include <sys/kernel.h>
33#include <sys/lock.h>
34#include <sys/malloc.h>

--- 4 unchanged lines hidden (view full) ---

39#include <machine/resource.h>
40#include <sys/timepps.h>
41
42#include <dev/pccard/pccard_cis.h>
43#include <dev/pccard/pccardvar.h>
44
45#include <dev/sio/siovar.h>
46
27
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/bus.h>
31#include <sys/conf.h>
32#include <sys/kernel.h>
33#include <sys/lock.h>
34#include <sys/malloc.h>

--- 4 unchanged lines hidden (view full) ---

39#include <machine/resource.h>
40#include <sys/timepps.h>
41
42#include <dev/pccard/pccard_cis.h>
43#include <dev/pccard/pccardvar.h>
44
45#include <dev/sio/siovar.h>
46
47#include "pccarddevs.h"
48
49static int sio_pccard_attach(device_t dev);
47static int sio_pccard_attach(device_t dev);
50static int sio_pccard_match(device_t self);
51static int sio_pccard_probe(device_t dev);
52
53static device_method_t sio_pccard_methods[] = {
54 /* Device interface */
48static int sio_pccard_probe(device_t dev);
49
50static device_method_t sio_pccard_methods[] = {
51 /* Device interface */
55 DEVMETHOD(device_probe, pccard_compat_probe),
56 DEVMETHOD(device_attach, pccard_compat_attach),
52 DEVMETHOD(device_probe, sio_pccard_probe),
53 DEVMETHOD(device_attach, sio_pccard_attach),
57 DEVMETHOD(device_detach, siodetach),
58
54 DEVMETHOD(device_detach, siodetach),
55
59 /* Card interface */
60 DEVMETHOD(card_compat_match, sio_pccard_match),
61 DEVMETHOD(card_compat_probe, sio_pccard_probe),
62 DEVMETHOD(card_compat_attach, sio_pccard_attach),
63
64 { 0, 0 }
65};
66
67static driver_t sio_pccard_driver = {
68 sio_driver_name,
69 sio_pccard_methods,
70 0,
71};
72
73static int
56 { 0, 0 }
57};
58
59static driver_t sio_pccard_driver = {
60 sio_driver_name,
61 sio_pccard_methods,
62 0,
63};
64
65static int
74sio_pccard_match(device_t dev)
66sio_pccard_probe(device_t dev)
75{
76 int error = 0;
77 u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;
78
79 error = pccard_get_function(dev, &fcn);
80 if (error != 0)
81 return (error);
67{
68 int error = 0;
69 u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;
70
71 error = pccard_get_function(dev, &fcn);
72 if (error != 0)
73 return (error);
74
82 /*
83 * If a serial card, we are likely the right driver. However,
84 * some serial cards are better servered by other drivers, so
85 * allow other drivers to claim it, if they want.
86 */
87 if (fcn == PCCARD_FUNCTION_SERIAL)
88 return (-100);
75 /*
76 * If a serial card, we are likely the right driver. However,
77 * some serial cards are better servered by other drivers, so
78 * allow other drivers to claim it, if they want.
79 */
80 if (fcn == PCCARD_FUNCTION_SERIAL)
81 return (-100);
89
90 return(ENXIO);
82 return (ENXIO);
91}
92
93static int
83}
84
85static int
94sio_pccard_probe(dev)
86sio_pccard_attach(dev)
95 device_t dev;
96{
87 device_t dev;
88{
89 int err;
97
98#ifdef PC98
99 SET_FLAG(dev, SET_IFTYPE(COM_IF_MODEM_CARD));
100#endif
101 /* Do not probe IRQ - pccard doesn't turn on the interrupt line */
102 /* until bus_setup_intr */
90
91#ifdef PC98
92 SET_FLAG(dev, SET_IFTYPE(COM_IF_MODEM_CARD));
93#endif
94 /* Do not probe IRQ - pccard doesn't turn on the interrupt line */
95 /* until bus_setup_intr */
103 return (sioprobe(dev, 0, 0UL, 1));
104}
105
106static int
107sio_pccard_attach(dev)
108 device_t dev;
109{
96 if ((err = sioprobe(dev, 0, 0UL, 1)) != 0)
97 return (err);
110 return (sioattach(dev, 0, 0UL));
111}
112
113DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0);
98 return (sioattach(dev, 0, 0UL));
99}
100
101DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0);