More merge. Change "pc98" to "isa" in a few places. Misc. cleanup.

Add some more devices to userconfig.c.

Submitted by:	The FreeBSD(98) Development Team

4 files changed, 34 insertions, 242 deletions

diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 9630778..7961479 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: pc98.h,v 1.1.1.1 1996/06/14 10:04:45 asami Exp $
+ *	$Id: pc98.h,v 1.2 1996/09/03 10:23:48 asami Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
@@ -55,62 +55,54 @@
  * Input / Output Port Assignments
  */
 
-#ifndef IO_BEGIN
-#ifndef PC98 /* IBM-PC */
+#ifndef IO_ISABEGIN
 #define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
-#endif
 
 /* PC98 IO address ... very dirty (^_^; */
 
 #define IO_ICU1		0x000		/* 8259A Interrupt Controller #1 */
-#define IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
 #define IO_DMA		0x001		/* 8237A DMA Controller */
+#define IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
 #define IO_RTC		0x020		/* 4990A RTC */
 #define IO_DMAPG	0x021		/* DMA Page Registers */
 #define IO_COM1		0x030		/* 8251A RS232C serial I/O (int) */
-#define	IO_COM2		0x0b1		/* 8251A RS232C serial I/O (ext) */
-#define	IO_COM3		0x0b9		/* 8251A RS232C serial I/O (ext) */
 #define IO_SYSPORT	0x031		/* 8255A System Port */
+#define IO_PPI		0x035		/* Programmable Peripheral Interface */
 #define IO_LPT		0x040		/* 8255A Printer Port */
 #define IO_KBD		0x041		/* 8251A Keyboard */
-#define IO_PPI		0x035		/* Programmable Peripheral Interface */
 #define IO_NMI		0x050		/* NMI Control */
 #define IO_WAIT		0x05F		/* WAIT 0.6 us */
 #define IO_GDC1		0x060		/* 7220 GDC Text Control */
 #define IO_TIMER	0x071		/* 8253C Timer */
 #define IO_SASI		0x080		/* SASI Hard Disk Controller */
-#define	IO_SOUND	0x188		/* YM2203 FM sound board */
+#define IO_FD1		0x090		/* 765A 1MB FDC */
 #define	IO_GDC2		0x0a0		/* 7220 GDC Graphic Control */
-#define	IO_EGC		0x4a0		/* 7220 GDC Graphic Control */
 #define	IO_CGROM	0x0a1		/* Character ROM */
-#define IO_SCSI		0xCC0		/* SCSI Controller */
-#define IO_FD1		0x090		/* 765A 1MB FDC */
-#define IO_FD2		0x0c8		/* 765A 640KB FDC */
+#define	IO_COM2		0x0b1		/* 8251A RS232C serial I/O (ext) */
+#define	IO_COM3		0x0b9		/* 8251A RS232C serial I/O (ext) */
 #define IO_FDPORT	0x0be		/* FD I/F port (1M<->640K,EMTON) */
-#define IO_BEEPF	0x3fdb		/* beep frequency */
-#define IO_MOUSE	0x7fd9		/* mouse */
-#define IO_MOUSETM	0xdfbd		/* mouse timer */
+#define IO_FD2		0x0c8		/* 765A 640KB FDC */
+#define IO_SIO1		0x0d0		/* MC16550II ext RS232C */
 #define IO_REEST	0x0F0		/* CPU FPU reset */
 #define IO_A2OEN	0x0F2		/* A20 enable */
 #define IO_A20CT	0x0F6		/* A20 control enable/disable */
 #define IO_NPX		0x0F8		/* Numeric Coprocessor */
+#define	IO_SOUND	0x188		/* YM2203 FM sound board */
+#define	IO_EGC		0x4a0		/* 7220 GDC Graphic Control */
+#define IO_SCSI		0xcc0		/* SCSI Controller */
+#define IO_SIO2		0x8d0		/* MC16550II ext RS232C */
+#define IO_BEEPF	0x3fdb		/* beep frequency */
+#define IO_MOUSE	0x7fd9		/* mouse */
 #define IO_BMS		0x7fd9		/* Bus Mouse */
 #define IO_MSE		0x7fd9		/* Bus Mouse */
-#define IO_SIO1		0x0d0		/* MC16550II ext RS232C */
-#define IO_SIO2		0x8d0		/* MC16550II ext RS232C */
+#define IO_MOUSETM	0xdfbd		/* mouse timer */
 
