From be8bcd17ebcd26f9d41930cb6e80e74bbb596fa6 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 25 Mar 2000 03:24:43 +0000
Subject: [PATCH] More pnpids.

---
 sys/dev/aha/aha_isa.c | 7 +++++--
 sys/dev/aha/ahareg.h  | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 53ef9a958a7..02e00369ad8 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -49,8 +49,11 @@
 #include <cam/scsi/scsi_all.h>
 
 static struct isa_pnp_id aha_ids[] = {
-	{AHA1542_PNP,		NULL},		/* ADP1542 */
-	{AHA1542_PNPCOMPAT,	NULL},		/* PNP00A0 */
+	{ADP0100_PNP,		"Adaptec 1540/1542 ISA SCSI"},	/* ADP0100 */
+	{AHA1540_PNP,		"Adaptec 1540/aha-1640/aha-1535"},/* ADP1542 */
+	{AHA1542_PNP,		"Adaptec 1542/aha-1535"},	/* ADP1542 */
+	{AHA1542_PNPCOMPAT,	"Adaptec 1542 compatible"},	/* PNP00A0 */
+	{ICU0091_PNP,		"Adaptec AHA-1540/1542 SCSI"},	/* ICU0091 */
 	{0}
 };
 
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index 281d6a3721d..339eace12e2 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -430,7 +430,10 @@ int			aha_probe(struct aha_softc *);
 #define EXTRA_AHA 4
 #define NAHATOT (NAHA + EXTRA_AHA)
 
+#define ADP0100_PNP		0x00019004	/* ADP0100 */
+#define AHA1540_PNP		0x40159004	/* ADP1540 */
 #define AHA1542_PNP		0x42159004	/* ADP1542 */
 #define AHA1542_PNPCOMPAT	0xA000D040	/* PNP00A0 */
+#define ICU0091_PNP		0X91005AA4	/* ICU0091 */
 
 #endif	/* _AHA_H_ */