Deleted Added
full compact
atkbd.c (71394) atkbd.c (80040)
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 71394 2001-01-22 22:54:02Z dwmalone $
26 * $FreeBSD: head/sys/dev/atkbdc/atkbd.c 80040 2001-07-20 13:05:57Z yokota $
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>

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

44#include <machine/psl.h>
45#include <machine/vm86.h>
46#include <machine/pc/bios.h>
47
48#include <vm/vm.h>
49#include <vm/pmap.h>
50#endif /* __i386__ */
51
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>

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

44#include <machine/psl.h>
45#include <machine/vm86.h>
46#include <machine/pc/bios.h>
47
48#include <vm/vm.h>
49#include <vm/pmap.h>
50#endif /* __i386__ */
51
52#include <sys/kbio.h>
52#include <dev/kbd/kbdreg.h>
53#include <dev/kbd/atkbdreg.h>
54#include <dev/kbd/atkbdcreg.h>
55
56#include <isa/isareg.h>
57
58static timeout_t atkbd_timeout;
59

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

162 }
163 splx(s);
164 timeout(atkbd_timeout, arg, hz/10);
165}
166
167/* LOW-LEVEL */
168
169#include <machine/limits.h>
53#include <dev/kbd/kbdreg.h>
54#include <dev/kbd/atkbdreg.h>
55#include <dev/kbd/atkbdcreg.h>
56
57#include <isa/isareg.h>
58
59static timeout_t atkbd_timeout;
60

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

163 }
164 splx(s);
165 timeout(atkbd_timeout, arg, hz/10);
166}
167
168/* LOW-LEVEL */
169
170#include <machine/limits.h>
170#include <sys/kbio.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. */

--- 1231 unchanged lines hidden ---
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. */

--- 1231 unchanged lines hidden ---