Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct wrong board IDs (used ID definition from FreeBSD)

This commit is contained in:
mjl 1999-04-15 23:51:44 +00:00
parent 1ddebc8444
commit 6224c1beda
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/ic/aha.c
View File

@ -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" #include "opt_ddb.h"
@ -1122,23 +1122,27 @@ aha_inquire_setup_information(sc)
#endif /* AHADEBUG */ #endif /* AHADEBUG */
switch (revision.reply.boardid) { switch (revision.reply.boardid) {
case 0x31: case BOARD_1540_16HEAD_BIOS:
case BOARD_1540_64HEAD_BIOS:
case BOARD_1540:
strcpy(sc->sc_model, "1540"); strcpy(sc->sc_model, "1540");
break; break;
case 0x41: case BOARD_1542:
strcpy(sc->sc_model, "1540A/1542A/1542B"); strcpy(sc->sc_model, "1540A/1542A/1542B");
break; break;
case 0x42: case BOARD_1640:
strcpy(sc->sc_model, "1640"); strcpy(sc->sc_model, "1640");
break; break;
case 0x43: case BOARD_1740:
strcpy(sc->sc_model, "1740");
break;
case BOARD_1542C:
strcpy(sc->sc_model, "1542C"); strcpy(sc->sc_model, "1542C");
break; break;
case 0x44: case BOARD_1542CF:
case 0x45:
strcpy(sc->sc_model, "1542CF"); strcpy(sc->sc_model, "1542CF");
break; break;
case 0x46: case BOARD_1542CP:
strcpy(sc->sc_model, "1542CP"); strcpy(sc->sc_model, "1542CP");
break; break;
} }

17
sys/dev/ic/ahareg.h
View File

@ -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. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * 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_MBOA 0x02 /* MBX out empty */
#define AHA_INTR_MBIF 0x01 /* MBX in full */ #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 { struct aha_mbx_out {
u_char cmd; u_char cmd;
physaddr ccb_addr; physaddr ccb_addr;