summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev/diodevs
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-01-14 11:49:02 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-01-14 11:49:02 +0000
commitba26ed5b53b5f47b4dcab5d60d7dd91950e2cffe (patch)
tree41f9b9d1561a64b91b45d4ac5826fa40aeac234d /sys/arch/hp300/dev/diodevs
parentf5f63b1ddfa0518d3d82b005347bcc1ad09c224e (diff)
Sync with latest NetBSD diodevs (device name and ID fixes, and add 425e audio).
Diffstat (limited to 'sys/arch/hp300/dev/diodevs')
-rw-r--r--sys/arch/hp300/dev/diodevs18
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/arch/hp300/dev/diodevs b/sys/arch/hp300/dev/diodevs
index 2dd4c6d784e..3199af03abb 100644
--- a/sys/arch/hp300/dev/diodevs
+++ b/sys/arch/hp300/dev/diodevs
@@ -1,4 +1,5 @@
-$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.
@@ -26,8 +27,8 @@ $OpenBSD: diodevs,v 1.4 2003/03/21 16:18:29 miod Exp $
* 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
@@ -54,13 +55,13 @@ device LAN 0x15 1 98643A LAN
device LANREM 0x95 1 98643A LAN
device FHPIB 0x08 1 98625A/98625B HP-IB
-device NHPIB 0x80 1 98624A HP-IB
+device NHPIB 0x01 1 98624A HP-IB
device IHPIB 0x00 1 internal HP-IB
-device SCSI0 0x07 1 98625A SCSI
-device SCSI1 0x27 1 98625A SCSI
-device SCSI2 0x47 1 98625A SCSI
-device SCSI3 0x67 1 98625A SCSI
+device SCSI0 0x07 1 98265A SCSI
+device SCSI1 0x27 1 98265A SCSI
+device SCSI2 0x47 1 98265A SCSI
+device SCSI3 0x67 1 98265A SCSI
/* Framebuffer devices; same primary ID, different secondary IDs. */
@@ -91,6 +92,7 @@ device MISC2 0x09 1 98287A keyboard
device MISC3 0x0a 1 HP98635A floating point accelerator
device MISC4 0x0b 1 timer
device MISC5 0x12 1 98640A
+device AUDIO 0x13 1 digital audio
device MISC6 0x16 1 98659A
device MISC7 0x19 1 237 display
device MISC8 0x1a 4 quad-wide card