From 6224c1beda95c106f5ec16acf83683e8b9500fb3 Mon Sep 17 00:00:00 2001
From: mjl <mjl@NetBSD.org>
Date: Thu, 15 Apr 1999 23:51:44 +0000
Subject: [PATCH] Correct wrong board IDs (used ID definition from FreeBSD)

---
 sys/dev/ic/aha.c    | 20 ++++++++++++--------
 sys/dev/ic/ahareg.h | 17 +++++++++++++++--
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/sys/dev/ic/aha.c b/sys/dev/ic/aha.c
index 32536856e9ce..6110d469bb2e 100644
--- a/sys/dev/ic/aha.c
+++ b/sys/dev/ic/aha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha.c,v 1.22 1998/12/09 08:47:18 thorpej Exp $	*/
+/*	$NetBSD: aha.c,v 1.23 1999/04/15 23:51:44 mjl Exp $	*/
 
 #include "opt_ddb.h"
 
@@ -1122,23 +1122,27 @@ aha_inquire_setup_information(sc)
 #endif /* AHADEBUG */
 
 	switch (revision.reply.boardid) {
-	case 0x31:
+	case BOARD_1540_16HEAD_BIOS:
+	case BOARD_1540_64HEAD_BIOS:
+	case BOARD_1540:
 		strcpy(sc->sc_model, "1540");
 		break;
-	case 0x41:
+	case BOARD_1542:
 		strcpy(sc->sc_model, "1540A/1542A/1542B");
 		break;
-	case 0x42:
+	case BOARD_1640:
 		strcpy(sc->sc_model, "1640");
 		break;
-	case 0x43:
+	case BOARD_1740:
+		strcpy(sc->sc_model, "1740");
+		break;
+	case BOARD_1542C:
 		strcpy(sc->sc_model, "1542C");
 		break;
-	case 0x44:
-	case 0x45:
+	case BOARD_1542CF:
 		strcpy(sc->sc_model, "1542CF");
 		break;
-	case 0x46:
+	case BOARD_1542CP:
 		strcpy(sc->sc_model, "1542CP");
 		break;
 	}
diff --git a/sys/dev/ic/ahareg.h b/sys/dev/ic/ahareg.h
index 7ee26711d4e7..3b9399a0bb29 100644
--- a/sys/dev/ic/ahareg.h
+++ b/sys/dev/ic/ahareg.h
@@ -1,7 +1,7 @@
-/*	$NetBSD: ahareg.h,v 1.8 1998/08/17 00:26:33 mycroft Exp $	*/
+/*	$NetBSD: ahareg.h,v 1.9 1999/04/15 23:51:45 mjl Exp $	*/
 
 /*-
- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-99 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -117,6 +117,19 @@ typedef u_int8_t physlen[3];
 #define AHA_INTR_MBOA		0x02	/* MBX out empty */
 #define AHA_INTR_MBIF		0x01	/* MBX in full */
 
+/*
+ * AHA Board IDs
+ */
+#define BOARD_1540_16HEAD_BIOS  0x00
+#define BOARD_1540_64HEAD_BIOS  0x30
+#define BOARD_1540              0x31
+#define BOARD_1542              0x41    /* aha-1540/1542 w/64-h bios */
+#define BOARD_1640              0x42    /* aha-1640 */
+#define BOARD_1740              0x43    /* aha-1740A/1742A/1744 */
+#define BOARD_1542C             0x44    /* aha-1542C */
+#define BOARD_1542CF            0x45    /* aha-1542CF */
+#define BOARD_1542CP            0x46    /* aha-1542CP, plug and play */
+
 struct aha_mbx_out {
 	u_char cmd;
 	physaddr ccb_addr;