Deleted Added
full compact
atkbd.c (110398) atkbd.c (114216)
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 * $FreeBSD: head/sys/dev/atkbdc/atkbd.c 110398 2003-02-05 14:03:55Z charnier $
26 * $FreeBSD: head/sys/dev/atkbdc/atkbd.c 114216 2003-04-29 13:36:06Z kan $
27 */
28
29#include "opt_kbd.h"
30#include "opt_atkbd.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/bus.h>
36#include <sys/proc.h>
27 */
28
29#include "opt_kbd.h"
30#include "opt_atkbd.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/bus.h>
36#include <sys/proc.h>
37#include <sys/limits.h>
37#include <sys/malloc.h>
38
39#include <machine/bus.h>
40#include <machine/resource.h>
41
42#ifdef __i386__
43#include <machine/md_var.h>
44#include <machine/psl.h>

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

162 (*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
163 }
164 splx(s);
165 timeout(atkbd_timeout, arg, hz/10);
166}
167
168/* LOW-LEVEL */
169
38#include <sys/malloc.h>
39
40#include <machine/bus.h>
41#include <machine/resource.h>
42
43#ifdef __i386__
44#include <machine/md_var.h>
45#include <machine/psl.h>

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

163 (*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
164 }
165 splx(s);
166 timeout(atkbd_timeout, arg, hz/10);
167}
168
169/* LOW-LEVEL */
170
170#include <machine/limits.h>
171
172#define ATKBD_DEFAULT 0
173
174typedef struct atkbd_state {
175 KBDC kbdc; /* keyboard controller */
176 /* XXX: don't move this field; pcvt
177 * expects `kbdc' to be the first
178 * field in this structure. */
179 int ks_mode; /* input mode (K_XLATE,K_RAW,K_CODE) */

--- 1230 unchanged lines hidden ---
171#define ATKBD_DEFAULT 0
172
173typedef struct atkbd_state {
174 KBDC kbdc; /* keyboard controller */
175 /* XXX: don't move this field; pcvt
176 * expects `kbdc' to be the first
177 * field in this structure. */
178 int ks_mode; /* input mode (K_XLATE,K_RAW,K_CODE) */

--- 1230 unchanged lines hidden ---