Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the PC-like keyboard controller driver into chip back-end and 

bus front-end.
This commit is contained in:
thorpej 1999-12-03 22:48:22 +00:00
parent eab9ce05b7
commit 4560ac465a
25 changed files with 360 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/alpha/alpha/dec_1000a.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $ */
/* $NetBSD: dec_1000a.c,v 1.6 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.6 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -86,8 +86,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $"
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -200,7 +201,7 @@ dec_1000a_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_2100_a50.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_2100_a50.c,v 1.41 1999/04/15 22:06:47 thorpej Exp $ */
/* $NetBSD: dec_2100_a50.c,v 1.42 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.41 1999/04/15 22:06:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.42 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,8 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.41 1999/04/15 22:06:47 thorpej Ex
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -139,7 +140,7 @@ dec_2100_a50_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&acp->ac_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_550.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_550.c,v 1.4 1999/04/15 22:06:47 thorpej Exp $ */
/* $NetBSD: dec_550.c,v 1.5 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.4 1999/04/15 22:06:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.5 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,8 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.4 1999/04/15 22:06:47 thorpej Exp $");
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -128,7 +129,7 @@ dec_550_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_6600.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_6600.c,v 1.1 1999/06/29 07:08:53 ross Exp $ */
/* $NetBSD: dec_6600.c,v 1.2 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.1 1999/06/29 07:08:53 ross Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.2 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -45,8 +45,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.1 1999/06/29 07:08:53 ross Exp $");
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -126,7 +127,7 @@ dec_6600_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&tsp->pc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctbslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_alphabook1.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_alphabook1.c,v 1.3 1999/04/15 22:06:47 thorpej Exp $ */
/* $NetBSD: dec_alphabook1.c,v 1.4 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.3 1999/04/15 22:06:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.4 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,8 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.3 1999/04/15 22:06:47 thorpej E
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -130,7 +131,7 @@ dec_alphabook1_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_axppci_33.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_axppci_33.c,v 1.42 1999/04/15 22:06:47 thorpej Exp $ */
/* $NetBSD: dec_axppci_33.c,v 1.43 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.42 1999/04/15 22:06:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.43 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,8 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.42 1999/04/15 22:06:47 thorpej E
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -174,7 +175,7 @@ dec_axppci_33_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_eb164.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb164.c,v 1.30 1999/09/02 22:04:41 ross Exp $ */
/* $NetBSD: dec_eb164.c,v 1.31 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.30 1999/09/02 22:04:41 ross Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.31 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,8 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.30 1999/09/02 22:04:41 ross Exp $");
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -123,7 +124,7 @@ dec_eb164_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_eb64plus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb64plus.c,v 1.17 1999/04/15 22:06:48 thorpej Exp $ */
/* $NetBSD: dec_eb64plus.c,v 1.18 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.17 1999/04/15 22:06:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.18 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,8 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.17 1999/04/15 22:06:48 thorpej Ex
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -131,7 +132,7 @@ dec_eb64plus_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&acp->ac_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_eb66.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb66.c,v 1.3 1999/04/15 22:06:48 thorpej Exp $ */
/* $NetBSD: dec_eb66.c,v 1.4 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.3 1999/04/15 22:06:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.4 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,8 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.3 1999/04/15 22:06:48 thorpej Exp $")
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -131,7 +132,7 @@ dec_eb66_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_kn20aa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn20aa.c,v 1.40 1999/04/15 22:06:48 thorpej Exp $ */
/* $NetBSD: dec_kn20aa.c,v 1.41 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.40 1999/04/15 22:06:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.41 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,8 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.40 1999/04/15 22:06:48 thorpej Exp
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -131,7 +132,7 @@ dec_kn20aa_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

9
sys/arch/alpha/alpha/dec_kn300.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn300.c,v 1.13 1999/04/15 22:11:57 thorpej Exp $ */
/* $NetBSD: dec_kn300.c,v 1.14 1999/12/03 22:48:22 thorpej Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.13 1999/04/15 22:11:57 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.14 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,8 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.13 1999/04/15 22:11:57 thorpej Exp $
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -139,7 +140,7 @@ dec_kn300_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

6
sys/arch/alpha/alpha/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.186 1999/12/03 07:29:57 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.187 1999/12/03 22:48:22 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -79,7 +79,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.186 1999/12/03 07:29:57 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.187 1999/12/03 22:48:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -858,7 +858,7 @@ consinit()
#include "pckbd.h"
#if (NPCKBC > 0) && (NPCKBD == 0)
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
/*
* This is called by the pbkbc driver if no pckbd is configured.

7
sys/arch/arm32/footbridge/ebsa285_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ebsa285_machdep.c,v 1.8 1999/09/17 19:59:38 thorpej Exp $ */
/* $NetBSD: ebsa285_machdep.c,v 1.9 1999/12/03 22:48:23 thorpej Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@ -76,6 +76,7 @@
#include "isa.h"
#if NISA > 0
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#endif
@ -190,7 +191,7 @@ extern void dumpsys __P((void));
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#endif
#include "com.h"
@ -854,7 +855,7 @@ consinit(void)
vga_cnattach(&footbridge_pci_io_bs_tag,
&footbridge_pci_mem_bs_tag, - 1, 0);
#if (NPCKBC > 0)
pckbc_cnattach(&isa_io_bs_tag, PCKBC_KBD_SLOT);
pckbc_cnattach(&isa_io_bs_tag, IO_KBD, PCKBC_KBD_SLOT);
#endif /* NPCKBC */
}
#endif /* NVGA */

