From 985c9639af4da068b3bcb7ac799823f3ddc0617c Mon Sep 17 00:00:00 2001 From: miod <> Date: Sat, 22 Oct 2011 19:31:23 +0000 Subject: [PATCH] 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@ --- src/etc/MAKEDEV.common | 7 +++---- src/etc/etc.alpha/MAKEDEV.md | 3 ++- src/etc/etc.amd64/MAKEDEV.md | 3 ++- src/etc/etc.armish/MAKEDEV.md | 3 ++- src/etc/etc.hppa/MAKEDEV.md | 3 ++- src/etc/etc.hppa64/MAKEDEV.md | 3 ++- src/etc/etc.i386/MAKEDEV.md | 3 ++- src/etc/etc.landisk/MAKEDEV.md | 3 ++- src/etc/etc.loongson/MAKEDEV.md | 3 ++- src/etc/etc.macppc/MAKEDEV.md | 3 ++- src/etc/etc.palm/MAKEDEV.md | 3 ++- src/etc/etc.sgi/MAKEDEV.md | 3 ++- src/etc/etc.socppc/MAKEDEV.md | 3 ++- src/etc/etc.sparc/MAKEDEV.md | 3 ++- src/etc/etc.sparc64/MAKEDEV.md | 3 ++- src/etc/etc.vax/MAKEDEV.md | 3 ++- 16 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common index d494ff8c..5be98198 100644 --- a/src/etc/MAKEDEV.common +++ b/src/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 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/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md index 4dc7f5c7..6d5c5e88 100644 --- a/src/etc/etc.alpha/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md index bc667e88..b1cc2bd8 100644 --- a/src/etc/etc.amd64/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.armish/MAKEDEV.md b/src/etc/etc.armish/MAKEDEV.md index a6011771..5754379c 100644 --- a/src/etc/etc.armish/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.hppa/MAKEDEV.md b/src/etc/etc.hppa/MAKEDEV.md index ae9c7f7a..092955f5 100644 --- a/src/etc/etc.hppa/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.hppa64/MAKEDEV.md b/src/etc/etc.hppa64/MAKEDEV.md index 6185aeff..aaaea120 100644 --- a/src/etc/etc.hppa64/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md index 996e9328..57f6cf0d 100644 --- a/src/etc/etc.i386/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.landisk/MAKEDEV.md b/src/etc/etc.landisk/MAKEDEV.md index a053e192..15c75b52 100644 --- a/src/etc/etc.landisk/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.loongson/MAKEDEV.md b/src/etc/etc.loongson/MAKEDEV.md index 762e5268..14d0cde1 100644 --- a/src/etc/etc.loongson/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md index e4632b03..0c16c334 100644 --- a/src/etc/etc.macppc/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.palm/MAKEDEV.md b/src/etc/etc.palm/MAKEDEV.md index d327612c..d3daee74 100644 --- a/src/etc/etc.palm/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.sgi/MAKEDEV.md b/src/etc/etc.sgi/MAKEDEV.md index c62232d4..561a9b8a 100644 --- a/src/etc/etc.sgi/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.socppc/MAKEDEV.md b/src/etc/etc.socppc/MAKEDEV.md index 71e61e9c..fcf74d6d 100644 --- a/src/etc/etc.socppc/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.sparc/MAKEDEV.md b/src/etc/etc.sparc/MAKEDEV.md index 5fc06a8f..f26abafd 100644 --- a/src/etc/etc.sparc/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.sparc64/MAKEDEV.md b/src/etc/etc.sparc64/MAKEDEV.md index a8ad83e8..ce7f734d 100644 --- a/src/etc/etc.sparc64/MAKEDEV.md +++ b/src/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 @@ -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/src/etc/etc.vax/MAKEDEV.md b/src/etc/etc.vax/MAKEDEV.md index bf13032c..f8b58a09 100644 --- a/src/etc/etc.vax/MAKEDEV.md +++ b/src/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 @@ -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