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

increase number of parameters of pckbc_cnattach(), since offset of command port

Browse Source 
is not 4 (KBCMDP), but 1 on jazz based platforms of arc port.
This commit is contained in:
soda 2000-06-09 04:58:32 +00:00
parent 8ac7bdd00c
commit 0f76c56f2d
17 changed files with 80 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_1000a.c,v 1.7 2000/05/22 20:13:31 thorpej Exp $ */
/* $NetBSD: dec_1000a.c,v 1.8 2000/06/09 04:58:32 soda 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.7 2000/05/22 20:13:31 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.8 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -88,6 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.7 2000/05/22 20:13:31 thorpej Exp $"
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -201,7 +202,7 @@ dec_1000a_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */
/* $NetBSD: dec_2100_a50.c,v 1.44 2000/06/09 04:58:32 soda 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.43 2000/05/22 20:13:31 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.44 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Ex
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -140,7 +141,8 @@ dec_2100_a50_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_550.c,v 1.8 2000/06/06 20:26:19 matt Exp $ */
/* $NetBSD: dec_550.c,v 1.9 2000/06/09 04:58:32 soda 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.8 2000/06/06 20:26:19 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.9 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.8 2000/06/06 20:26:19 matt Exp $");
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -132,7 +133,8 @@ dec_550_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_6600.c,v 1.5 2000/06/06 20:26:19 matt Exp $ */
/* $NetBSD: dec_6600.c,v 1.6 2000/06/09 04:58:32 soda 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.5 2000/06/06 20:26:19 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.6 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.5 2000/06/06 20:26:19 matt Exp $");
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -128,7 +129,8 @@ dec_6600_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctbslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_alphabook1.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $ */
/* $NetBSD: dec_alphabook1.c,v 1.6 2000/06/09 04:58:32 soda 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.5 2000/05/22 20:13:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.6 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.5 2000/05/22 20:13:32 thorpej E
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -131,7 +132,8 @@ dec_alphabook1_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
/* $NetBSD: dec_axppci_33.c,v 1.45 2000/06/09 04:58:32 soda 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.44 2000/05/22 20:13:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.45 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej E
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -175,7 +176,8 @@ dec_axppci_33_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb164.c,v 1.34 2000/06/06 20:26:19 matt Exp $ */
/* $NetBSD: dec_eb164.c,v 1.35 2000/06/09 04:58:32 soda 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.34 2000/06/06 20:26:19 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.35 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.34 2000/06/06 20:26:19 matt Exp $");
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -127,7 +128,8 @@ dec_eb164_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb64plus.c,v 1.19 2000/05/22 20:13:32 thorpej Exp $ */
/* $NetBSD: dec_eb64plus.c,v 1.20 2000/06/09 04:58:32 soda 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.19 2000/05/22 20:13:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.20 2000/06/09 04:58:32 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.19 2000/05/22 20:13:32 thorpej Ex
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -132,7 +133,8 @@ dec_eb64plus_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb66.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $ */
/* $NetBSD: dec_eb66.c,v 1.6 2000/06/09 04:58:33 soda 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.5 2000/05/22 20:13:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.6 2000/06/09 04:58:33 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $")
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -132,7 +133,8 @@ dec_eb66_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */
/* $NetBSD: dec_kn20aa.c,v 1.43 2000/06/09 04:58:33 soda 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.42 2000/05/22 20:13:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.43 2000/06/09 04:58:33 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -132,7 +133,8 @@ dec_kn20aa_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn300.c,v 1.16 2000/05/26 21:19:20 thorpej Exp $ */
/* $NetBSD: dec_kn300.c,v 1.17 2000/06/09 04:58:33 soda 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.16 2000/05/26 21:19:20 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.17 2000/06/09 04:58:33 soda Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.16 2000/05/26 21:19:20 thorpej Exp $
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -140,7 +141,8 @@ dec_kn300_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)

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

@ -1,4 +1,4 @@
/* $NetBSD: ebsa285_machdep.c,v 1.11 2000/03/24 17:05:31 ws Exp $ */
/* $NetBSD: ebsa285_machdep.c,v 1.12 2000/06/09 04:58:34 soda Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@ -191,6 +191,7 @@ extern void dumpsys __P((void));
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#endif
@ -855,7 +856,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, IO_KBD, PCKBC_KBD_SLOT);
pckbc_cnattach(&isa_io_bs_tag, IO_KBD, KBCMDP, PCKBC_KBD_SLOT);
#endif /* NPCKBC */
}
#endif /* NVGA */

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

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.52 2000/05/26 21:19:35 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.53 2000/06/09 04:58:34 soda Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -92,6 +92,7 @@
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/isareg.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#endif
@ -618,7 +619,8 @@ consinit()
if (!strcmp(consinfo->devname, "be")) {
pfb_cnattach(consinfo->addr);
#if (NPCKBC > 0)
pckbc_cnattach(BEBOX_BUS_SPACE_IO, IO_KBD, PCKBC_KBD_SLOT);
pckbc_cnattach(BEBOX_BUS_SPACE_IO, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
#endif
return;
}
@ -636,7 +638,8 @@ consinit()
#endif
dokbd:
#if (NPCKBC > 0)
pckbc_cnattach(BEBOX_BUS_SPACE_IO, PCKBC_KBD_SLOT);
pckbc_cnattach(BEBOX_BUS_SPACE_IO, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
#endif
return;
}

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

@ -1,4 +1,4 @@
/* $NetBSD: consinit.c,v 1.2 1999/12/21 16:06:31 drochner Exp $ */
/* $NetBSD: consinit.c,v 1.3 2000/06/09 04:58:34 soda Exp $ */
/*
* Copyright (c) 1998
@ -53,6 +53,7 @@
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/isareg.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#endif
#include "pckbd.h" /* for pckbc_machdep_cnattach */
@ -167,7 +168,8 @@ consinit()
if (0) goto dokbd; /* XXX stupid gcc */
dokbd:
#if (NPCKBC > 0)
pckbc_cnattach(I386_BUS_SPACE_IO, IO_KBD, PCKBC_KBD_SLOT);
pckbc_cnattach(I386_BUS_SPACE_IO, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
#endif
return;
}

9
sys/arch/prep/prep/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.5 2000/05/26 21:20:14 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.6 2000/06/09 04:58:35 soda Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -93,6 +93,7 @@
#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/isareg.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
#endif
#include "pckbd.h" /* for pckbc_machdep_cnattach */
@ -679,7 +680,8 @@ consinit()
if (!strcmp(consinfo->devname, "fb")) {
pfb_cnattach(consinfo->addr);
#if (NPCKBC > 0)
pckbc_cnattach(PREP_BUS_SPACE_IO, PCKBC_KBD_SLOT);
pckbc_cnattach(PREP_BUS_SPACE_IO, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
#endif
return;
}
@ -697,7 +699,8 @@ consinit()
#endif
dokbd:
#if (NPCKBC > 0)
pckbc_cnattach(PREP_BUS_SPACE_IO, IO_KBD, PCKBC_KBD_SLOT);
pckbc_cnattach(PREP_BUS_SPACE_IO, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
#endif
return;
}

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

@ -1,4 +1,4 @@
/* $NetBSD: pckbc.c,v 1.4 2000/06/06 16:21:22 sommerfeld Exp $ */
/* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
/*
* Copyright (c) 1998
@ -939,9 +939,10 @@ pckbcintr(vsc)
}
int
pckbc_cnattach(iot, addr, slot)
pckbc_cnattach(iot, addr, cmd_offset, slot)
bus_space_tag_t iot;
bus_addr_t addr;
bus_size_t cmd_offset;
pckbc_slot_t slot;
{
bus_space_handle_t ioh_d, ioh_c;
@ -949,7 +950,7 @@ pckbc_cnattach(iot, addr, slot)
if (bus_space_map(iot, addr + KBDATAP, 1, 0, &ioh_d))
return (ENXIO);
if (bus_space_map(iot, addr + KBCMDP, 1, 0, &ioh_c)) {
if (bus_space_map(iot, addr + cmd_offset, 1, 0, &ioh_c)) {
bus_space_unmap(iot, ioh_d, 1);
return (ENXIO);
}

5
sys/dev/ic/pckbcvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbcvar.h,v 1.3 2000/06/05 22:20:55 sommerfeld Exp $ */
/* $NetBSD: pckbcvar.h,v 1.4 2000/06/09 04:58:35 soda Exp $ */
/*
* Copyright (c) 1998
@ -103,7 +103,8 @@ int pckbc_xt_translation __P((pckbc_tag_t, pckbc_slot_t, int));
void pckbc_slot_enable __P((pckbc_tag_t, pckbc_slot_t, int));
void pckbc_attach __P((struct pckbc_softc *));
int pckbc_cnattach __P((bus_space_tag_t, bus_addr_t, pckbc_slot_t));
int pckbc_cnattach __P((bus_space_tag_t, bus_addr_t, bus_size_t,
pckbc_slot_t));
int pckbc_is_console __P((bus_space_tag_t, bus_addr_t));
int pckbcintr __P((void *));