[src/trunk]: src/sys increase number of parameters of pckbc_cnattach(), since...

[soda <soda%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/30dd9d58eab4
branches:  trunk
changeset: 487542:30dd9d58eab4
user:      soda <soda%NetBSD.org@localhost>
date:      Fri Jun 09 04:58:32 2000 +0000

description:
increase number of parameters of pckbc_cnattach(), since offset of command port
is not 4 (KBCMDP), but 1 on jazz based platforms of arc port.

diffstat:

 sys/arch/alpha/alpha/dec_1000a.c            |  7 ++++---
 sys/arch/alpha/alpha/dec_2100_a50.c         |  8 +++++---
 sys/arch/alpha/alpha/dec_550.c              |  8 +++++---
 sys/arch/alpha/alpha/dec_6600.c             |  8 +++++---
 sys/arch/alpha/alpha/dec_alphabook1.c       |  8 +++++---
 sys/arch/alpha/alpha/dec_axppci_33.c        |  8 +++++---
 sys/arch/alpha/alpha/dec_eb164.c            |  8 +++++---
 sys/arch/alpha/alpha/dec_eb64plus.c         |  8 +++++---
 sys/arch/alpha/alpha/dec_eb66.c             |  8 +++++---
 sys/arch/alpha/alpha/dec_kn20aa.c           |  8 +++++---
 sys/arch/alpha/alpha/dec_kn300.c            |  8 +++++---
 sys/arch/arm32/footbridge/ebsa285_machdep.c |  5 +++--
 sys/arch/bebox/bebox/machdep.c              |  9 ++++++---
 sys/arch/i386/i386/consinit.c               |  6 ++++--
 sys/arch/prep/prep/machdep.c                |  9 ++++++---
 sys/dev/ic/pckbc.c                          |  7 ++++---
 sys/dev/ic/pckbcvar.h                       |  5 +++--
 17 files changed, 80 insertions(+), 48 deletions(-)

diffs (truncated from 571 to 300 lines):

diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_1000a.c
--- a/sys/arch/alpha/alpha/dec_1000a.c  Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_1000a.c  Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_2100_a50.c
--- a/sys/arch/alpha/alpha/dec_2100_a50.c       Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c       Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_550.c
--- a/sys/arch/alpha/alpha/dec_550.c    Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_550.c    Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_6600.c
--- a/sys/arch/alpha/alpha/dec_6600.c   Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_6600.c   Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_alphabook1.c
--- a/sys/arch/alpha/alpha/dec_alphabook1.c     Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_alphabook1.c     Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_axppci_33.c
--- a/sys/arch/alpha/alpha/dec_axppci_33.c      Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c      Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_eb164.c
--- a/sys/arch/alpha/alpha/dec_eb164.c  Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_eb164.c  Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_eb64plus.c
--- a/sys/arch/alpha/alpha/dec_eb64plus.c       Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_eb64plus.c       Fri Jun 09 04:58:32 2000 +0000
@@ -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 @@
 
 #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 @@
 #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)
diff -r d5f02e2593dc -r 30dd9d58eab4 sys/arch/alpha/alpha/dec_eb66.c
--- a/sys/arch/alpha/alpha/dec_eb66.c   Fri Jun 09 04:48:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_eb66.c   Fri Jun 09 04:58:32 2000 +0000
@@ -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 */