Add more cards and device names, and print better looking probe messages for

unknown cards.

3 files changed, 46 insertions, 40 deletions

diff --git a/sys/dev/tc/devlist2h.awk b/sys/dev/tc/devlist2h.awk
index bf189844e04..6cbcb71bbee 100644
--- a/sys/dev/tc/devlist2h.awk
+++ b/sys/dev/tc/devlist2h.awk
@@ -1,5 +1,5 @@
 #! /usr/bin/awk -f
-#	$OpenBSD: devlist2h.awk,v 1.4 2002/05/02 22:56:06 miod Exp $
+#	$OpenBSD: devlist2h.awk,v 1.5 2002/05/03 20:27:44 miod Exp $
 #	$NetBSD: devlist2h.awk,v 1.3 1996/06/05 18:32:19 cgd Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -66,11 +66,14 @@ $1 == "device" {
 	devices[ndevices, 1] = $2;		# C identifier for device
 	gsub("-", "_", devices[ndevices, 1]);
 
-	devices[ndevices, 2] = $3;		# driver name
-
 	printf("\n") > hfile
-	printf("#define\tTC_DEVICE_%s\t\"%s\"\n", devices[ndevices, 1],
-	    devices[ndevices, 2]) > hfile
+	if ($3 == "???") { # driver name
+		printf("#define\tTC_DEVICE_%s\tNULL\n",
+		    devices[ndevices, 1]) > hfile
+	} else {
+		printf("#define\tTC_DEVICE_%s\t\"%s\"\n",
+		    devices[ndevices, 1], $3) > hfile
+	}
 
 	printf("#define\tTC_DESCRIPTION_%s\t\"", devices[ndevices, 1]) > hfile
 
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c
index d11a1375ba9..dec693d68c9 100644
--- a/sys/dev/tc/tc.c
+++ b/sys/dev/tc/tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc.c,v 1.12 2002/05/02 22:56:06 miod Exp $	*/
+/*	$OpenBSD: tc.c,v 1.13 2002/05/03 20:27:44 miod Exp $	*/
 /*	$NetBSD: tc.c,v 1.29 2001/11/13 06:26:10 lukem Exp $	*/
 
 /*
@@ -308,20 +308,18 @@ tc_devinfo(id, cp)
 	const char *id;
 	char *cp;
 {
-	const char *driver, *description;
+	const char *driver;
 #ifdef TCVERBOSE
 	struct tc_knowndev *tdp;
 	int match;
-	const char *unmatched = "unknown ";
-#else
-	const char *unmatched = "";
+	const char *description;
 #endif
 
 	driver = NULL;
-	description = id;
 
 #ifdef TCVERBOSE
 	/* find the device in the table, if possible. */
+	description = NULL;
 	tdp = tc_knowndevs;
 	while (tdp->id != NULL) {
 		/* check this entry for a match */
@@ -333,10 +331,9 @@ tc_devinfo(id, cp)
 		}
 		tdp++;
 	}
-#endif
-
-	if (driver == NULL)
-		cp += sprintf(cp, "%sdevice %s", unmatched, id);
-	else
+	if (driver != NULL)
 		cp += sprintf(cp, "%s (%s)", driver, description);
+	else
+#endif
+		cp += sprintf(cp, "%s", id);
 }
