Deleted Added
full compact
atkbdc_isa.c (47400) atkbdc_isa.c (47618)
1/*-
2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $Id: atkbdc_isa.c,v 1.6 1999/05/18 11:33:14 yokota Exp $
26 * $Id: atkbdc_isa.c,v 1.7 1999/05/22 15:47:33 dfr Exp $
27 */
28
29#include "atkbdc.h"
30#include "opt_kbd.h"
31
32#if NATKBDC > 0
33
34#include <sys/param.h>

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

92
93static int
94atkbdc_probe(device_t dev)
95{
96 int error;
97 int rid;
98 struct resource *port;
99
27 */
28
29#include "atkbdc.h"
30#include "opt_kbd.h"
31
32#if NATKBDC > 0
33
34#include <sys/param.h>

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

92
93static int
94atkbdc_probe(device_t dev)
95{
96 int error;
97 int rid;
98 struct resource *port;
99
100 /* Check isapnp ids */
101 if (isa_get_vendorid(dev))
102 return (ENXIO);
103
100 device_set_desc(dev, "keyboard controller (i8042)");
101 rid = 0;
102 port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
103 0, ~0, IO_KBDSIZE, RF_ACTIVE);
104 if (!port)
105 return ENXIO;
106 error = atkbdc_probe_unit(device_get_unit(dev), rman_get_start(port));
107 bus_release_resource(dev, SYS_RES_IOPORT, rid, port);

--- 151 unchanged lines hidden ---
104 device_set_desc(dev, "keyboard controller (i8042)");
105 rid = 0;
106 port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
107 0, ~0, IO_KBDSIZE, RF_ACTIVE);
108 if (!port)
109 return ENXIO;
110 error = atkbdc_probe_unit(device_get_unit(dev), rman_get_start(port));
111 bus_release_resource(dev, SYS_RES_IOPORT, rid, port);

--- 151 unchanged lines hidden ---