Module Name: src
Committed By: jdc
Date: Sat Oct 13 17:58:55 UTC 2012
Modified Files:
src/sys/arch/alpha/alpha: api_up1000.c dec_1000a.c dec_2000_300.c
dec_2100_a50.c dec_2100_a500.c dec_550.c dec_6600.c
dec_alphabook1.c dec_axppci_33.c dec_eb164.c dec_eb64plus.c
dec_eb66.c dec_kn20aa.c dec_kn300.c
src/sys/arch/arc/arc: c_isa.c c_jazz_eisa.c c_nec_pci.c
src/sys/arch/atari/isa: isa_machdep.c
src/sys/arch/bebox/bebox: machdep.c
src/sys/arch/cats/cats: cats_machdep.c
src/sys/arch/evbmips/loongson: machdep.c
src/sys/arch/evbppc/explora: consinit.c
src/sys/arch/ibmnws/ibmnws: consinit.c
src/sys/arch/mvmeppc/mvmeppc: machdep.c
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/powerpc/oea: ofw_consinit.c
src/sys/arch/prep/prep: consinit.c
src/sys/arch/sgimips/sgimips: console.c
src/sys/arch/shark/shark: consinit.c
src/sys/arch/sparc/dev: pckbc_js.c
src/sys/arch/x86/x86: consinit.c
src/sys/arch/xen/x86: consinit.c
Log Message:
Adapt to the changed signature of pckbc_cnattach().
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/alpha/api_up1000.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/alpha/dec_1000a.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/alpha/dec_2000_300.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/alpha/alpha/dec_2100_a50.c \
src/sys/arch/alpha/alpha/dec_axppci_33.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/alpha/dec_2100_a500.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/alpha/alpha/dec_550.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/alpha/dec_6600.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/alpha/dec_alphabook1.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/alpha/alpha/dec_eb164.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/alpha/dec_eb64plus.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/alpha/dec_eb66.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/alpha/alpha/dec_kn20aa.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/alpha/alpha/dec_kn300.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/arc/c_isa.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/arc/c_jazz_eisa.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arc/arc/c_nec_pci.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/atari/isa/isa_machdep.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/bebox/bebox/machdep.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/cats/cats/cats_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/loongson/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/explora/consinit.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ibmnws/ibmnws/consinit.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.79 -r1.80 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/oea/ofw_consinit.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/prep/prep/consinit.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sgimips/sgimips/console.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/shark/consinit.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/dev/pckbc_js.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/consinit.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/x86/consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/api_up1000.c
diff -u src/sys/arch/alpha/alpha/api_up1000.c:1.29 src/sys/arch/alpha/alpha/api_up1000.c:1.30
--- src/sys/arch/alpha/alpha/api_up1000.c:1.29 Mon Feb 6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/api_up1000.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: api_up1000.c,v 1.29 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: api_up1000.c,v 1.30 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.29 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.30 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,7 +142,7 @@ api_up1000_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&icp->ic_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_1000a.c
diff -u src/sys/arch/alpha/alpha/dec_1000a.c:1.32 src/sys/arch/alpha/alpha/dec_1000a.c:1.33
--- src/sys/arch/alpha/alpha/dec_1000a.c:1.32 Mon Feb 6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/dec_1000a.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.32 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.33 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.32 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.33 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -210,7 +210,7 @@ dec_1000a_cons_init(void)
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT);
+ (void) pckbc_cnattach(iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT, 0);
/*
* AlphaServer 1000s have a firmware bug whereby the
Index: src/sys/arch/alpha/alpha/dec_2000_300.c
diff -u src/sys/arch/alpha/alpha/dec_2000_300.c:1.18 src/sys/arch/alpha/alpha/dec_2000_300.c:1.19
--- src/sys/arch/alpha/alpha/dec_2000_300.c:1.18 Mon Feb 6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/dec_2000_300.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2000_300.c,v 1.18 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: dec_2000_300.c,v 1.19 2012/10/13 17:58:54 jdc Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.18 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.19 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -168,7 +168,7 @@ dec_2000_300_cons_init(void)
/* display console... */
/* XXX */
(void) pckbc_cnattach(&jcp->jc_internal_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
isa_display_console(&jcp->jc_eisa_iot, &jcp->jc_eisa_memt);
#else
Index: src/sys/arch/alpha/alpha/dec_2100_a50.c
diff -u src/sys/arch/alpha/alpha/dec_2100_a50.c:1.66 src/sys/arch/alpha/alpha/dec_2100_a50.c:1.67
--- src/sys/arch/alpha/alpha/dec_2100_a50.c:1.66 Mon Feb 6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/dec_2100_a50.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a50.c,v 1.66 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: dec_2100_a50.c,v 1.67 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.66 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.67 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@ dec_2100_a50_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_axppci_33.c
diff -u src/sys/arch/alpha/alpha/dec_axppci_33.c:1.66 src/sys/arch/alpha/alpha/dec_axppci_33.c:1.67
--- src/sys/arch/alpha/alpha/dec_axppci_33.c:1.66 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_axppci_33.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_axppci_33.c,v 1.66 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_axppci_33.c,v 1.67 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.66 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.67 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,7 +200,7 @@ dec_axppci_33_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_2100_a500.c
diff -u src/sys/arch/alpha/alpha/dec_2100_a500.c:1.22 src/sys/arch/alpha/alpha/dec_2100_a500.c:1.23
--- src/sys/arch/alpha/alpha/dec_2100_a500.c:1.22 Mon Feb 6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/dec_2100_a500.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a500.c,v 1.22 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: dec_2100_a500.c,v 1.23 2012/10/13 17:58:54 jdc Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.22 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.23 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@ dec_2100_a500_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&tcp->tc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
switch (CTB_TURBOSLOT_TYPE(ctbslot)) {
case CTB_TURBOSLOT_TYPE_ISA:
Index: src/sys/arch/alpha/alpha/dec_550.c
diff -u src/sys/arch/alpha/alpha/dec_550.c:1.35 src/sys/arch/alpha/alpha/dec_550.c:1.36
--- src/sys/arch/alpha/alpha/dec_550.c:1.35 Mon Feb 6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/dec_550.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_550.c,v 1.35 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: dec_550.c,v 1.36 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.35 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.36 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ dec_550_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_6600.c
diff -u src/sys/arch/alpha/alpha/dec_6600.c:1.33 src/sys/arch/alpha/alpha/dec_6600.c:1.34
--- src/sys/arch/alpha/alpha/dec_6600.c:1.33 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_6600.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_6600.c,v 1.33 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_6600.c,v 1.34 2012/10/13 17:58:54 jdc 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_6600.c,v 1.33 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.34 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,7 +161,7 @@ dec_6600_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctbslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_alphabook1.c
diff -u src/sys/arch/alpha/alpha/dec_alphabook1.c:1.26 src/sys/arch/alpha/alpha/dec_alphabook1.c:1.27
--- src/sys/arch/alpha/alpha/dec_alphabook1.c:1.26 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_alphabook1.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_alphabook1.c,v 1.26 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_alphabook1.c,v 1.27 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.26 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.27 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,7 @@ dec_alphabook1_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_eb164.c
diff -u src/sys/arch/alpha/alpha/dec_eb164.c:1.61 src/sys/arch/alpha/alpha/dec_eb164.c:1.62
--- src/sys/arch/alpha/alpha/dec_eb164.c:1.61 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_eb164.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb164.c,v 1.61 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_eb164.c,v 1.62 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.61 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.62 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,7 +148,7 @@ dec_eb164_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_eb64plus.c
diff -u src/sys/arch/alpha/alpha/dec_eb64plus.c:1.40 src/sys/arch/alpha/alpha/dec_eb64plus.c:1.41
--- src/sys/arch/alpha/alpha/dec_eb64plus.c:1.40 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_eb64plus.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb64plus.c,v 1.40 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_eb64plus.c,v 1.41 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.40 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.41 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,7 @@ dec_eb64plus_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_eb66.c
diff -u src/sys/arch/alpha/alpha/dec_eb66.c:1.27 src/sys/arch/alpha/alpha/dec_eb66.c:1.28
--- src/sys/arch/alpha/alpha/dec_eb66.c:1.27 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_eb66.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb66.c,v 1.27 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_eb66.c,v 1.28 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.27 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.28 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ dec_eb66_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_kn20aa.c
diff -u src/sys/arch/alpha/alpha/dec_kn20aa.c:1.64 src/sys/arch/alpha/alpha/dec_kn20aa.c:1.65
--- src/sys/arch/alpha/alpha/dec_kn20aa.c:1.64 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_kn20aa.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn20aa.c,v 1.64 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_kn20aa.c,v 1.65 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.64 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.65 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,7 +155,7 @@ dec_kn20aa_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/alpha/alpha/dec_kn300.c
diff -u src/sys/arch/alpha/alpha/dec_kn300.c:1.39 src/sys/arch/alpha/alpha/dec_kn300.c:1.40
--- src/sys/arch/alpha/alpha/dec_kn300.c:1.39 Mon Feb 6 02:14:11 2012
+++ src/sys/arch/alpha/alpha/dec_kn300.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn300.c,v 1.39 2012/02/06 02:14:11 matt Exp $ */
+/* $NetBSD: dec_kn300.c,v 1.40 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.39 2012/02/06 02:14:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.40 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,7 +192,7 @@ dec_kn300_cons_init(void)
/* display console ... */
/* XXX */
(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
Index: src/sys/arch/arc/arc/c_isa.c
diff -u src/sys/arch/arc/arc/c_isa.c:1.10 src/sys/arch/arc/arc/c_isa.c:1.11
--- src/sys/arch/arc/arc/c_isa.c:1.10 Sun Mar 6 14:58:42 2011
+++ src/sys/arch/arc/arc/c_isa.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: c_isa.c,v 1.10 2011/03/06 14:58:42 tsutsui Exp $ */
+/* $NetBSD: c_isa.c,v 1.11 2012/10/13 17:58:53 jdc Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/*-
@@ -123,7 +123,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_isa.c,v 1.10 2011/03/06 14:58:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_isa.c,v 1.11 2012/10/13 17:58:53 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -225,7 +225,7 @@ c_isa_cons_init(void)
if (vga_isa_cnattach(&arc_bus_io, &arc_bus_mem) == 0) {
#if NPCKBC > 0
pckbc_cnattach(&arc_bus_io, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
return;
#endif
}
Index: src/sys/arch/arc/arc/c_jazz_eisa.c
diff -u src/sys/arch/arc/arc/c_jazz_eisa.c:1.13 src/sys/arch/arc/arc/c_jazz_eisa.c:1.14
--- src/sys/arch/arc/arc/c_jazz_eisa.c:1.13 Fri Jul 1 19:28:00 2011
+++ src/sys/arch/arc/arc/c_jazz_eisa.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: c_jazz_eisa.c,v 1.13 2011/07/01 19:28:00 dyoung Exp $ */
+/* $NetBSD: c_jazz_eisa.c,v 1.14 2012/10/13 17:58:53 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_jazz_eisa.c,v 1.13 2011/07/01 19:28:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_jazz_eisa.c,v 1.14 2012/10/13 17:58:53 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,7 +149,7 @@ c_jazz_eisa_cons_init(void)
if (rasdisplay_jazzio_cnattach(arc_displayc_id) == 0) {
#if NPCKBC_JAZZIO > 0
pckbc_cnattach(&jazzio_bus, PICA_SYS_KBD,
- JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT, 0);
#endif
return;
}
@@ -159,7 +159,7 @@ c_jazz_eisa_cons_init(void)
if (vga_jazzio_cnattach(arc_displayc_id) == 0) {
#if NPCKBC_JAZZIO > 0
pckbc_cnattach(&jazzio_bus, PICA_SYS_KBD,
- JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT, 0);
#endif
return;
}
@@ -173,7 +173,7 @@ c_jazz_eisa_cons_init(void)
if (vga_isa_cnattach(&arc_bus_io, &arc_bus_mem) == 0) {
#if NPCKBC_JAZZIO > 0
pckbc_cnattach(&jazzio_bus, PICA_SYS_KBD,
- JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/arc/arc/c_nec_pci.c
diff -u src/sys/arch/arc/arc/c_nec_pci.c:1.19 src/sys/arch/arc/arc/c_nec_pci.c:1.20
--- src/sys/arch/arc/arc/c_nec_pci.c:1.19 Fri Jul 1 19:28:00 2011
+++ src/sys/arch/arc/arc/c_nec_pci.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: c_nec_pci.c,v 1.19 2011/07/01 19:28:00 dyoung Exp $ */
+/* $NetBSD: c_nec_pci.c,v 1.20 2012/10/13 17:58:53 jdc Exp $ */
/*-
* Copyright (C) 2000 Shuichiro URATA. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_nec_pci.c,v 1.19 2011/07/01 19:28:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_nec_pci.c,v 1.20 2012/10/13 17:58:53 jdc Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -267,7 +267,7 @@ c_nec_pci_cons_init(void)
&necpb_main_context.nc_pc, 0, 3, 0) == 0) {
#if NPCKBC_JAZZIO > 0
pckbc_cnattach(&jazzio_bus, PICA_SYS_KBD,
- JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT, 0);
#endif
return;
}
@@ -286,7 +286,7 @@ c_nec_pci_cons_init(void)
&necpb_main_context.nc_pc, 0, 3, 0) == 0) {
#if NPCKBC_JAZZIO > 0
pckbc_cnattach(&jazzio_bus, PICA_SYS_KBD,
- JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/atari/isa/isa_machdep.c
diff -u src/sys/arch/atari/isa/isa_machdep.c:1.39 src/sys/arch/atari/isa/isa_machdep.c:1.40
--- src/sys/arch/atari/isa/isa_machdep.c:1.39 Fri Jul 1 20:34:06 2011
+++ src/sys/arch/atari/isa/isa_machdep.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.39 2011/07/01 20:34:06 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.40 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.39 2011/07/01 20:34:06 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.40 2012/10/13 17:58:54 jdc Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -134,7 +134,7 @@ isabusattach(device_t parent, device_t s
isa_bus_init();
if (self == NULL) { /* Early init */
#if (NPCKBC > 0)
- pckbc_cnattach(iba.iba_iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT);
+ pckbc_cnattach(iba.iba_iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/bebox/bebox/machdep.c
diff -u src/sys/arch/bebox/bebox/machdep.c:1.105 src/sys/arch/bebox/bebox/machdep.c:1.106
--- src/sys/arch/bebox/bebox/machdep.c:1.105 Mon Oct 8 15:34:58 2012
+++ src/sys/arch/bebox/bebox/machdep.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.105 2012/10/08 15:34:58 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.106 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2012/10/08 15:34:58 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2012/10/13 17:58:54 jdc Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -239,7 +239,7 @@ consinit(void)
*/
#if (NPCKBC > 0)
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
disable_device("vga");
return;
@@ -252,7 +252,7 @@ consinit(void)
vga_cnattach(&prep_io_space_tag, &prep_mem_space_tag, -1, 1);
#if (NPCKBC > 0)
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.75 src/sys/arch/cats/cats/cats_machdep.c:1.76
--- src/sys/arch/cats/cats/cats_machdep.c:1.75 Sat Sep 22 00:33:38 2012
+++ src/sys/arch/cats/cats/cats_machdep.c Sat Oct 13 17:58:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.75 2012/09/22 00:33:38 matt Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.76 2012/10/13 17:58:55 jdc Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.75 2012/09/22 00:33:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.76 2012/10/13 17:58:55 jdc Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -945,7 +945,8 @@ 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, KBCMDP, PCKBC_KBD_SLOT);
+ pckbc_cnattach(&isa_io_bs_tag, IO_KBD, KBCMDP, PCKBC_KBD_SLOT,
+ 0);
#endif /* NPCKBC */
}
#endif /* NVGA */
Index: src/sys/arch/evbmips/loongson/machdep.c
diff -u src/sys/arch/evbmips/loongson/machdep.c:1.4 src/sys/arch/evbmips/loongson/machdep.c:1.5
--- src/sys/arch/evbmips/loongson/machdep.c:1.4 Fri Mar 2 13:20:57 2012
+++ src/sys/arch/evbmips/loongson/machdep.c Sat Oct 13 17:58:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.4 2012/03/02 13:20:57 nonaka Exp $ */
+/* $NetBSD: machdep.c,v 1.5 2012/10/13 17:58:55 jdc Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2012/03/02 13:20:57 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2012/10/13 17:58:55 jdc Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -553,7 +553,7 @@ mach_init(int32_t argc, int32_t argva, i
int rc = ENXIO;
#if NPCKBC > 0
if (rc != 0)
- rc = pckbc_cnattach(&bonito_iot, IO_KBD, KBCMDP, 0);
+ rc = pckbc_cnattach(&bonito_iot, IO_KBD, KBCMDP, 0, 0);
#endif
#if NUKBD > 0
if (rc != 0)
Index: src/sys/arch/evbppc/explora/consinit.c
diff -u src/sys/arch/evbppc/explora/consinit.c:1.8 src/sys/arch/evbppc/explora/consinit.c:1.9
--- src/sys/arch/evbppc/explora/consinit.c:1.8 Fri Jul 1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/consinit.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.8 2011/07/01 19:02:32 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.9 2012/10/13 17:58:53 jdc Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.9 2012/10/13 17:58:53 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,6 +88,7 @@ consinit(void)
fb_cnattach(tag, BASE_FB2, (void *)BASE_FB);
tag = elb_get_bus_space_tag(BASE_PCKBC);
pckbc_cnattach(tag, _BUS_SPACE_UNSTRIDE(tag, BASE_PCKBC),
- _BUS_SPACE_UNSTRIDE(tag, BASE_PCKBC2-BASE_PCKBC), PCKBC_KBD_SLOT);
+ _BUS_SPACE_UNSTRIDE(tag, BASE_PCKBC2-BASE_PCKBC), PCKBC_KBD_SLOT,
+ 0);
#endif
}
Index: src/sys/arch/ibmnws/ibmnws/consinit.c
diff -u src/sys/arch/ibmnws/ibmnws/consinit.c:1.5 src/sys/arch/ibmnws/ibmnws/consinit.c:1.6
--- src/sys/arch/ibmnws/ibmnws/consinit.c:1.5 Fri Jul 1 20:47:43 2011
+++ src/sys/arch/ibmnws/ibmnws/consinit.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.5 2011/07/01 20:47:43 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.6 2012/10/13 17:58:53 jdc Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -70,7 +70,7 @@ consinit(void)
if (!strcmp(CONSOLE, "genfb")) {
#if (NPCKBC > 0)
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.29 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.30
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.29 Thu Jun 30 00:52:58 2011
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.29 2011/06/30 00:52:58 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.30 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2011/06/30 00:52:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2012/10/13 17:58:54 jdc Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@@ -208,7 +208,7 @@ consinit(void)
pfb_cnattach(consinfo->addr);
#if (NPCKBC > 0)
pckbc_cnattach(&mvmeppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
return;
}
@@ -228,7 +228,7 @@ consinit(void)
dokbd:
#if (NPCKBC > 0)
pckbc_cnattach(&mvmeppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.79 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.80
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.79 Sat Sep 22 00:33:41 2012
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Sat Oct 13 17:58:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.79 2012/09/22 00:33:41 matt Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.80 2012/10/13 17:58:55 jdc Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.79 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.80 2012/10/13 17:58:55 jdc Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -919,7 +919,7 @@ consinit(void)
0, 8, 0);
#if NPCKBC > 0
res = pckbc_cnattach(&isa_io_bs_tag,
- IO_KBD, KBCMDP, PCKBC_KBD_SLOT);
+ IO_KBD, KBCMDP, PCKBC_KBD_SLOT, 0);
if (res)
printf("pckbc_cnattach: %d!\n", res);
#endif
Index: src/sys/arch/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.13 src/sys/arch/powerpc/oea/ofw_consinit.c:1.14
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.13 Sun Jul 17 20:54:46 2011
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Sat Oct 13 17:58:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.13 2011/07/17 20:54:46 joerg Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.14 2012/10/13 17:58:55 jdc Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.13 2011/07/17 20:54:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.14 2012/10/13 17:58:55 jdc Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -239,7 +239,7 @@ cninit_kd(void)
if (strcmp(name, "isa") == 0) {
printf("console keyboard type: PC Keyboard\n");
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
goto kbd_found;
}
#endif
Index: src/sys/arch/prep/prep/consinit.c
diff -u src/sys/arch/prep/prep/consinit.c:1.7 src/sys/arch/prep/prep/consinit.c:1.8
--- src/sys/arch/prep/prep/consinit.c:1.7 Fri Jul 1 20:52:02 2011
+++ src/sys/arch/prep/prep/consinit.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.7 2011/07/01 20:52:02 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.8 2012/10/13 17:58:53 jdc Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2011/07/01 20:52:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2012/10/13 17:58:53 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,7 +101,7 @@ consinit(void)
pfb_cnattach(consinfo->addr);
#if (NPCKBC > 0)
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
return;
}
@@ -124,7 +124,7 @@ consinit(void)
dokbd:
#if (NPCKBC > 0)
pckbc_cnattach(&genppc_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
return;
}
Index: src/sys/arch/sgimips/sgimips/console.c
diff -u src/sys/arch/sgimips/sgimips/console.c:1.42 src/sys/arch/sgimips/sgimips/console.c:1.43
--- src/sys/arch/sgimips/sgimips/console.c:1.42 Fri Jul 1 18:54:32 2011
+++ src/sys/arch/sgimips/sgimips/console.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.42 2011/07/01 18:54:32 dyoung Exp $ */
+/* $NetBSD: console.c,v 1.43 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.42 2011/07/01 18:54:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.43 2012/10/13 17:58:54 jdc Exp $");
#include "opt_kgdb.h"
@@ -117,7 +117,7 @@ consinit(void)
/* XXX Hardcoded iotag, MACE address XXX */
pckbc_cnattach(SGIMIPS_BUS_SPACE_NORMAL,
MACE_BASE + 0x320000, 8,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
#endif
return;
@@ -194,7 +194,7 @@ gio_video_init(const char *consdev)
pckbc_cnattach(SGIMIPS_BUS_SPACE_HPC,
HPC_BASE_ADDRESS_0 +
HPC3_PBUS_CH6_DEVREGS + IOC_KB_REGS, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
break;
}
Index: src/sys/arch/shark/shark/consinit.c
diff -u src/sys/arch/shark/shark/consinit.c:1.11 src/sys/arch/shark/shark/consinit.c:1.12
--- src/sys/arch/shark/shark/consinit.c:1.11 Tue Jul 19 15:07:43 2011
+++ src/sys/arch/shark/shark/consinit.c Sat Oct 13 17:58:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.12 2012/10/13 17:58:53 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.12 2012/10/13 17:58:53 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ consinit(void)
if (!igsfb_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
#if (NPCKBC > 0)
pckbc_cnattach(&isa_io_bs_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif /* NPCKBC */
return;
}
@@ -133,7 +133,7 @@ consinit(void)
if (!chipsfb_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
#if (NPCKBC > 0)
pckbc_cnattach(&isa_io_bs_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif /* NPCKBC */
return;
}
@@ -142,7 +142,7 @@ consinit(void)
if (!vga_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
#if (NPCKBC > 0)
pckbc_cnattach(&isa_io_bs_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif /* NPCKBC */
return;
}
Index: src/sys/arch/sparc/dev/pckbc_js.c
diff -u src/sys/arch/sparc/dev/pckbc_js.c:1.18 src/sys/arch/sparc/dev/pckbc_js.c:1.19
--- src/sys/arch/sparc/dev/pckbc_js.c:1.18 Tue Mar 18 05:05:35 2008
+++ src/sys/arch/sparc/dev/pckbc_js.c Sat Oct 13 17:58:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_js.c,v 1.18 2008/03/18 05:05:35 dogcow Exp $ */
+/* $NetBSD: pckbc_js.c,v 1.19 2012/10/13 17:58:54 jdc Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_js.c,v 1.18 2008/03/18 05:05:35 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_js.c,v 1.19 2012/10/13 17:58:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,7 +170,7 @@ pckbc_js_attach_common(struct pckbc_js_s
if (isconsole) {
int status;
- status = pckbc_cnattach(iot, ioaddr, KBCMDP, PCKBC_KBD_SLOT);
+ status = pckbc_cnattach(iot, ioaddr, KBCMDP, PCKBC_KBD_SLOT, 0);
if (status == 0)
aprint_normal(": cnattach ok");
else
Index: src/sys/arch/x86/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.23 src/sys/arch/x86/x86/consinit.c:1.24
--- src/sys/arch/x86/x86/consinit.c:1.23 Fri Nov 18 22:18:08 2011
+++ src/sys/arch/x86/x86/consinit.c Sat Oct 13 17:58:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.23 2011/11/18 22:18:08 jmcneill Exp $ */
+/* $NetBSD: consinit.c,v 1.24 2012/10/13 17:58:55 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.23 2011/11/18 22:18:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.24 2012/10/13 17:58:55 jdc Exp $");
#include "opt_kgdb.h"
@@ -188,7 +188,7 @@ dokbd:
error = ENODEV;
#if (NPCKBC > 0)
error = pckbc_cnattach(x86_bus_space_io, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
#if (NUKBD > 0)
if (error)
Index: src/sys/arch/xen/x86/consinit.c
diff -u src/sys/arch/xen/x86/consinit.c:1.15 src/sys/arch/xen/x86/consinit.c:1.16
--- src/sys/arch/xen/x86/consinit.c:1.15 Fri Jul 1 18:37:08 2011
+++ src/sys/arch/xen/x86/consinit.c Sat Oct 13 17:58:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.16 2012/10/13 17:58:55 jdc Exp $ */
/* NetBSD: consinit.c,v 1.4 2004/03/13 17:31:34 bjh21 Exp */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.16 2012/10/13 17:58:55 jdc Exp $");
#include "opt_kgdb.h"
@@ -167,7 +167,7 @@ consinit(void)
error = ENODEV;
#if (NPCKBC > 0)
error = pckbc_cnattach(x86_bus_space_io, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
+ PCKBC_KBD_SLOT, 0);
#endif
#if (NUKBD > 0)
if (error)