diff --git a/sys/dev/tc/tcdevs b/sys/dev/tc/tcdevs
index 0f6558ee15a..ffe0ef49a0c 100644
--- a/sys/dev/tc/tcdevs
+++ b/sys/dev/tc/tcdevs
@@ -1,4 +1,4 @@
-$OpenBSD: tcdevs,v 1.6 2002/05/02 22:56:06 miod Exp $
+$OpenBSD: tcdevs,v 1.7 2002/05/03 20:27:44 miod Exp $
 /* $NetBSD: tcdevs,v 1.17 2000/12/17 13:56:05 ad Exp $ */
 
 /*
@@ -39,46 +39,52 @@ device	FORE_ATM	fa	Fore TCA-100 ATM
 device	KZTSA-AA	tza	TZA FWD SCSI
 device	OTTO		otto	DEC SRC \"OTTO\" ATM
 device	PMAD-AA		le	LANCE Ethernet
+device	PMAD-AB		le	LANCE Ethernet
 device	PMAF-AA		fza	DEC FDDIcontroller 700 (DEFZA; fiber optic)
 device	PMAF-FA		fta	DEFTA FDDI
 device	PMAG-AA		mfb	Monochrome Frame Buffer
 device	PMAG-BA		cfb	Color Frame Buffer
 device	PMAG-CA		px	2D Graphics (PX 2DA)
+device	PMAG-CB		px	2D Graphics (PX 2DA)
 device	PMAG-DA		pxg	3D Graphics (PXG LM-3DA)
+device	PMAG-DB		pxg	3D Graphics (PXG LM-3DA)
+device	PMAG-EB		pxg	3D Graphics (PXG MID-3DA)
 device	PMAG-FA		pxg	3D Graphics (PXG HE-3DA)
 device	PMAG-FB		pxg	3D Graphics (PXG HE+3DA)
+device	PMAGB-BA	sfb	Smart Frame Buffer (HX8)
 device	PMAGB-FA	pxg	3D Graphics (PXG HE+3DA)
 device	PMAGB-FB	pxg	3D Graphics (PXG HE+3DA)
+device	PMAGC-AA	pvg	2D Graphics (PV-LO)
+device	PMAGC-BA	pvg	2D Graphics (PV-MID)
+device	PMAGD-AA	sfbp	Smart Frame Buffer Plus, 8bpp (ZLX-E1)
+device	PMAGD-BA	sfbp	Smart Frame Buffer Plus, 32bpp (ZLX-E2)
+device	PMAGD-CA	sfbp	Smart Frame Buffer Plus, 32bpp (ZLX-E3)
+device	PMAZ-AB		asc	53c94 SCSI Controller
+
 # the following entry may be incorrect
+device	KWS_TD		???	Kubota Denali
+device	PMABV-AA	vba	VME Adapter
 device	PMAG-DV		xcfb	Maxine Color Frame Buffer
 device	PMAG-JA		???	24-plane True Color Frame Buffer (TX)
-device	PMAGB-BA	sfb	Smart Frame Buffer
 device	PMAGD		sfbp	Smart Frame Buffer Plus, unknown bpp
-device	PMAGD-AA	sfbp	Smart Frame Buffer Plus, 8bpp
-device	PMAGD-BA	sfbp	Smart Frame Buffer Plus, 32bpp
-device	PMAZ-AA		asc	53c94 SCSI
-device	PMAZ-DS		tcds	53c94 TCDS SCSI (baseboard)
-device	PMAZ-FS		tcds	53c94 TCDS Fast SCSI (baseboard)
-device	PMAZB-AA	tcds	53c94 TCDS SCSI option card
-device	PMAZB-AB	tcds	53c94 TCDS SCSI option card
-device	PMAZC-AA	tcds	53c94 TCDS Fast SCSI option card
+device	PMAP-AA		???	Prestoserve
+device	PMAT-AA 	tra	DEC TurboChannel Token Ring Controller
+device	PMAZ-AA		asc	53c94 SCSI Controller
+device	PMAZ-DS		tcds	53c94 TCDS SCSI Controller (baseboard)
+device	PMAZ-FS		tcds	53c94 TCDS Fast SCSI Controller (baseboard)
+device	PMAZB-AA	tcds	53c94 TCDS SCSI Controller option card
+device	PMAZB-AB	tcds	53c94 TCDS SCSI Controller option card
+device	PMAZC-AA	tcds	53c94 TCDS Fast SCSI Controller option card
 device	PMTNV-AA	???	Non-volatile RAM option card
 device	T1D4PKT		ds	DECWRL Turbochannel T1
 device	T3PKT		tt	DECWRL Turbochannel T3
-device	PMAT-AA 	tra	DEC TurboChannel Token Ring Controller
-device	PMABV-AA	vba	VME Adapter
-device	PMAP-AA		???	Prestoserve
-device	KWS_TD		???	Kubota Denali
 
 # the following entries are unconfirmed
-#device	PMAD-AB		le	LANCE Ethernet
 #device	PMAF-CA		fza	DEC FDDIcontroller 700C (DEFZA; copper)
-#device	PMAG-DB		???	8-plane 3D Grahpics (PXG)
-#device	PMAG-AB		???	Monochrome Graphics Adapter (MX)
-#device	PMAG-JB		???	24-plane True Color Frame Buffer (TX)
-#device	PMAGB-BB	???	8-plane Color/Grayscale 2D SFB (HX)
-#device	PMAGB-BC	???	8-plane Color/Grayscale 2D SFB (HX)
-#define	PMAGB-BD	???	8-plane Color/Grayscale 2D SFB (HX)
-#define	PMAGB-BE	???	8-plane Color/Grayscale 2D SFB (HX)
-#device	PMAGB-JB	???	24-plane True Color Frame Buffer (TX)
-#device	PMAZ-AB		asc	53c94 SCSI
+#device	PMAG-AB		mx	Monochrome Graphics Adapter (MX)
+#device	PMAG-JB		tx	24-plane True Color Frame Buffer (TX)
+#device	PMAGB-BB	hx	8-plane Color/Grayscale 2D SFB (HX)
+#device	PMAGB-BC	hx	8-plane Color/Grayscale 2D SFB (HX)
+#define	PMAGB-BD	hx	8-plane Color/Grayscale 2D SFB (HX)
+#define	PMAGB-BE	hx	8-plane Color/Grayscale 2D SFB (HX)
+#device	PMAGB-JB	tx	24-plane True Color Frame Buffer (TX)