-/*#ifdef PC98NS*/
-#if 1
-/* Oct 13, ukai */
 #define IO_WD1_NEC	0x640		/* 98note IDE Hard disk controller */
 #define IO_WD1_EPSON	0x80		/* 386note Hard disk controller */
 #define	IO_WD1		IO_WD1_NEC	/* IDE Hard disk controller */
-#endif
 
-#ifndef PC98 /* IBM-PC */
-#define	IO_ISAEND	0x3FF		/* - 0x3FF End of I/O Registers */
-#endif	IO_ISABEGIN
-#endif
+#define	IO_ISAEND	0xFFFF		/* - 0x3FF End of I/O Registers */
+#endif /* !IO_ISABEGIN */
 
 /*
  * Input / Output Port Sizes - these are from several sources, and tend
@@ -118,8 +110,8 @@
  * boards do not fully decode the address, thus 8 ports are used.
  */
 
-#ifndef	IO_PC98SIZES
-#define	IO_PC98SIZES
+#ifndef	IO_ISASIZES
+#define	IO_ISASIZES
 
 #define	IO_COMSIZE	8		/* 8250, 16X50 com controllers (4?) */
 #define	IO_CGASIZE	16		/* CGA controllers */
@@ -139,7 +131,7 @@
 #define IO_EISASIZE	4096		/* EISA controllers */
 #define	IO_PMPSIZE	2		/* 82347 power management peripheral */
 
-#endif	/* IO_PC98SIZES */
+#endif /* !IO_ISASIZES */
 
 /*
  * Input / Output Memory Physical Addresses
@@ -149,7 +141,7 @@
 #define	IOM_BEGIN	0x0a0000		/* Start of I/O Memory "hole" */
 #define	IOM_END		0x100000		/* End of I/O Memory "hole" */
 #define	IOM_SIZE	(IOM_END - IOM_BEGIN)
-#endif	IOM_BEGIN
+#endif /* !RAM_BEGIN */
 
 /*
  * RAM Physical Address Space (ignoring the above mentioned "hole")
@@ -163,7 +155,7 @@
 #define	RAM_END		0x1000000	/* End of RAM Memory */
 #endif
 #define	RAM_SIZE	(RAM_END - RAM_BEGIN)
-#endif	RAM_BEGIN
+#endif /* !RAM_BEGIN */
 
 #ifndef PC98 /* IBM-PC */
 /*
@@ -177,11 +169,6 @@
 #endif	COMPAQ_RAMRELOC
 #endif
 
-/*
- * Obtained from NetBSD/pc98
- */
-#define MADDRUNK -1
-
 #define PC98_VECTOR_SIZE			(0x400)
 #define PC98_SYSTEM_PARAMETER_SIZE		(0x230)
 
@@ -228,4 +215,9 @@ extern unsigned char	pc98_system_parameter[]; /* in locore.c */
 # define PC98_TYPE_CHECK(x)	((pc98_machine_type & (x)) == (x))
 #endif /* KERNEL */
 
+/*
+ * Obtained from NetBSD/pc98
+ */
+#define MADDRUNK -1
+
 #endif /* !_PC98_PC98_PC98_H_ */
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index df520db..e8ad1b2 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.4 1996/08/31 15:06:42 asami Exp $
+ *	$Id: fd.c,v 1.5 1996/09/03 10:23:25 asami Exp $
  *
  */
 
@@ -69,7 +69,6 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
-#include <sys/devconf.h>
 #include <sys/dkstat.h>
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
@@ -86,90 +85,12 @@
 #include <machine/stdarg.h>
 #if NFT > 0
 #include <sys/ftape.h>
-#ifdef PC98
-#include <pc98/pc98/ftreg.h>
-#else
 #include <i386/isa/ftreg.h>
 #endif
-#endif
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif
 
