diff options
| -rw-r--r-- | sys/arch/hp300/dev/diodevs.h | 20 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/diodevs_data.h | 15 |
2 files changed, 21 insertions, 14 deletions
diff --git a/sys/arch/hp300/dev/diodevs.h b/sys/arch/hp300/dev/diodevs.h index f20c5fe0da6..3bdb1af84f0 100644 --- a/sys/arch/hp300/dev/diodevs.h +++ b/sys/arch/hp300/dev/diodevs.h @@ -2,8 +2,9 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: diodevs,v 1.4 2003/03/21 16:18:29 miod Exp + * OpenBSD: diodevs,v 1.5 2005/01/14 11:49:01 miod Exp */ +/* $NetBSD: diodevs,v 1.7 2003/11/23 01:57:35 tsutsui Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -31,8 +32,8 @@ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN @@ -72,7 +73,7 @@ #define DIO_DEVICE_ID_FHPIB 0x08 #define DIO_DEVICE_DESC_FHPIB "98625A/98625B HP-IB" -#define DIO_DEVICE_ID_NHPIB 0x80 +#define DIO_DEVICE_ID_NHPIB 0x01 #define DIO_DEVICE_DESC_NHPIB "98624A HP-IB" #define DIO_DEVICE_ID_IHPIB 0x00 @@ -80,16 +81,16 @@ #define DIO_DEVICE_ID_SCSI0 0x07 -#define DIO_DEVICE_DESC_SCSI0 "98625A SCSI" +#define DIO_DEVICE_DESC_SCSI0 "98265A SCSI" #define DIO_DEVICE_ID_SCSI1 0x27 -#define DIO_DEVICE_DESC_SCSI1 "98625A SCSI" +#define DIO_DEVICE_DESC_SCSI1 "98265A SCSI" #define DIO_DEVICE_ID_SCSI2 0x47 -#define DIO_DEVICE_DESC_SCSI2 "98625A SCSI" +#define DIO_DEVICE_DESC_SCSI2 "98265A SCSI" #define DIO_DEVICE_ID_SCSI3 0x67 -#define DIO_DEVICE_DESC_SCSI3 "98625A SCSI" +#define DIO_DEVICE_DESC_SCSI3 "98265A SCSI" /* Framebuffer devices; same primary ID, different secondary IDs. */ @@ -161,6 +162,9 @@ #define DIO_DEVICE_ID_MISC5 0x12 #define DIO_DEVICE_DESC_MISC5 "98640A" +#define DIO_DEVICE_ID_AUDIO 0x13 +#define DIO_DEVICE_DESC_AUDIO "digital audio" + #define DIO_DEVICE_ID_MISC6 0x16 #define DIO_DEVICE_DESC_MISC6 "98659A" diff --git a/sys/arch/hp300/dev/diodevs_data.h b/sys/arch/hp300/dev/diodevs_data.h index bd9c10948fb..04dda50932d 100644 --- a/sys/arch/hp300/dev/diodevs_data.h +++ b/sys/arch/hp300/dev/diodevs_data.h @@ -2,8 +2,9 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: diodevs,v 1.4 2003/03/21 16:18:29 miod Exp + * OpenBSD: diodevs,v 1.5 2005/01/14 11:49:01 miod Exp */ +/* $NetBSD: diodevs,v 1.7 2003/11/23 01:57:35 tsutsui Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -31,8 +32,8 @@ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN @@ -41,7 +42,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define DIO_NDEVICES 46 +#define DIO_NDEVICES 47 struct dio_devdata dio_devdatas[] = { { 0x02, 0, 1 }, @@ -53,7 +54,7 @@ struct dio_devdata dio_devdatas[] = { { 0x15, 0, 1 }, { 0x95, 0, 1 }, { 0x08, 0, 1 }, - { 0x80, 0, 1 }, + { 0x01, 0, 1 }, { 0x00, 0, 1 }, { 0x07, 0, 1 }, { 0x27, 0, 1 }, @@ -79,6 +80,7 @@ struct dio_devdata dio_devdatas[] = { { 0x0a, 0, 1 }, { 0x0b, 0, 1 }, { 0x12, 0, 1 }, + { 0x13, 0, 1 }, { 0x16, 0, 1 }, { 0x19, 0, 1 }, { 0x1a, 0, 4 }, @@ -103,7 +105,7 @@ struct dio_devdesc dio_devdescs[] = { { 0x15, 0, DIO_DEVICE_DESC_LAN }, { 0x95, 0, DIO_DEVICE_DESC_LANREM }, { 0x08, 0, DIO_DEVICE_DESC_FHPIB }, - { 0x80, 0, DIO_DEVICE_DESC_NHPIB }, + { 0x01, 0, DIO_DEVICE_DESC_NHPIB }, { 0x00, 0, DIO_DEVICE_DESC_IHPIB }, { 0x07, 0, DIO_DEVICE_DESC_SCSI0 }, { 0x27, 0, DIO_DEVICE_DESC_SCSI1 }, @@ -129,6 +131,7 @@ struct dio_devdesc dio_devdescs[] = { { 0x0a, 0, DIO_DEVICE_DESC_MISC3 }, { 0x0b, 0, DIO_DEVICE_DESC_MISC4 }, { 0x12, 0, DIO_DEVICE_DESC_MISC5 }, + { 0x13, 0, DIO_DEVICE_DESC_AUDIO }, { 0x16, 0, DIO_DEVICE_DESC_MISC6 }, { 0x19, 0, DIO_DEVICE_DESC_MISC7 }, { 0x1a, 0, DIO_DEVICE_DESC_MISC8 }, |