Remove all traces of the PCCONS stuff. (Remove pc.h and references to NPC

and NPCCONSKBD)
ok matthieu

3 files changed, 4 insertions, 27 deletions

diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 3a4a2367f18..583b75c71c2 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.92 2002/06/11 05:15:19 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.93 2002/06/18 12:50:55 nate Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -144,8 +144,6 @@ cdev_decl(com);
 cdev_decl(fd);
 cdev_decl(wt);
 cdev_decl(scd);
-#include "pc.h"
-cdev_decl(pc);
 #include "ss.h"
 #include "lpt.h"
 cdev_decl(lpt);
@@ -243,12 +241,8 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
 	cdev_tape_init(NWT,wt),		/* 10: QIC-02/QIC-36 tape */
 	cdev_disk_init(NSCD,scd),	/* 11: Sony CD-ROM */
-#if NPC > 0
-	cdev_pc_init(NPC,pc),		/* 12: PC console */
-#else
 	cdev_wsdisplay_init(NWSDISPLAY,	/* 12: frame buffers, etc. */
 	    wsdisplay),
-#endif
 	cdev_disk_init(NSD,sd),		/* 13: SCSI disk */
 	cdev_tape_init(NST,st),		/* 14: SCSI tape */
 	cdev_disk_init(NCD,cd),		/* 15: SCSI CD-ROM */
@@ -523,9 +517,6 @@ struct	consdev constab[] = {
 #if NWSDISPLAY > 0
 	cons_init(ws),
 #endif
-#if NPC > 0
-	cons_init(pc),
-#endif
 #if NCOM + NPCCOM > 0
 	cons_init(com),
 #endif
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index b8f805e3bb0..13e4577ce85 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.209 2002/06/08 22:20:49 weingart Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.210 2002/06/18 12:50:55 nate Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -165,16 +165,11 @@
 extern struct proc *npxproc;
 #endif
 
-#include "pc.h"
-#if (NPC > 0)
-#include <machine/pccons.h>
-#endif
-
 #include "bios.h"
 #include "com.h"
 #include "pccom.h"
 
-#if (NCOM > 0 || NPCCOM > 0)
+#if NPCCOM > 0
 #include <sys/termios.h>
 #include <dev/ic/comreg.h>
 #if NCOM > 0
@@ -2390,11 +2385,7 @@ pckbc_machdep_cnattach(kbctag, kbcslot)
 	pckbc_tag_t kbctag;
 	pckbc_slot_t kbcslot;
 {
-#if (NPC > 0) && (NPCCONSKBD > 0)
-	return (pcconskbd_cnattach(kbctag, kbcslot));
-#else
 	return (ENXIO);
-#endif
 }
 #endif
 
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index 3bc50e979ae..38450539eff 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.8 2002/03/14 01:26:33 millert Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.9 2002/06/18 12:50:55 nate Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -80,11 +80,6 @@
 #include <dev/usb/ukbdvar.h>
 #endif
 
-#include "pc.h"
-#if (NPC > 0)
-#include <machine/pccons.h>
-#endif
-
 void wscnprobe(struct consdev *);
 void wscninit(struct consdev *);
 void wscnputc(dev_t, char);