Remove __HAVE_NWSCONS and related remnants of pre-wscons days; no functional

change.

13 files changed, 15 insertions, 101 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index a8617bfd42a..0ff8b550726 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.89 2004/07/06 21:53:59 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.90 2004/11/02 21:20:56 miod Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -846,26 +846,6 @@ consinit()
 #endif
 }
 
-#include "pckbc.h"
-#include "pckbd.h"
-#if (NPCKBC > 0) && (NPCKBD == 0)
-
-#include <dev/ic/pckbcvar.h>
-
-/*
- * This is called by the pckbc driver if no pckbd is configured.
- * On the i386, it is used to glue in the old, deprecated console
- * code.  On the Alpha, it does nothing.
- */
-int
-pckbc_machdep_cnattach(kbctag, kbcslot)
-	pckbc_tag_t kbctag;
-	pckbc_slot_t kbcslot;
-{
-	return (ENXIO);
-}
-#endif /* NPCKBC > 0 && NPCKBD == 0 */
-
 void
 cpu_startup()
 {
diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h
index b24bedab8bf..00f205d85c6 100644
--- a/sys/arch/alpha/include/types.h
+++ b/sys/arch/alpha/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.13 2004/06/28 02:28:42 aaron Exp $	*/
+/*	$OpenBSD: types.h,v 1.14 2004/11/02 21:20:58 miod Exp $	*/
 /*	$NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $	*/
 
 /*-
@@ -73,7 +73,6 @@ typedef long			register_t;
 
 #define	__BROKEN_INDIRECT_CONFIG
 #define	__HAVE_DEVICE_REGISTER
-#define	__HAVE_NWSCONS
 #define	__HAVE_EVCOUNT
 
 #endif	/* _MACHTYPES_H_ */
diff --git a/sys/arch/amd64/amd64/consinit.c b/sys/arch/amd64/amd64/consinit.c
index 4a28d3d5aa7..7f051dc4306 100644
--- a/sys/arch/amd64/amd64/consinit.c
+++ b/sys/arch/amd64/amd64/consinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: consinit.c,v 1.2 2004/02/03 12:09:47 mickey Exp $	*/
+/*	$OpenBSD: consinit.c,v 1.3 2004/11/02 21:20:58 miod Exp $	*/
 /*	$NetBSD: consinit.c,v 1.2 2003/03/02 18:27:14 fvdl Exp $	*/
 
 /*
@@ -44,17 +44,3 @@ consinit()
 	initted = 1;
 	cninit();
 }
-
-#if (NPCKBC > 0) && (NPCKBD == 0)
-/*
- * glue code to support old console code with the
- * mi keyboard controller driver
- */
-int
-pckbc_machdep_cnattach(kbctag, kbcslot)
-	pckbc_tag_t kbctag;
-	pckbc_slot_t kbcslot;
-{
-	return (ENXIO);
-}
-#endif
diff --git a/sys/arch/amd64/amd64/wscons_machdep.c b/sys/arch/amd64/amd64/wscons_machdep.c
index 7ab21166f10..b12d697824f 100644
--- a/sys/arch/amd64/amd64/wscons_machdep.c
+++ b/sys/arch/amd64/amd64/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.2 2004/10/05 14:33:15 miod Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.3 2004/11/02 21:20:58 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -71,7 +71,7 @@
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 #endif
-#include "pckbd.h"     /* for pckbc_machdep_cnattach */
+#include "pckbd.h"
 #include "ukbd.h"
 #if (NPCKBD > 0) || (NUKBD > 0)
 #include <dev/wscons/wskbdvar.h>
diff --git a/sys/arch/amd64/include/types.h b/sys/arch/amd64/include/types.h
index 3beda9b0da4..5cf8dfc72f6 100644
--- a/sys/arch/amd64/include/types.h
+++ b/sys/arch/amd64/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.5 2004/07/20 20:17:16 art Exp $	*/
+/*	$OpenBSD: types.h,v 1.6 2004/11/02 21:20:59 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -67,7 +67,6 @@ typedef	unsigned long long	uint64_t;
 
 typedef long			register_t;
 
-#define	__HAVE_NWSCONS
 #define __HAVE_GENERIC_SOFT_INTERRUPTS
 #define __HAVE_CPUINFO
 #define	__HAVE_EVCOUNT
diff --git a/sys/arch/cats/include/types.h b/sys/arch/cats/include/types.h
index 9cdf2dcd79a..0ae94f64884 100644
--- a/sys/arch/cats/include/types.h
+++ b/sys/arch/cats/include/types.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: types.h,v 1.2 2004/02/11 14:40:54 miod Exp $	*/
+/* 	$OpenBSD: types.h,v 1.3 2004/11/02 21:20:59 miod Exp $	*/
 /*	$NetBSD: types.h,v 1.4 2002/02/28 03:17:26 simonb Exp $	*/
 
 #ifndef _ARM32_TYPES_H_
@@ -6,6 +6,5 @@
 
 #include <arm/types.h>
 #define __HAVE_GENERIC_SOFT_INTERRUPTS
-#define __HAVE_NWSCONS
 
 #endif
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index cc186863b32..823ca675f8f 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.309 2004/08/24 05:15:50 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.310 2004/11/02 21:20:59 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -3000,20 +3000,6 @@ consinit()
 	cninit();
 }
 