-
-static int fd_goaway(struct kern_devconf *, int);
-static int fdc_goaway(struct kern_devconf *, int);
-static int fd_externalize(struct kern_devconf *, struct sysctl_req *);
-
-/*
- * Templates for the kern_devconf structures used when we attach.
- */
-static struct kern_devconf kdc_fd[NFD] = { {
-	0, 0, 0,		/* filled in by kern_devconf.c */
-	"fd", 0, { MDDT_DISK, 0 },
-	fd_externalize, 0, fd_goaway, DISK_EXTERNALLEN,
-	0,			/* parent */
-	0,			/* parentdata */
-	DC_UNCONFIGURED,	/* state */
-	"floppy disk",
-	DC_CLS_DISK		/* class */
-} };
-
-struct kern_devconf kdc_fdc[NFDC] = { {
-	0, 0, 0,		/* filled in by kern_devconf.c */
-	"fdc", 0, { MDDT_ISA, 0, "bio" },
-	isa_generic_externalize, 0, fdc_goaway, ISA_EXTERNALLEN,
-	0,			/* parent */
-	0,			/* parentdata */
-	DC_UNCONFIGURED,	/* state */
-	"floppy disk/tape controller",
-	DC_CLS_MISC		/* class */
-} };
-
-static inline void
-fd_registerdev(int ctlr, int unit)
-{
-	if(unit != 0)
-		kdc_fd[unit] = kdc_fd[0];
-
-	kdc_fd[unit].kdc_unit = unit;
-	kdc_fd[unit].kdc_parent = &kdc_fdc[ctlr];
-	kdc_fd[unit].kdc_parentdata = 0;
-	dev_attach(&kdc_fd[unit]);
-}
-
-static inline void
-fdc_registerdev(struct isa_device *dvp)
-{
-	int unit = dvp->id_unit;
-
-	if(unit != 0)
-		kdc_fdc[unit] = kdc_fdc[0];
-
-	kdc_fdc[unit].kdc_unit = unit;
-	kdc_fdc[unit].kdc_parent = &kdc_isa0;
-	kdc_fdc[unit].kdc_parentdata = dvp;
-	dev_attach(&kdc_fdc[unit]);
-}
-
-static int
-fdc_goaway(struct kern_devconf *kdc, int force)
-{
-	if(force) {
-		dev_detach(kdc);
-		return 0;
-	} else {
-		return EBUSY;	/* XXX fix */
-	}
-}
-
-static int
-fd_goaway(struct kern_devconf *kdc, int force)
-{
-	dev_detach(kdc);
-	return 0;
-}
-
 #define	b_cylin	b_resid		/* XXX now spelled b_cylinder elsewhere */
 
 /* misuse a flag to identify format operation */
@@ -452,15 +373,6 @@ static struct bdevsw fd_bdevsw =
 
 static struct isa_device *fdcdevs[NFDC];
 
-/*
- * Provide hw.devconf information.
- */
-static int
-fd_externalize(struct kern_devconf *kdc, struct sysctl_req *req)
-{
-	return disk_externalize(fd_data[kdc->kdc_unit].fdsu, req);
-}
-
 static int
 fdc_err(fdcu_t fdcu, const char *s)
 {
@@ -703,10 +615,6 @@ fdprobe(struct isa_device *dev)
 	fdcdevs[fdcu] = dev;
 	fdc_data[fdcu].baseport = dev->id_iobase;
 
-#ifndef DEV_LKM
-	fdc_registerdev(dev);
-#endif
-
 #ifndef PC98
 	/* First - lets reset the floppy controller */
 	outb(dev->id_iobase+FDOUT, 0);
@@ -727,7 +635,6 @@ fdprobe(struct isa_device *dev)
 	{
 		return(0);
 	}
-	kdc_fdc[fdcu].kdc_state = DC_IDLE;
 	return (IO_FDCSIZE);
 }
 
@@ -863,10 +770,7 @@ fdattach(struct isa_device *dev)
 			continue;
 		}
 
-#ifdef PC98
-		kdc_fdc[fdcu].kdc_description =
-			"NEC 765 floppy disk/tape controller";
-#else
+#ifndef PC98
 		/* select it */
 		set_motor(fdcu, fdsu, TURNON);
 		DELAY(1000000);	/* 1 sec */
@@ -880,20 +784,14 @@ fdattach(struct isa_device *dev)
 			case 0x80:
 				printf("NEC 765\n");
 				fdc->fdct = FDC_NE765;
-				kdc_fdc[fdcu].kdc_description =
-					"NEC 765 floppy disk/tape controller";
 				break;
 			case 0x81:
 				printf("Intel 82077\n");
 				fdc->fdct = FDC_I82077;
-				kdc_fdc[fdcu].kdc_description =
-					"Intel 82077 floppy disk/tape controller";
 				break;
 			case 0x90:
 				printf("NEC 72065B\n");
 				fdc->fdct = FDC_NE72065;
-				kdc_fdc[fdcu].kdc_description =
-					"NEC 72065B floppy disk/tape controller";
 				break;
 			default:
 				printf("unknown IC type %02x\n", ic_type);
