summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2011-10-22 19:31:24 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2011-10-22 19:31:24 +0000
commit06089a117790af860ad053ed5d10f2e7c85a92b8 (patch)
tree854f5484c853503fe7e78835e3017702b8ee1f8f
parent6f984c7069d82d96d5c444e40890f27144a711aa (diff)
Move the audio* device creation stanzas from MI to MD, and reduce the
number of audio* nodes from 3 to 1 on vax, since none of the audio-capable vax can receive another audio device as expansion (until we get TURBOchannel support with DMA on VS4k/90). ok deraadt@ todd@
Diffstat
-rw-r--r--etc/MAKEDEV.common7
-rw-r--r--etc/etc.alpha/MAKEDEV.md3
-rw-r--r--etc/etc.amd64/MAKEDEV.md3
-rw-r--r--etc/etc.armish/MAKEDEV.md3
-rw-r--r--etc/etc.hppa/MAKEDEV.md3
-rw-r--r--etc/etc.hppa64/MAKEDEV.md3
-rw-r--r--etc/etc.i386/MAKEDEV.md3
-rw-r--r--etc/etc.landisk/MAKEDEV.md3
-rw-r--r--etc/etc.loongson/MAKEDEV.md3
-rw-r--r--etc/etc.macppc/MAKEDEV.md3
-rw-r--r--etc/etc.palm/MAKEDEV.md3
-rw-r--r--etc/etc.sgi/MAKEDEV.md3
-rw-r--r--etc/etc.socppc/MAKEDEV.md3
-rw-r--r--etc/etc.sparc/MAKEDEV.md3
-rw-r--r--etc/etc.sparc64/MAKEDEV.md3
-rw-r--r--etc/etc.vax/MAKEDEV.md3
16 files changed, 33 insertions, 19 deletions
diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index d494ff8c303..5be98198a46 100644
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp $-})dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
dnl
@@ -118,8 +118,8 @@ dnl target(ramd,rd,0)
dnl disk_q(rd)
dnl __devitem(rd, {-rd*-}, {-rd-})dnl
dnl
-dnl Note: not all disks are generated in 'all)'. (e.g. vax has a lot of
-dnl disks that are not generated by 'all)')
+dnl Note: not all devices are generated in 'all)' below. MAKEDEV.md contains
+dnl its own extra list.
dnl
divert(1)dnl
twrget(all, fdesc, fd)dnl
@@ -153,7 +153,6 @@ twrget(all, lpt, lpa, 0, 1, 2)dnl
target(all, joy, 0, 1)dnl
twrget(all, rnd, random)dnl
target(all, uk, 0)dnl
-twrget(all, au, audio, 0, 1, 2)dnl
twrget(all, vi, video, 0, 1)dnl
twrget(all, speak, speaker)dnl
target(all, asc, 0)dnl
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md
index 4dc7f5c716d..6d5c5e8861c 100644
--- a/etc/etc.alpha/MAKEDEV.md
+++ b/etc/etc.alpha/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,alpha)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.52 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.53 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -112,6 +112,7 @@ ttyB*|ttyc*)
dnl
dnl *** alpha specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, bio)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
diff --git a/etc/etc.amd64/MAKEDEV.md b/etc/etc.amd64/MAKEDEV.md
index bc667e88a0c..b1cc2bd8edb 100644
--- a/etc/etc.amd64/MAKEDEV.md
+++ b/etc/etc.amd64/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,amd64)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.45 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.46 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -120,6 +120,7 @@ ttyc*)
dnl
dnl amd64 specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.armish/MAKEDEV.md b/etc/etc.armish/MAKEDEV.md
index a60117713e9..5754379c2b8 100644
--- a/etc/etc.armish/MAKEDEV.md
+++ b/etc/etc.armish/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,armish)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.22 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.23 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -105,6 +105,7 @@ _std(1, 2, 8, 6)
dnl
dnl *** armish specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md
index ae9c7f7a6e7..092955f5123 100644
--- a/etc/etc.hppa/MAKEDEV.md
+++ b/etc/etc.hppa/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,hppa)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.46 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.47 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -93,6 +93,7 @@ _std(1, 2, 25, 6)
dnl
dnl *** hppa specific devices
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, bio)dnl
target(all, nnpfs, 0)dnl
diff --git a/etc/etc.hppa64/MAKEDEV.md b/etc/etc.hppa64/MAKEDEV.md
index 6185aeff229..aaaea120b01 100644
--- a/etc/etc.hppa64/MAKEDEV.md
+++ b/etc/etc.hppa64/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,hppa64)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.23 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.24 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -91,6 +91,7 @@ _std(1, 2, 25, 6)
dnl
dnl *** hppa64 specific devices
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.i386/MAKEDEV.md b/etc/etc.i386/MAKEDEV.md
index 996e9328362..57f6cf0d8a2 100644
--- a/etc/etc.i386/MAKEDEV.md
+++ b/etc/etc.i386/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,i386)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.60 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.61 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -123,6 +123,7 @@ ttyc*)
dnl
dnl i386 specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.landisk/MAKEDEV.md b/etc/etc.landisk/MAKEDEV.md
index a053e19234d..15c75b52195 100644
--- a/etc/etc.landisk/MAKEDEV.md
+++ b/etc/etc.landisk/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,landisk)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.24 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.25 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -109,6 +109,7 @@ _std(1, 2, 8, 6)
dnl
dnl *** landisk specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
twrget(all, scif, tty, a)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
diff --git a/etc/etc.loongson/MAKEDEV.md b/etc/etc.loongson/MAKEDEV.md
index 762e52688f9..14d0cde1dc6 100644
--- a/etc/etc.loongson/MAKEDEV.md
+++ b/etc/etc.loongson/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,loongson)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.11 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.12 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -92,6 +92,7 @@ _std(2, 3, 35, 6)
dnl
dnl *** loongson specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
dnl target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.macppc/MAKEDEV.md b/etc/etc.macppc/MAKEDEV.md
index e4632b03537..0c16c334c9c 100644
--- a/etc/etc.macppc/MAKEDEV.md
+++ b/etc/etc.macppc/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,macppc)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.47 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.48 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -113,6 +113,7 @@ _std(1, 2, 43, 6)
dnl
dnl *** macppc specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
twrget(all, s64_tzs, tty, a, b)dnl
twrget(all, s64_czs, cua, a, b)dnl
target(all, ch, 0)dnl
diff --git a/etc/etc.palm/MAKEDEV.md b/etc/etc.palm/MAKEDEV.md
index d327612c2d5..d3daee74bd3 100644
--- a/etc/etc.palm/MAKEDEV.md
+++ b/etc/etc.palm/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,palm)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.9 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.10 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -103,6 +103,7 @@ _std(1, 2, 8, 6)
dnl
dnl *** palm specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.sgi/MAKEDEV.md b/etc/etc.sgi/MAKEDEV.md
index c62232d4ae4..561a9b8abeb 100644
--- a/etc/etc.sgi/MAKEDEV.md
+++ b/etc/etc.sgi/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,sgi)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.34 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.35 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -89,6 +89,7 @@ _std(2, 3, 35, 6)
dnl
dnl *** sgi specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.socppc/MAKEDEV.md b/etc/etc.socppc/MAKEDEV.md
index 71e61e9cf04..fcf74d6d5a6 100644
--- a/etc/etc.socppc/MAKEDEV.md
+++ b/etc/etc.socppc/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,socppc)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.15 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.16 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -91,6 +91,7 @@ _std(1, 2, 43, 6)
dnl
dnl *** socppc specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
dnl target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md
index 5fc06a8f7e9..f26abafd17f 100644
--- a/etc/etc.sparc/MAKEDEV.md
+++ b/etc/etc.sparc/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,sparc)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.47 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.48 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -123,6 +123,7 @@ _std(2, 3, 122, 16)
dnl
dnl *** some sparc-specific targets
dnl
+twrget(all, au, audio, 0, 1, 2)dnl
twrget(all, s64_tzs, tty, a, b, c, d)dnl
twrget(all, s64_czs, cua, a, b, c, d)dnl
target(all, bio)dnl
diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md
index a8ad83e8ea4..ce7f734d19a 100644
--- a/etc/etc.sparc64/MAKEDEV.md
+++ b/etc/etc.sparc64/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,sparc64)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.63 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.64 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -142,6 +142,7 @@ twrget(wscons, wscons, ttyG, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
twrget(wscons, wscons, ttyH, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
twrget(wscons, wscons, ttyI, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
twrget(wscons, wscons, ttyJ, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
diff --git a/etc/etc.vax/MAKEDEV.md b/etc/etc.vax/MAKEDEV.md
index bf13032cdba..f8b58a09545 100644
--- a/etc/etc.vax/MAKEDEV.md
+++ b/etc/etc.vax/MAKEDEV.md
@@ -1,6 +1,6 @@
define(MACHINE,vax)dnl
vers(__file__,
- {-$OpenBSD: MAKEDEV.md,v 1.46 2011/10/06 20:49:27 deraadt Exp $-},
+ {-$OpenBSD: MAKEDEV.md,v 1.47 2011/10/22 19:31:23 miod Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -176,6 +176,7 @@ mt*)
dnl
dnl *** vax specific targets
dnl
+twrget(all, au, audio, 0)
target(all, ch, 0)dnl
target(all, nnpfs, 0)dnl
target(all, vscsi, 0)dnl
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:57:00 +0000