7
sys/arch/bebox/bebox/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.43 1999/11/17 14:56:10 kleink Exp $ */
/* $NetBSD: machdep.c,v 1.44 1999/12/03 22:48:23 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -92,7 +92,8 @@
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/pckbcvar.h>
#include <dev/isa/isareg.h>
#include <dev/ic/pckbcvar.h>
#endif
#include "com.h"
@ -616,7 +617,7 @@ consinit()
if (!strcmp(consinfo->devname, "be")) {
pfb_cnattach(consinfo->addr);
#if (NPCKBC > 0)
pckbc_cnattach(BEBOX_BUS_SPACE_IO, PCKBC_KBD_SLOT);
pckbc_cnattach(BEBOX_BUS_SPACE_IO, IO_KBD, PCKBC_KBD_SLOT);
#endif
return;
}

6
sys/arch/i386/i386/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.368 1999/11/30 15:22:52 drochner Exp $ */
/* $NetBSD: machdep.c,v 1.369 1999/12/03 22:48:23 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -185,7 +185,7 @@ extern struct proc *npxproc;
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#endif
#include "pc.h"
@ -2011,7 +2011,7 @@ consinit()
if (0) goto dokbd; /* XXX stupid gcc */
dokbd:
#if (NPCKBC > 0)
pckbc_cnattach(I386_BUS_SPACE_IO, PCKBC_KBD_SLOT);
pckbc_cnattach(I386_BUS_SPACE_IO, IO_KBD, PCKBC_KBD_SLOT);
#endif
return;
}

4
sys/arch/i386/isa/pccons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccons.c,v 1.136 1999/07/26 19:31:54 wrstuden Exp $ */
/* $NetBSD: pccons.c,v 1.137 1999/12/03 22:48:24 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -105,7 +105,7 @@
#include "pc.h"
#if (NPCCONSKBD > 0)
#include <machine/bus.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#else
/* consistency check: plain pccons can't coexist with pckbc */
#include "pckbc.h"