@@ -953,7 +851,6 @@ fdattach(struct isa_device *dev)
 		fd->options = 0;
 		printf("fd%d: ", fdu);
 
-		fd_registerdev(fdcu, fdu);
 		switch (fdt) {
 #ifdef PC98
 		case FDT_12M:
@@ -968,8 +865,6 @@ fdattach(struct isa_device *dev)
 #endif /* EPSON_NRDISK */
 			fd->type = FD_1200;
 			fd->pc98_trans = 0;
-			kdc_fd[fdu].kdc_description = 
-				"1M/640K floppy disk drive";
 #ifdef	DEVFS
 			sprintf(name,"rfd%d.1200",fdu);
 #endif	/* DEVFS */
@@ -979,8 +874,6 @@ fdattach(struct isa_device *dev)
 			fd->type = FD_1200;
 			fd->pc98_trans = 0;
 			outb(0x4be, (fdu << 5) | 0x10);
-			kdc_fd[fdu].kdc_description =
-				"1.44MB (1440K) 3.5in floppy disk drive";
 #ifdef	DEVFS
 			sprintf(name,"rfd%d.1440",fdu);
 #endif	/* DEVFS */
@@ -989,42 +882,30 @@ fdattach(struct isa_device *dev)
 		case RTCFDT_12M:
 			printf("1.2MB 5.25in\n");
 			fd->type = FD_1200;
-			kdc_fd[fdu].kdc_description =
-				"1.2MB (1200K) 5.25in floppy disk drive";
 			break;
 		case RTCFDT_144M:
 			printf("1.44MB 3.5in\n");
 			fd->type = FD_1440;
-			kdc_fd[fdu].kdc_description =
-				"1.44MB (1440K) 3.5in floppy disk drive";
 			break;
 		case RTCFDT_288M:
 		case RTCFDT_288M_1:
 			printf("2.88MB 3.5in - 1.44MB mode\n");
 			fd->type = FD_1440;
-			kdc_fd[fdu].kdc_description =
-				"2.88MB (2880K) 3.5in floppy disk drive in 1.44 mode";
 			break;
 		case RTCFDT_360K:
 			printf("360KB 5.25in\n");
 			fd->type = FD_360;
-			kdc_fd[fdu].kdc_description =
-				"360KB 5.25in floppy disk drive";
 			break;
 		case RTCFDT_720K:
 			printf("720KB 3.5in\n");
 			fd->type = FD_720;
-			kdc_fd[fdu].kdc_description =
-				"720KB 3.5in floppy disk drive";
 			break;
 #endif
 		default:
 			printf("unknown\n");
 			fd->type = NO_TYPE;
-			dev_detach(&kdc_fd[fdu]);
 			continue;
 		}
-		kdc_fd[fdu].kdc_state = DC_IDLE;
 #ifdef DEVFS
 		mynor = fdu << 6;
 		fd->bdevs[0] = devfs_add_devswf(&fd_bdevsw, mynor, DV_BLK,
@@ -1139,9 +1020,6 @@ set_motor(fdcu_t fdcu, int fdsu, int turnon)
 	outb(fdc_data[fdcu].baseport+FDOUT, fdout);
 	DELAY(10);
 	fdc_data[fdcu].fdout = fdout;
-#ifndef PC98
-	kdc_fdc[fdcu].kdc_state = (fdout & FDO_FRST)? DC_BUSY: DC_IDLE;
-#endif
 	TRACE1("[0x%x->FDOUT]", fdout);
 
 	if(needspecify) {
@@ -1415,7 +1293,6 @@ Fdopen(dev_t dev, int flags, int mode, struct proc *p)
 #endif
 	fd_data[fdu].ft = fd_types + type - 1;
 	fd_data[fdu].flags |= FD_OPEN;
-	kdc_fd[fdu].kdc_state = DC_BUSY;
 
 	return 0;
 }
@@ -1433,7 +1310,6 @@ fdclose(dev_t dev, int flags, int mode, struct proc *p)
 #endif
 	fd_data[fdu].flags &= ~FD_OPEN;
 	fd_data[fdu].options &= ~FDOPT_NORETRY;
-	kdc_fd[fdu].kdc_state = DC_IDLE;
 
 	return(0);
 }
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
index 7b10161..93a99a6 100644
--- a/sys/pc98/cbus/fdcreg.h
+++ b/sys/pc98/cbus/fdcreg.h
@@ -38,14 +38,13 @@
  * AT floppy controller registers and bitfields
  */
 
