Deleted Added
full compact
sio_isa.c (88697) sio_isa.c (89986)
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.

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

16 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 *
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.

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

16 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 * $FreeBSD: head/sys/dev/sio/sio_isa.c 88697 2001-12-30 13:12:50Z sheldonh $
24 * $FreeBSD: head/sys/dev/sio/sio_isa.c 89986 2002-01-30 17:22:04Z jhay $
25 */
26
27#include <sys/param.h>
28#include <sys/systm.h>
29#include <sys/bus.h>
30#include <sys/conf.h>
31#include <sys/kernel.h>
32#include <sys/lock.h>

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

144
145static int
146sio_isa_probe(dev)
147 device_t dev;
148{
149 /* Check isapnp ids */
150 if (ISA_PNP_PROBE(device_get_parent(dev), dev, sio_ids) == ENXIO)
151 return (ENXIO);
25 */
26
27#include <sys/param.h>
28#include <sys/systm.h>
29#include <sys/bus.h>
30#include <sys/conf.h>
31#include <sys/kernel.h>
32#include <sys/lock.h>

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

144
145static int
146sio_isa_probe(dev)
147 device_t dev;
148{
149 /* Check isapnp ids */
150 if (ISA_PNP_PROBE(device_get_parent(dev), dev, sio_ids) == ENXIO)
151 return (ENXIO);
152 return (sioprobe(dev, 0, 0));
152 return (sioprobe(dev, 0, 0UL, 0));
153}
154
155static int
156sio_isa_attach(dev)
157 device_t dev;
158{
153}
154
155static int
156sio_isa_attach(dev)
157 device_t dev;
158{
159 return (sioattach(dev, 0));
159 return (sioattach(dev, 0, 0UL));
160}
161
162DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
163DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0);
160}
161
162DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
163DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0);