4
sys/arch/i386/isa/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.45 1999/08/19 15:33:16 drochner Exp $ */
/* $NetBSD: pms.c,v 1.46 1999/12/03 22:48:24 thorpej Exp $ */
/*-
* Copyright (c) 1994, 1997 Charles M. Hannum.
@ -57,7 +57,7 @@
#endif
#if (NOPMS_PCKBC > 0)
#include <machine/bus.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/pckbcvar.h>
#endif
#include <machine/mouse.h>
#include <machine/conf.h>

6
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.335 1999/12/03 18:02:15 mjacob Exp $
# $NetBSD: files,v 1.336 1999/12/03 22:48:24 thorpej Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -333,6 +333,10 @@ defopt opt_com.h COM16650 COM_HAYESP COM_DEBUG
device com: tty
file dev/ic/com.c com needs-flag
# PC-like keyboard controller
device pckbc { [slot = -1] }
file dev/ic/pckbc.c pckbc needs-flag
# Cirrus Logic CD240[01] 4-port Multi-Protocol Communications Controller
device clmpcc: tty
file dev/ic/clmpcc.c clmpcc needs-flag

183
sys/dev/isa/pckbc.c → sys/dev/ic/pckbc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbc.c,v 1.13 1999/12/03 19:02:49 thorpej Exp $ */
/* $NetBSD: pckbc.c,v 1.1 1999/12/03 22:48:25 thorpej Exp $ */
/*
* Copyright (c) 1998
@ -29,7 +29,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <sys/param.h>
@ -44,11 +43,10 @@
#include <machine/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include "locators.h"
#ifdef __HAVE_NWSCONS /* XXX: this port uses sys/dev/pckbc */
#include "pckbd.h"
@ -71,17 +69,6 @@ struct pckbc_devcmd {
int status, responselen, responseidx;
};
struct pckbc_softc {
struct device sc_dv;
isa_chipset_tag_t sc_ic;
struct pckbc_internal *id;
int sc_irq[2];
pckbc_inputfcn inputhandler[2];
void *inputarg[2];
};
/* data per slave device */
struct pckbc_slotdata {
int polling; /* don't read data port in interrupt handler */
@ -93,42 +80,18 @@ struct pckbc_slotdata {
#define CMD_IN_QUEUE(q) (TAILQ_FIRST(&(q)->cmdqueue) != NULL)
/*
* external representation (pckbc_tag_t),
* needed early for console operation
*/
struct pckbc_internal {
bus_space_tag_t t_iot;
bus_space_handle_t t_ioh_d, t_ioh_c; /* data port, cmd port */
u_char t_cmdbyte; /* shadow */
int t_haveaux; /* controller has an aux port */
struct pckbc_slotdata *t_slotdata[2];
struct pckbc_softc *t_sc; /* back pointer */
};
int pckbc_match __P((struct device *, struct cfdata *, void *));
void pckbc_attach __P((struct device *, struct device *, void *));
void pckbc_init_slotdata __P((struct pckbc_slotdata *));
int pckbc_attach_slot __P((struct pckbc_softc *, pckbc_slot_t));
int pckbc_submatch __P((struct device *, struct cfdata *, void *));
int pckbcprint __P((void *, const char *));
struct cfattach pckbc_ca = {
sizeof(struct pckbc_softc), pckbc_match, pckbc_attach,
};
struct pckbc_internal pckbc_consdata;
int pckbc_console_attached;
static int pckbc_console, pckbc_console_attached;
static struct pckbc_internal pckbc_consdata;
static int pckbc_console;
static struct pckbc_slotdata pckbc_cons_slotdata;
static int pckbc_is_console __P((bus_space_tag_t));
static int pckbc_wait_output __P((bus_space_tag_t, bus_space_handle_t));
static int pckbc_send_cmd __P((bus_space_tag_t, bus_space_handle_t, u_char));
static int pckbc_poll_data1 __P((bus_space_tag_t,
bus_space_handle_t, bus_space_handle_t,
pckbc_slot_t, int));
static int pckbc_get8042cmd __P((struct pckbc_internal *));
static int pckbc_put8042cmd __P((struct pckbc_internal *));
@ -142,8 +105,6 @@ void pckbc_cleanup __P((void *));
int pckbc_cmdresponse __P((struct pckbc_internal *, pckbc_slot_t, u_char));
void pckbc_start __P((struct pckbc_internal *, pckbc_slot_t));
int pckbcintr __P((void *));
const char *pckbc_slot_names[] = { "kbd", "aux" };
#define KBC_DEVCMD_ACK 0xfa
@ -166,7 +127,7 @@ pckbc_wait_output(iot, ioh_c)
return (0);
}
static int
int
pckbc_send_cmd(iot, ioh_c, val)
bus_space_tag_t iot;
bus_space_handle_t ioh_c;
@ -178,7 +139,7 @@ pckbc_send_cmd(iot, ioh_c, val)
return (1);
}
static int
int
pckbc_poll_data1(iot, ioh_d, ioh_c, slot, checkaux)
bus_space_tag_t iot;
bus_space_handle_t ioh_d, ioh_c;
@ -278,68 +239,18 @@ pckbc_send_devcmd(t, slot, val)
return (1);
}
static int
pckbc_is_console(iot)
int
pckbc_is_console(iot, addr)
bus_space_tag_t iot;
bus_addr_t addr;
{
if (pckbc_console && !pckbc_console_attached &&
pckbc_consdata.t_iot == iot)
pckbc_consdata.t_iot == iot &&
pckbc_consdata.t_addr == addr)
return (1);
return (0);
}
int
pckbc_match(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh_d, ioh_c;
int res, ok = 1;
/* If values are hardwired to something that they can't be, punt. */
if ((ia->ia_iobase != IOBASEUNK && ia->ia_iobase != IO_KBD) ||
ia->ia_maddr != MADDRUNK ||
(ia->ia_irq != IRQUNK && ia->ia_irq != 1 /* XXX */) ||
ia->ia_drq != DRQUNK)
return (0);
if (!pckbc_is_console(iot)) {
if (bus_space_map(iot, IO_KBD + KBDATAP, 1, 0, &ioh_d))
return (0);
if (bus_space_map(iot, IO_KBD + KBCMDP, 1, 0, &ioh_c)) {
bus_space_unmap(iot, ioh_d, 1);
return (0);
}
/* flush KBC */
(void) pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_KBD_SLOT, 0);
/* KBC selftest */
if (!pckbc_send_cmd(iot, ioh_c, KBC_SELFTEST)) {
ok = 0;
goto out;
}
res = pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_KBD_SLOT, 0);
if (res != 0x55) {
printf("kbc selftest: %x\n", res);
ok = 0;
}
out:
bus_space_unmap(iot, ioh_d, 1);
bus_space_unmap(iot, ioh_c, 1);
}
if (ok) {
ia->ia_iobase = IO_KBD;
ia->ia_iosize = 5;
ia->ia_msize = 0x0;
}
return (ok);
}
int
pckbc_submatch(parent, cf, aux)
struct device *parent;
@ -377,52 +288,19 @@ pckbc_attach_slot(sc, slot)
}
void
pckbc_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
pckbc_attach(sc)
struct pckbc_softc *sc;
{
struct pckbc_softc *sc = (struct pckbc_softc *)self;
struct isa_attach_args *ia = aux;
struct pckbc_internal *t;
bus_space_tag_t iot;
bus_space_handle_t ioh_d, ioh_c;
int res;
u_char cmdbits = 0;
sc->sc_ic = ia->ia_ic;
iot = ia->ia_iot;
/*
* Set up IRQs for "normal" ISA.
*
* XXX The "aux" slot is different on the Alpha AXP150 Jensen.
*/
sc->sc_irq[PCKBC_KBD_SLOT] = 1;
sc->sc_irq[PCKBC_AUX_SLOT] = 12;
if (pckbc_is_console(iot)) {
t = &pckbc_consdata;
ioh_d = t->t_ioh_d;
ioh_c = t->t_ioh_c;
pckbc_console_attached = 1;
/* t->t_cmdbyte was initialized by cnattach */
} else {
if (bus_space_map(iot, IO_KBD + KBDATAP, 1, 0, &ioh_d) ||
bus_space_map(iot, IO_KBD + KBCMDP, 1, 0, &ioh_c))
panic("pckbc_attach: couldn't map");
t = malloc(sizeof(struct pckbc_internal), M_DEVBUF, M_WAITOK);
bzero(t, sizeof(struct pckbc_internal));
t->t_iot = iot;
t->t_ioh_d = ioh_d;
t->t_ioh_c = ioh_c;
t->t_cmdbyte = KC8_CPU; /* Enable ports */
}
t->t_sc = sc;
sc->id = t;
printf("\n");
t = sc->id;
iot = t->t_iot;
ioh_d = t->t_ioh_d;
ioh_c = t->t_ioh_c;
/* flush */
(void) pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_KBD_SLOT, 0);
@ -982,20 +860,11 @@ pckbc_set_inputhandler(self, slot, func, arg)
{
struct pckbc_internal *t = (struct pckbc_internal *)self;
struct pckbc_softc *sc = t->t_sc;
void *rv;
if (slot != PCKBC_KBD_SLOT && slot != PCKBC_AUX_SLOT)
if (slot >= PCKBC_NSLOTS)
panic("pckbc_set_inputhandler: bad slot %d", slot);
rv = isa_intr_establish(sc->sc_ic, sc->sc_irq[slot], IST_EDGE,
IPL_TTY, pckbcintr, sc);
if (rv == NULL) {
printf("%s: unable to establish interrupt for %s slot\n",
sc->sc_dv.dv_xname, pckbc_slot_names[slot]);
} else {
printf("%s: using irq %d for %s slot\n", sc->sc_dv.dv_xname,
sc->sc_irq[slot], pckbc_slot_names[slot]);
}
(*sc->intr_establish)(sc, slot);
sc->inputhandler[slot] = func;
sc->inputarg[slot] = arg;
@ -1052,16 +921,17 @@ pckbcintr(vsc)
}
int
pckbc_cnattach(iot, slot)
pckbc_cnattach(iot, addr, slot)
bus_space_tag_t iot;
bus_addr_t addr;
pckbc_slot_t slot;
{
bus_space_handle_t ioh_d, ioh_c;
int res = 0;
if (bus_space_map(iot, IO_KBD + KBDATAP, 1, 0, &ioh_d))
if (bus_space_map(iot, addr + KBDATAP, 1, 0, &ioh_d))
return (ENXIO);
if (bus_space_map(iot, IO_KBD + KBCMDP, 1, 0, &ioh_c)) {
if (bus_space_map(iot, addr + KBCMDP, 1, 0, &ioh_c)) {
bus_space_unmap(iot, ioh_d, 1);
return (ENXIO);
}
@ -1069,6 +939,7 @@ pckbc_cnattach(iot, slot)
pckbc_consdata.t_iot = iot;
pckbc_consdata.t_ioh_d = ioh_d;
pckbc_consdata.t_ioh_c = ioh_c;
pckbc_consdata.t_addr = addr;
/* flush */
(void) pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_KBD_SLOT, 0);

52
sys/dev/isa/pckbcvar.h → sys/dev/ic/pckbcvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbcvar.h,v 1.1 1998/03/22 15:25:15 drochner Exp $ */
/* $NetBSD: pckbcvar.h,v 1.1 1999/12/03 22:48:25 thorpej Exp $ */
/*
* Copyright (c) 1998
@ -32,20 +32,54 @@
*
*/
#ifndef _DEV_ISA_PCKBCVAR_H_
#define _DEV_ISA_PCKBCVAR_H_
#ifndef _DEV_IC_PCKBCVAR_H_
#define _DEV_IC_PCKBCVAR_H_
typedef void *pckbc_tag_t;
typedef int pckbc_slot_t;
#define PCKBC_KBD_SLOT 0
#define PCKBC_AUX_SLOT 1
#define PCKBC_NSLOTS 2
/*
* external representation (pckbc_tag_t),
* needed early for console operation
*/
struct pckbc_internal {
bus_space_tag_t t_iot;
bus_space_handle_t t_ioh_d, t_ioh_c; /* data port, cmd port */
bus_addr_t t_addr;
u_char t_cmdbyte; /* shadow */
int t_haveaux; /* controller has an aux port */
struct pckbc_slotdata *t_slotdata[PCKBC_NSLOTS];
struct pckbc_softc *t_sc; /* back pointer */
};
typedef void (*pckbc_inputfcn) __P((void *, int));
/*
* State per device.
*/
struct pckbc_softc {
struct device sc_dv;
struct pckbc_internal *id;
pckbc_inputfcn inputhandler[PCKBC_NSLOTS];
void *inputarg[PCKBC_NSLOTS];
void (*intr_establish) __P((struct pckbc_softc *, pckbc_slot_t));
};
struct pckbc_attach_args {
pckbc_tag_t pa_tag;
pckbc_slot_t pa_slot;
};
typedef void (*pckbc_inputfcn) __P((void *, int));
extern const char *pckbc_slot_names[];
extern struct pckbc_internal pckbc_consdata;
extern int pckbc_console_attached;
void pckbc_set_inputhandler __P((pckbc_tag_t, pckbc_slot_t,
pckbc_inputfcn, void *));
@ -55,14 +89,20 @@ int pckbc_poll_cmd __P((pckbc_tag_t, pckbc_slot_t, u_char *, int,
int, u_char *, int));
int pckbc_enqueue_cmd __P((pckbc_tag_t, pckbc_slot_t, u_char *, int,
int, int, u_char *));
int pckbc_send_cmd __P((bus_space_tag_t, bus_space_handle_t, u_char));
int pckbc_poll_data __P((pckbc_tag_t, pckbc_slot_t));
int pckbc_poll_data1 __P((bus_space_tag_t, bus_space_handle_t,
bus_space_handle_t, pckbc_slot_t, int));
void pckbc_set_poll __P((pckbc_tag_t, pckbc_slot_t, int));
int pckbc_xt_translation __P((pckbc_tag_t, pckbc_slot_t, int));
void pckbc_slot_enable __P((pckbc_tag_t, pckbc_slot_t, int));
int pckbc_cnattach __P((bus_space_tag_t, pckbc_slot_t));
void pckbc_attach __P((struct pckbc_softc *));
int pckbc_cnattach __P((bus_space_tag_t, bus_addr_t, pckbc_slot_t));
int pckbc_is_console __P((bus_space_tag_t, bus_addr_t));
int pckbcintr __P((void *));
/* md hook for use without mi wscons */
int pckbc_machdep_cnattach __P((pckbc_tag_t, pckbc_slot_t));
#endif
#endif /* _DEV_IC_PCKBCVAR_H_ */

11
sys/dev/isa/files.isa
View File

@ -1,4 +1,4 @@
# $NetBSD: files.isa,v 1.92 1999/11/15 21:13:38 mcr Exp $
# $NetBSD: files.isa,v 1.93 1999/12/03 22:48:24 thorpej Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@ -367,12 +367,9 @@ device satlink: isadma
attach satlink at isa
file dev/isa/satlink.c satlink needs-flag
#
# PC keyboard controller
#
device pckbc {[slot = -1]}
attach pckbc at isa
file dev/isa/pckbc.c pckbc needs-flag
# ISA PC keyboard controller
attach pckbc at isa with pckbc_isa
file dev/isa/pckbc_isa.c pckbc needs-flag
# generic ISA VGA
attach vga at isa with vga_isa

191
sys/dev/isa/pckbc_isa.c Normal file
View File

@ -0,0 +1,191 @@
/* $NetBSD: pckbc_isa.c,v 1.1 1999/12/03 22:48:25 thorpej Exp $ */
/*
* Copyright (c) 1998
* Matthias Drochner. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed for the NetBSD Project
* by Matthias Drochner.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/queue.h>
#include <sys/lock.h>
#include <machine/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
int pckbc_isa_match __P((struct device *, struct cfdata *, void *));
void pckbc_isa_attach __P((struct device *, struct device *, void *));
struct pckbc_isa_softc {
struct pckbc_softc sc_pckbc;
isa_chipset_tag_t sc_ic;
int sc_irq[PCKBC_NSLOTS];
};
struct cfattach pckbc_isa_ca = {
sizeof(struct pckbc_isa_softc), pckbc_isa_match, pckbc_isa_attach,
};
void pckbc_isa_intr_establish __P((struct pckbc_softc *, pckbc_slot_t));
int
pckbc_isa_match(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh_d, ioh_c;
int res, ok = 1;
/* If values are hardwired to something that they can't be, punt. */
if ((ia->ia_iobase != IOBASEUNK && ia->ia_iobase != IO_KBD) ||
ia->ia_maddr != MADDRUNK ||
(ia->ia_irq != IRQUNK && ia->ia_irq != 1 /* XXX */) ||
ia->ia_drq != DRQUNK)
return (0);
if (pckbc_is_console(iot, IO_KBD) == 0) {
if (bus_space_map(iot, IO_KBD + KBDATAP, 1, 0, &ioh_d))
return (0);
if (bus_space_map(iot, IO_KBD + KBCMDP, 1, 0, &ioh_c)) {
bus_space_unmap(iot, ioh_d, 1);
return (0);
}
/* flush KBC */
(void) pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_KBD_SLOT, 0);
/* KBC selftest */
if (pckbc_send_cmd(iot, ioh_c, KBC_SELFTEST) == 0) {
ok = 0;
goto out;
}
res = pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_KBD_SLOT, 0);
if (res != 0x55) {
printf("kbc selftest: %x\n", res);
ok = 0;
}
out:
bus_space_unmap(iot, ioh_d, 1);
bus_space_unmap(iot, ioh_c, 1);
}
if (ok) {
ia->ia_iobase = IO_KBD;
ia->ia_iosize = 5;
ia->ia_msize = 0x0;
}
return (ok);
}
void
pckbc_isa_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct pckbc_isa_softc *isc = (void *)self;
struct pckbc_softc *sc = &isc->sc_pckbc;
struct isa_attach_args *ia = aux;
struct pckbc_internal *t;
bus_space_tag_t iot;
bus_space_handle_t ioh_d, ioh_c;
isc->sc_ic = ia->ia_ic;
iot = ia->ia_iot;
/*
* Set up IRQs for "normal" ISA.
*
* XXX The "aux" slot is different (9) on the Alpha AXP150 Jensen.
*/
isc->sc_irq[PCKBC_KBD_SLOT] = 1;
isc->sc_irq[PCKBC_AUX_SLOT] = 12;
sc->intr_establish = pckbc_isa_intr_establish;
if (pckbc_is_console(iot, IO_KBD)) {
t = &pckbc_consdata;
ioh_d = t->t_ioh_d;
ioh_c = t->t_ioh_c;
pckbc_console_attached = 1;
/* t->t_cmdbyte was initialized by cnattach */
} else {
if (bus_space_map(iot, IO_KBD + KBDATAP, 1, 0, &ioh_d) ||
bus_space_map(iot, IO_KBD + KBCMDP, 1, 0, &ioh_c))
panic("pckbc_attach: couldn't map");
t = malloc(sizeof(struct pckbc_internal), M_DEVBUF, M_WAITOK);
bzero(t, sizeof(struct pckbc_internal));
t->t_iot = iot;
t->t_ioh_d = ioh_d;
t->t_ioh_c = ioh_c;
t->t_addr = IO_KBD;
t->t_cmdbyte = KC8_CPU; /* Enable ports */
}
t->t_sc = sc;
sc->id = t;
printf("\n");
/* Finish off the attach. */
pckbc_attach(sc);
}
void
pckbc_isa_intr_establish(sc, slot)
struct pckbc_softc *sc;
pckbc_slot_t slot;
{
struct pckbc_isa_softc *isc = (void *) sc;
void *rv;
rv = isa_intr_establish(isc->sc_ic, isc->sc_irq[slot], IST_EDGE,
IPL_TTY, pckbcintr, sc);
if (rv == NULL) {
printf("%s: unable to establish interrupt for %s slot\n",
sc->sc_dv.dv_xname, pckbc_slot_names[slot]);
} else {
printf("%s: using irq %d for %s slot\n", sc->sc_dv.dv_xname,
isc->sc_irq[slot], pckbc_slot_names[slot]);
}
}