-#ifdef PC98
 /* uses NEC765 controller */
-#include <pc98/pc98/ic/nec765.h>
+#include <i386/isa/ic/nec765.h>
 
+#ifdef PC98
+/* registers */
 #define	FDSTS	0	/* NEC 765 Main Status Register (R) */
 #define	FDDATA	2	/* NEC 765 Data Register (R/W) */
-
-/* registers */
 #define	FDOUT	4	/* Digital Output Register (W) */
 #define	FDO_RST		0x80	/*  FDC RESET */
 #define	FDO_FRY		0x40	/*  force READY */
@@ -69,10 +68,6 @@
 #define	FDP_PORTEXC	0x01	/*  PORT Exchane 1:1M 0:640K */
 
 #else
-
-/* uses NEC765 controller */
-#include <i386/isa/ic/nec765.h>
-
 /* registers */
 #define	FDOUT	2	/* Digital Output Register (W) */
 #define	FDO_FDSEL	0x03	/*  floppy device select */
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index da16792..c144524 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.4 1996/09/03 10:23:59 asami Exp $
+ *	$Id: sio.c,v 1.5 1996/09/07 02:14:23 asami Exp $
  */
 
 #include "opt_comconsole.h"
@@ -130,7 +130,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include <sys/devconf.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif
@@ -386,7 +385,6 @@ static	void	siointr1	__P((struct com_s *com));
 static	int	commctl		__P((struct com_s *com, int bits, int how));
 static	int	comparam	__P((struct tty *tp, struct termios *t));
 static	int	sioprobe	__P((struct isa_device *dev));
-static	void	sioregisterdev	__P((struct isa_device *id));
 static	void	siosettimeout	__P((void));
 static	void	comstart	__P((struct tty *tp));
 static	timeout_t comwakeup;
@@ -595,17 +593,6 @@ static	struct speedtab comspeedtab[] = {
 	{ -1,		-1 }
 };
 
-static struct kern_devconf kdc_sio[NSIO] = { {
-	0, 0, 0,		/* filled in by dev_attach */
-	driver_name, 0, { MDDT_ISA, 0, "tty" },
-	isa_generic_externalize, 0, 0, ISA_EXTERNALLEN,
-	&kdc_isa0,		/* parent */
-	0,			/* parentdata */
-	DC_UNCONFIGURED,	/* state */
-	"Serial port",
-	DC_CLS_SERIAL		/* class */
-} };
-
 #ifdef COM_ESP
 /* XXX configure this properly. */
 static	Port_t	likely_com_ports[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, };
@@ -700,8 +687,6 @@ siounload(struct pccard_dev *dp)
 		printf("sio%d already unloaded!\n",dp->isahd.id_unit);
 		return;
 	}
-	kdc_sio[com->unit].kdc_state = DC_UNCONFIGURED;
-	kdc_sio[com->unit].kdc_description = "Serial port";
 	if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
 		com->gone = 1;
 		printf("sio%d: unload\n", dp->isahd.id_unit);
@@ -732,27 +717,6 @@ card_intr(struct pccard_dev *dp)
 }
 #endif /* NCRD > 0 */
 
-static void
-sioregisterdev(id)
-	struct isa_device *id;
-{
-	int	unit;
-
-	unit = id->id_unit;
-/*
- *	If already registered, don't try to re-register.
- */
-	if (kdc_sio[unit].kdc_isa)
-		return;
-	if (unit != 0)
-		kdc_sio[unit] = kdc_sio[0];
-	kdc_sio[unit].kdc_state = DC_UNCONFIGURED;
-	kdc_sio[unit].kdc_description = "Serial port";
-	kdc_sio[unit].kdc_unit = unit;
-	kdc_sio[unit].kdc_isa = id;
-	dev_attach(&kdc_sio[unit]);
-}
-
 static int
 sioprobe(dev)
 	struct isa_device	*dev;
@@ -774,8 +738,6 @@ sioprobe(dev)
 	struct isa_device	*xdev;
 #endif
 