-#if (NPCKBC > 0) && (NPCKBD == 0)
-/*
- * glue code to support old console code with the
- * mi keyboard controller driver
- */
-int
-pckbc_machdep_cnattach(kbctag, kbcslot)
-	pckbc_tag_t kbctag;
-	pckbc_slot_t kbcslot;
-{
-	return (ENXIO);
-}
-#endif
-
 #ifdef KGDB
 void
 kgdb_port_init()
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index b016193ea46..32e992342a7 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.11 2004/10/05 14:33:16 miod Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.12 2004/11/02 21:20:59 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -66,7 +66,7 @@
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 #endif
-#include "pckbd.h"     /* for pckbc_machdep_cnattach */
+#include "pckbd.h"
 #include "ukbd.h"
 #if (NPCKBD > 0) || (NUKBD > 0)
 #include <dev/wscons/wskbdvar.h>
diff --git a/sys/arch/i386/include/types.h b/sys/arch/i386/include/types.h
index c01b2537ed3..f280ad6a9cf 100644
--- a/sys/arch/i386/include/types.h
+++ b/sys/arch/i386/include/types.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: types.h,v 1.12 1995/12/24 01:08:03 mycroft Exp $	*/
-/*	$OpenBSD: types.h,v 1.16 2004/07/20 20:16:44 art Exp $	*/
+/*	$OpenBSD: types.h,v 1.17 2004/11/02 21:20:59 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -71,7 +71,6 @@ typedef	unsigned long long	 uint64_t;
 
 typedef int32_t			register_t;
 
-#define __HAVE_NWSCONS
 #define __HAVE_EVCOUNT
 #define __HAVE_CPUINFO
 #define __HAVE_MUTEX
diff --git a/sys/arch/sparc64/include/types.h b/sys/arch/sparc64/include/types.h
index f89b648b667..cfb53ca1831 100644
--- a/sys/arch/sparc64/include/types.h
+++ b/sys/arch/sparc64/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.7 2004/06/28 01:47:41 aaron Exp $	*/
+/*	$OpenBSD: types.h,v 1.8 2004/11/02 21:20:59 miod Exp $	*/
 /*	$NetBSD: types.h,v 1.17 2001/05/12 22:42:07 kleink Exp $ */
 
 /*
@@ -65,7 +65,6 @@ typedef unsigned long int	paddr_t;
 typedef paddr_t			psize_t;
 #endif
 
-#define	__HAVE_NWSCONS
 #define	__HAVE_DEVICE_REGISTER
 #define	__HAVE_GENERIC_SOFT_INTERRUPTS
 #define	__HAVE_EVCOUNT
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 74b73f9c4ea..5e1a341b10c 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.73 2004/10/01 18:18:49 jason Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.74 2004/11/02 21:20:59 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -224,21 +224,6 @@ caddr_t	allocsys(caddr_t);
 void	dumpsys(void);
 void	stackdump(void);
 
-#if (NPCKBC > 0) && (NPCKBD == 0)
-/*
- * This is called by the pckbc driver if no pckbd is configured.
- * On the i386, it is used to glue in the old, deprecated console
- * code.  On the sparc64, it does nothing.
- */
-int
-pckbc_machdep_cnattach(kbctag, kbcslot)
-	pckbc_tag_t kbctag;
-	pckbc_slot_t kbcslot;
-{
-	return (ENXIO);
-}
-#endif
-
 /*
  * Machine-dependent startup code
  */
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 22714f4155f..60fab5c4b94 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.8 2004/04/02 04:39:50 deraadt Exp $ */
+/* $OpenBSD: pckbc.c,v 1.9 2004/11/02 21:21:00 miod Exp $ */
 /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -42,11 +42,7 @@
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 
-#ifdef __HAVE_NWSCONS /* XXX: this port uses sys/dev/pckbc */
 #include "pckbd.h"
-#else /* ie: only md drivers attach to pckbc */
-#define NPCKBD 0
-#endif
 
 #if (NPCKBD > 0)
 #include <dev/pckbc/pckbdvar.h>
@@ -977,18 +973,7 @@ pckbc_cnattach(iot, addr, cmd_offset, slot)
 #if (NPCKBD > 0)
 		res = pckbd_cnattach(&pckbc_consdata, slot);
 #else
-		/*
-		 * XXX This should be replaced with the `notyet' case
-		 * XXX when all of the old PC-style console drivers
-		 * XXX have gone away.  When that happens, all of
-		 * XXX the pckbc_machdep_cnattach() should be purged,
-		 * XXX as well.
-		 */
-#ifdef notyet
 		res = ENXIO;
-#else
-		res = pckbc_machdep_cnattach(&pckbc_consdata, slot);
-#endif
 #endif /* NPCKBD > 0 */
 	}
 
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index 3acca691018..321cb8aa375 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbcvar.h,v 1.3 2004/04/02 04:39:50 deraadt Exp $ */
+/* $OpenBSD: pckbcvar.h,v 1.4 2004/11/02 21:21:00 miod Exp $ */
 /* $NetBSD: pckbcvar.h,v 1.4 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -106,7 +106,4 @@ int pckbc_cnattach(bus_space_tag_t, bus_addr_t, bus_size_t,
 int pckbc_is_console(bus_space_tag_t, bus_addr_t);
 int pckbcintr(void *);
 
-/* md hook for use without mi wscons */
-int pckbc_machdep_cnattach(pckbc_tag_t, pckbc_slot_t);
-
 #endif /* _DEV_IC_PCKBCVAR_H_ */