Deleted Added
full compact
atkbd_atkbdc.c (147263) atkbd_atkbdc.c (147271)
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

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

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
27#include <sys/cdefs.h>
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

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

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/atkbdc/atkbd_atkbdc.c 129880 2004-05-30 20:27:19Z phk $");
28__FBSDID("$FreeBSD: head/sys/dev/atkbdc/atkbd_atkbdc.c 147271 2005-06-10 20:56:38Z marius $");
29
30#include "opt_kbd.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/bus.h>
37
38#include <machine/bus.h>
39#include <machine/resource.h>
40#include <sys/rman.h>
41
42#include <sys/kbio.h>
43#include <dev/kbd/kbdreg.h>
29
30#include "opt_kbd.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/bus.h>
37
38#include <machine/bus.h>
39#include <machine/resource.h>
40#include <sys/rman.h>
41
42#include <sys/kbio.h>
43#include <dev/kbd/kbdreg.h>
44#include <dev/kbd/atkbdreg.h>
45#include <dev/kbd/atkbdcreg.h>
44#include <dev/atkbdc/atkbdreg.h>
45#include <dev/atkbdc/atkbdcreg.h>
46
46
47#include <isa/isareg.h>
48#include <isa/isavar.h>
49
50typedef struct {
51 struct resource *intr;
52 void *ih;
53} atkbd_softc_t;
54
55static devclass_t atkbd_devclass;
56
57static void atkbdidentify(driver_t *driver, device_t dev);
58static int atkbdprobe(device_t dev);
59static int atkbdattach(device_t dev);
60static int atkbdresume(device_t dev);
47typedef struct {
48 struct resource *intr;
49 void *ih;
50} atkbd_softc_t;
51
52static devclass_t atkbd_devclass;
53
54static void atkbdidentify(driver_t *driver, device_t dev);
55static int atkbdprobe(device_t dev);
56static int atkbdattach(device_t dev);
57static int atkbdresume(device_t dev);
61static void atkbd_isa_intr(void *arg);
58static void atkbdintr(void *arg);
62
63static device_method_t atkbd_methods[] = {
64 DEVMETHOD(device_identify, atkbdidentify),
65 DEVMETHOD(device_probe, atkbdprobe),
66 DEVMETHOD(device_attach, atkbdattach),
67 DEVMETHOD(device_resume, atkbdresume),
68 { 0, 0 }
69};

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

134 if (error)
135 return error;
136
137 /* declare our interrupt handler */
138 sc->intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
139 RF_SHAREABLE | RF_ACTIVE);
140 if (sc->intr == NULL)
141 return ENXIO;
59
60static device_method_t atkbd_methods[] = {
61 DEVMETHOD(device_identify, atkbdidentify),
62 DEVMETHOD(device_probe, atkbdprobe),
63 DEVMETHOD(device_attach, atkbdattach),
64 DEVMETHOD(device_resume, atkbdresume),
65 { 0, 0 }
66};

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

131 if (error)
132 return error;
133
134 /* declare our interrupt handler */
135 sc->intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
136 RF_SHAREABLE | RF_ACTIVE);
137 if (sc->intr == NULL)
138 return ENXIO;
142 error = bus_setup_intr(dev, sc->intr, INTR_TYPE_TTY, atkbd_isa_intr,
139 error = bus_setup_intr(dev, sc->intr, INTR_TYPE_TTY, atkbdintr,
143 kbd, &sc->ih);
144 if (error)
145 bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr);
146
147 return error;
148}
149
150static int

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

164 (*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd,
165 args, device_get_flags(dev));
166 (*kbdsw[kbd->kb_index]->clear_state)(kbd);
167 }
168 return 0;
169}
170
171static void
140 kbd, &sc->ih);
141 if (error)
142 bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr);
143
144 return error;
145}
146
147static int

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

161 (*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd,
162 args, device_get_flags(dev));
163 (*kbdsw[kbd->kb_index]->clear_state)(kbd);
164 }
165 return 0;
166}
167
168static void
172atkbd_isa_intr(void *arg)
169atkbdintr(void *arg)
173{
174 keyboard_t *kbd;
175
176 kbd = (keyboard_t *)arg;
177 (*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
178}
179
180DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0);
170{
171 keyboard_t *kbd;
172
173 kbd = (keyboard_t *)arg;
174 (*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
175}
176
177DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0);