-	sioregisterdev(dev);
-
 	if (!already_init) {
 		/*
 		 * Turn off MCR_IENABLE for all likely serial ports.  An unused
@@ -1180,8 +1142,6 @@ sioattach(isdp)
 #ifdef DSI_SOFT_MODEM
 	if((inb(iobase+7) ^ inb(iobase+7)) & 0x80) {
 	    printf(" Digicom Systems, Inc. SoftModem");
-	    kdc_sio[unit].kdc_description =
-	      "Serial port: Digicom Systems SoftModem";
 	goto determined_type;
 	}
 #endif /* DSI_SOFT_MODEM */
@@ -1203,8 +1163,6 @@ sioattach(isdp)
 		outb(iobase + com_scr, scr);
 		if (scr1 != 0xa5 || scr2 != 0x5a) {
 			printf(" 8250");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: National 8250 or compatible";
 			goto determined_type;
 		}
 	}
@@ -1219,28 +1177,20 @@ sioattach(isdp)
 		switch(com->pc98_if_type){
 		case COM_IF_INTERNAL:
 			printf(" 8251 (internal)");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: PC-9801 internal";
 			break;
 #ifdef COM_IF_PC9861K
 		case COM_IF_PC9861K:
 			printf(" 8251 (PC9861K)");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: PC-9861K";
 			break;
 #endif
 #ifdef COM_IF_PIO9032B
 		case COM_IF_PIO9032B:
 			printf(" 8251 (PIO9032B)");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: PIO9032B";
 			break;
 #endif
 #ifdef COM_IF_B98_01
 		case COM_IF_B98_01:
 			printf(" 8251 (B98_01)");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: B98_01";
 			break;
 #endif
 		}
@@ -1251,36 +1201,24 @@ sioattach(isdp)
 	switch (inb(com->int_id_port) & IIR_FIFO_MASK) {
 	case FIFO_RX_LOW:
 		printf(" 16450");
-		kdc_sio[unit].kdc_description =
-		  "Serial port: National 16450 or compatible";
 		break;
 	case FIFO_RX_MEDL:
 		printf(" 16450?");
-		kdc_sio[unit].kdc_description =
-		  "Serial port: maybe National 16450";
 		break;
 	case FIFO_RX_MEDH:
 		printf(" 16550?");
-		kdc_sio[unit].kdc_description =
-		  "Serial port: maybe National 16550";
 		break;
 	case FIFO_RX_HIGH:
 		printf(" 16550A");
 		if (COM_NOFIFO(isdp)) {
 			printf(" fifo disabled");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: National 16550A, FIFO disabled";
 		} else {
 			com->hasfifo = TRUE;
 			com->tx_fifo_size = 16;
-			kdc_sio[unit].kdc_description =
-			  "Serial port: National 16550A or compatible";
 #ifdef COM_ESP
 			for (espp = likely_esp_ports; *espp != 0; espp++)
 				if (espattach(isdp, com, *espp)) {
 					com->tx_fifo_size = 1024;
-					kdc_sio[unit].kdc_description =
-					  "Serial port: Hayes ESP";
 					break;
 				}
 #endif
@@ -1305,8 +1243,6 @@ sioattach(isdp)
 		} else {
 			com->tx_fifo_size = 32;
 			printf(" 16650");
-			kdc_sio[unit].kdc_description =
-			  "Serial port: Startech 16C650 or similar";
 		}
 		if (!com->tx_fifo_size)
 			printf(" fifo disabled");
@@ -1357,8 +1293,6 @@ determined_type: ;
 #endif
 	printf("\n");
 
-	kdc_sio[unit].kdc_state = (unit == comconsole) ? DC_BUSY : DC_IDLE;
-
 	s = spltty();
 	com_addr(unit) = com;
 	splx(s);
@@ -1430,7 +1364,6 @@ open_top:
 		if (error != 0 || com->gone)
 			goto out;
 	}
-	kdc_sio[unit].kdc_state = DC_BUSY;
 	if (tp->t_state & TS_ISOPEN) {
 		/*
 		 * The device is open, so everything has been initialized.
@@ -1709,8 +1642,6 @@ comhardclose(com)
 	com->active_out = FALSE;
 	wakeup(&com->active_out);
 	wakeup(TSA_CARR_ON(tp));	/* restart any wopeners */
-	if (!(com->state & CS_DTR_OFF) && unit != comconsole)
-		kdc_sio[unit].kdc_state = DC_IDLE;
 	splx(s);
 }
 
@@ -1771,8 +1702,6 @@ siodtrwakeup(chan)
 
 	com = (struct com_s *)chan;
 	com->state &= ~CS_DTR_OFF;
-	if (com->unit != comconsole)
-		kdc_sio[com->unit].kdc_state = DC_IDLE;
 	wakeup(&com->dtr_wait);
 }