10
sys/dev/pckbc/pckbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbd.c,v 1.20 1999/08/25 00:59:50 ross Exp $ */
/* $NetBSD: pckbd.c,v 1.21 1999/12/03 22:48:25 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -84,9 +84,11 @@
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <machine/bus.h>
#include <dev/isa/isavar.h> /* XXX XXX XXX */
#include <dev/ic/pckbcvar.h>
#include <dev/pckbc/pckbdreg.h>
#include <dev/pckbc/pckbdvar.h>

7
sys/dev/pckbc/psm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: psm.c,v 1.8 1999/05/03 15:45:16 ad Exp $ */
/* $NetBSD: psm.c,v 1.9 1999/12/03 22:48:25 thorpej Exp $ */
/*-
* Copyright (c) 1994 Charles M. Hannum.
@ -28,8 +28,9 @@
#include <sys/device.h>
#include <sys/ioctl.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <machine/bus.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pckbc/psmreg.h>

7
sys/dev/pckbc/psm_intelli.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: psm_intelli.c,v 1.5 1999/05/03 15:50:38 ad Exp $ */
/* $NetBSD: psm_intelli.c,v 1.6 1999/12/03 22:48:25 thorpej Exp $ */
/*-
* Copyright (c) 1994 Charles M. Hannum.
@ -28,8 +28,9 @@
#include <sys/device.h>
#include <sys/ioctl.h>
#include <dev/isa/isavar.h>
#include <dev/isa/pckbcvar.h>
#include <machine/bus.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pckbc/psmreg.h>