Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch wildcard speaker attachments, now that we can handl...



details:   https://anonhg.NetBSD.org/src/rev/625429410187
branches:  trunk
changeset: 349532:625429410187
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 13 20:42:15 2016 +0000

description:
wildcard speaker attachments, now that we can handle many of them.

diffstat:

 sys/arch/acorn32/conf/EB7500ATX        |  6 +++---
 sys/arch/acorn32/conf/GENERIC          |  6 +++---
 sys/arch/acorn32/conf/INSTALL          |  6 +++---
 sys/arch/acorn32/conf/LOWMEM_WSCONS    |  4 ++--
 sys/arch/acorn32/conf/NC               |  4 ++--
 sys/arch/algor/conf/P5064              |  7 ++++---
 sys/arch/algor/conf/P6032              |  7 ++++---
 sys/arch/alpha/conf/GENERIC            |  8 ++++----
 sys/arch/amd64/conf/ALL                |  9 ++++-----
 sys/arch/amd64/conf/GENERIC            |  9 ++++-----
 sys/arch/amd64/conf/XEN3_DOM0          |  4 ++--
 sys/arch/amiga/conf/AMIGA              |  4 ++--
 sys/arch/amiga/conf/DRACO              |  6 +++---
 sys/arch/amiga/conf/GENERIC            |  6 +++---
 sys/arch/amiga/conf/GENERIC.in         |  6 +++---
 sys/arch/amiga/conf/MDINSTALL          |  4 ++--
 sys/arch/amigappc/conf/GENERIC         |  6 +++---
 sys/arch/amigappc/conf/NULL            |  6 +++---
 sys/arch/atari/conf/GENERIC.in         |  4 ++--
 sys/arch/atari/conf/HADES              |  4 ++--
 sys/arch/atari/conf/HADES.in           |  4 ++--
 sys/arch/atari/conf/MILAN-ISAIDE       |  4 ++--
 sys/arch/atari/conf/MILAN-PCIIDE       |  4 ++--
 sys/arch/bebox/conf/GENERIC            |  8 ++++----
 sys/arch/bebox/conf/INSTALL            |  4 ++--
 sys/arch/cats/conf/GENERIC             |  7 +++----
 sys/arch/cats/conf/INSTALL             |  7 +++----
 sys/arch/cobalt/conf/GENERIC           |  6 +++---
 sys/arch/cobalt/conf/INSTALL           |  6 +++---
 sys/arch/dreamcast/conf/GENERIC        |  4 ++--
 sys/arch/epoc32/conf/GENERIC           |  6 +++---
 sys/arch/evbarm/conf/ALLWINNER_A80     |  4 ++--
 sys/arch/evbarm/conf/ARMADILLO9        |  4 ++--
 sys/arch/evbarm/conf/BPI               |  4 ++--
 sys/arch/evbarm/conf/CUBIEBOARD        |  4 ++--
 sys/arch/evbarm/conf/GUMSTIX           |  4 ++--
 sys/arch/evbarm/conf/HDL_G             |  4 ++--
 sys/arch/evbarm/conf/HPT5325           |  4 ++--
 sys/arch/evbarm/conf/HUMMINGBIRD_A31   |  4 ++--
 sys/arch/evbarm/conf/IMX23_OLINUXINO   |  4 ++--
 sys/arch/evbarm/conf/LUBBOCK           |  2 +-
 sys/arch/evbarm/conf/MINI2440          |  4 ++--
 sys/arch/evbarm/conf/MMNET_GENERIC     |  6 +++---
 sys/arch/evbarm/conf/MPCSA_GENERIC     |  6 +++---
 sys/arch/evbarm/conf/MV2120            |  4 ++--
 sys/arch/evbarm/conf/POGO              |  2 +-
 sys/arch/evbarm/conf/RPI               |  4 ++--
 sys/arch/evbarm/conf/SHEEVAPLUG        |  4 ++--
 sys/arch/evbarm/conf/SMDK2410          |  4 ++--
 sys/arch/evbarm/conf/TEGRA             |  4 ++--
 sys/arch/evbarm/conf/TS7200            |  4 ++--
 sys/arch/evbarm/conf/TWINTAIL          |  4 ++--
 sys/arch/evbmips/conf/ALCHEMY          |  6 +++---
 sys/arch/evbmips/conf/LOONGSON         |  6 +++---
 sys/arch/evbmips/conf/MALTA            |  6 +++---
 sys/arch/evbppc/conf/EV64260           |  4 ++--
 sys/arch/evbppc/conf/OPENBLOCKS266_OPT |  4 ++--
 sys/arch/evbppc/conf/PMPPC             |  4 ++--
 sys/arch/hp300/conf/GENERIC            |  6 +++---
 sys/arch/hpcarm/conf/NETBOOKPRO        |  6 +++---
 sys/arch/hpcarm/conf/WZERO3            |  6 +++---
 sys/arch/hpcmips/conf/GENERIC          |  6 +++---
 sys/arch/hpcmips/conf/TX3922           |  4 ++--
 sys/arch/hpcmips/conf/VR41XX           |  6 +++---
 sys/arch/hppa/conf/GENERIC             |  6 +++---
 sys/arch/i386/conf/ALL                 |  9 ++++-----
 sys/arch/i386/conf/GENERIC             |  9 ++++-----
 sys/arch/i386/conf/GENERIC_TINY        |  7 +++----
 sys/arch/i386/conf/INSTALL_FLOPPY      |  7 +++----
 sys/arch/i386/conf/INSTALL_TINY        |  7 +++----
 sys/arch/i386/conf/XEN3_DOM0           |  4 ++--
 sys/arch/ibmnws/conf/GENERIC           |  4 ++--
 sys/arch/iyonix/conf/GENERIC           |  6 +++---
 sys/arch/landisk/conf/GENERIC          |  6 +++---
 sys/arch/macppc/conf/GENERIC           |  6 +++---
 sys/arch/macppc/conf/GENERIC_601       |  6 +++---
 sys/arch/mmeye/conf/MMEYE_WLF          |  6 +++---
 sys/arch/netwinder/conf/GENERIC        |  4 ++--
 sys/arch/ofppc/conf/GENERIC            |  6 +++---
 sys/arch/playstation2/conf/DEBUG       |  4 ++--
 sys/arch/pmax/conf/GENERIC             |  6 +++---
 sys/arch/pmax/conf/GENERIC64           |  6 +++---
 sys/arch/pmax/conf/INSTALL             |  4 ++--
 sys/arch/pmax/conf/INSTALL64           |  4 ++--
 sys/arch/prep/conf/GENERIC             |  9 ++++-----
 sys/arch/sandpoint/conf/ENCPP1         |  6 +++---
 sys/arch/sgimips/conf/GENERIC32_IP2x   |  6 +++---
 sys/arch/sgimips/conf/GENERIC32_IP3x   |  6 +++---
 sys/arch/shark/conf/GENERIC            |  6 +++---
 sys/arch/shark/conf/INSTALL            |  4 ++--
 sys/arch/sparc/conf/INSTALL            |  4 ++--
 sys/arch/sparc/conf/KRUPS              |  6 +++---
 sys/arch/sparc/conf/MRCOFFEE           |  6 +++---
 sys/arch/sparc/conf/TADPOLE3GX         |  4 ++--
 sys/arch/sparc64/conf/GENERIC          |  6 +++---
 sys/arch/sparc64/conf/NONPLUS64        |  6 +++---
 sys/arch/usermode/conf/GENERIC.common  |  6 +++---
 sys/arch/vax/conf/GENERIC              |  6 +++---
 sys/arch/x68k/conf/GENERIC             |  6 +++---
 sys/arch/x68k/conf/INSTALL             |  6 +++---
 sys/arch/zaurus/conf/GENERIC           |  4 ++--
 sys/arch/zaurus/conf/INSTALL           |  4 ++--
 102 files changed, 267 insertions(+), 275 deletions(-)

diffs (truncated from 2346 to 300 lines):

diff -r edaa82d8926a -r 625429410187 sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX   Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX   Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: EB7500ATX,v 1.60 2016/12/10 23:03:22 christos Exp $
+#      $NetBSD: EB7500ATX,v 1.61 2016/12/13 20:42:15 christos Exp $
 #
 #      EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "EB7500ATX-$Revision: 1.60 $"
+#ident         "EB7500ATX-$Revision: 1.61 $"
 
 # estimated number of users
 maxusers       32
@@ -222,7 +222,7 @@
 vidcaudio0     at vidc?
 audio*         at vidcaudio0
 
-spkr0  at audio0               # PC speaker (synthesized)
+spkr*  at audio?               # PC speaker (synthesized)
 
 rsbus0 at mainbus?
 
diff -r edaa82d8926a -r 625429410187 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.119 2016/12/10 23:03:22 christos Exp $
+#      $NetBSD: GENERIC,v 1.120 2016/12/13 20:42:15 christos Exp $
 #
 #      GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.119 $"
+#ident         "GENERIC-$Revision: 1.120 $"
 
 # estimated number of users
 maxusers       32
@@ -248,7 +248,7 @@
 vidcaudio0     at vidc?
 audio*         at vidcaudio0
 
-spkr0  at audio0               # PC speaker (synthesized)
+spkr*  at audio?                       # PC speaker (synthesized)
 
 # Podule bus device
 podulebus0     at root
diff -r edaa82d8926a -r 625429410187 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL     Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/acorn32/conf/INSTALL     Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.75 2016/12/10 23:03:22 christos Exp $
+#      $NetBSD: INSTALL,v 1.76 2016/12/13 20:42:15 christos Exp $
 #
 #      INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "INSTALL-$Revision: 1.75 $"
+#ident         "INSTALL-$Revision: 1.76 $"
 
 # estimated number of users
 maxusers       32
@@ -240,7 +240,7 @@
 vidcaudio0     at vidc?
 audio*         at vidcaudio0
 
-spkr0  at audio0               # PC speaker (synthesized)
+spkr*  at audio?                       # PC speaker (synthesized)
 
 # Podule bus device
 podulebus0     at root
diff -r edaa82d8926a -r 625429410187 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS       Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS       Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: LOWMEM_WSCONS,v 1.69 2016/12/10 23:03:22 christos Exp $
+#      $NetBSD: LOWMEM_WSCONS,v 1.70 2016/12/13 20:42:15 christos Exp $
 #
 #      LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -218,7 +218,7 @@
 vidcaudio0     at vidc?
 audio*         at vidcaudio0
 
-spkr0  at audio0               # PC speaker (synthesized)
+spkr*  at audio?                       # PC speaker (synthesized)
 
 # Podule bus device
 #podulebus0    at root
diff -r edaa82d8926a -r 625429410187 sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC  Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/acorn32/conf/NC  Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NC,v 1.68 2016/12/10 23:03:22 christos Exp $
+#      $NetBSD: NC,v 1.69 2016/12/13 20:42:15 christos Exp $
 #
 #      NC - with wscons
 #
@@ -210,7 +210,7 @@
 vidcaudio0     at vidc?
 audio*         at vidcaudio0
 
-spkr0  at audio0               # PC speaker (synthesized)
+spkr*  at audio?               # PC speaker (synthesized)
 
 # Podule bus device
 podulebus0     at root
diff -r edaa82d8926a -r 625429410187 sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/algor/conf/P5064 Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P5064,v 1.83 2015/08/21 01:52:07 uebayasi Exp $
+#      $NetBSD: P5064,v 1.84 2016/12/13 20:42:15 christos Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P5064-$Revision: 1.83 $"
+#ident                 "P5064-$Revision: 1.84 $"
 
 maxusers 32
 
@@ -217,7 +217,7 @@
 #pms*  at      pckbc?                          # PS/2-style mouse (aux port)
 #attimer*      at      isa?                    # AT Timer
 #pcppi*        at      isa?                            # PC prog. periph. interface
-#spkr0 at      pcppi?                          # IBM BASIC emulation
+#spkr* at      pcppi?                          # IBM BASIC emulation
 #isabeep0 at   pcppi?                          # "keyboard" beep
 #midi* at      pcppi?
 com*   at      isa? port 0x3f8 irq 4           # standard serial ports
@@ -244,6 +244,7 @@
 #wss*  at      isa? port 0x530 irq 9 drq 0     # Windows Sound System
 #wss*  at      isapnp?
 #audio*        at      wss?
+#spkr* at      audio?                          # PC speaker (synthesized)
 #midi* at      wss?
 #sb*   at      isa? port 0x220 irq 5 drq 1     # SoundBlaster
 #sb*   at      isapnp?
diff -r edaa82d8926a -r 625429410187 sys/arch/algor/conf/P6032
--- a/sys/arch/algor/conf/P6032 Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/algor/conf/P6032 Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P6032,v 1.74 2015/08/21 01:52:07 uebayasi Exp $
+#      $NetBSD: P6032,v 1.75 2016/12/13 20:42:15 christos Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P6032-$Revision: 1.74 $"
+#ident                 "P6032-$Revision: 1.75 $"
 
 maxusers 32
 
@@ -222,7 +222,7 @@
 #pms*  at      pckbc?                          # PS/2-style mouse (aux port)
 #attimer*      at      isa?                    # AT Timer
 #pcppi*        at      isa?                            # PC prog. periph. interface
-#spkr0 at      pcppi?                          # IBM BASIC emulation
+#spkr* at      pcppi?                          # IBM BASIC emulation
 #isabeep0 at   pcppi?                          # "keyboard" beep
 #midi* at      pcppi?
 com*   at      isa? port 0x3f8 irq 4           # standard serial ports
@@ -249,6 +249,7 @@
 #wss*  at      isa? port 0x530 irq 9 drq 0     # Windows Sound System
 #wss*  at      isapnp?
 #audio*        at      wss?
+#spkr* at      audio?                          # PC speaker (synthesized)
 #midi* at      wss?
 #sb*   at      isa? port 0x220 irq 5 drq 1     # SoundBlaster
 #sb*   at      isapnp?
diff -r edaa82d8926a -r 625429410187 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.374 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.375 2016/12/13 20:42:16 christos Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "GENERIC-$Revision: 1.374 $"
+ident          "GENERIC-$Revision: 1.375 $"
 
 maxusers 32
 
@@ -440,7 +440,7 @@
 pms*   at      pckbc?                          # PS/2-style mouse (aux port)
 attimer* at    isa?                            # AT Timer
 pcppi* at      isa?                            # PC prog. periph. interface
-spkr0  at      pcppi?                          # IBM BASIC emulation
+spkr*  at      pcppi?                          # IBM BASIC emulation
 isabeep0 at    pcppi?                          # "keyboard" beep
 com*   at      isa? port 0x3f8 irq 4           # standard serial ports
 com*   at      isa? port 0x2f8 irq 3
@@ -709,7 +709,7 @@
 midi*  at pcppi?
 midi*  at sb?
 
-#spkr0 at audio0               # PC speaker (synthesized)
+spkr*  at audio?               # PC speaker (synthesized)
 
 # Workstation Console attachments
 wsdisplay0     at      wsemuldisplaydev? console 1
diff -r edaa82d8926a -r 625429410187 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/amd64/conf/ALL   Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.43 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: ALL,v 1.44 2016/12/13 20:42:16 christos Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ALL-$Revision: 1.43 $"
+#ident                 "ALL-$Revision: 1.44 $"
 
 maxusers       64              # estimated number of users
 
@@ -1375,9 +1375,8 @@
 midi*  at pcppi?               # MIDI interface to the PC speaker
 
 # The spkr driver provides a simple tone interface to the built in speaker.
-spkr0  at pcppi?               # PC speaker
-
-#spkr0 at audio0               # PC speaker (synthesized)
+spkr*  at pcppi?               # PC speaker
+spkr*  at audio?               # PC speaker (synthesized)
 
 
 # FM-Radio devices
diff -r edaa82d8926a -r 625429410187 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.446 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.447 2016/12/13 20:42:16 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.446 $"
+#ident                 "GENERIC-$Revision: 1.447 $"
 
 maxusers       64              # estimated number of users
 
@@ -1109,9 +1109,8 @@
 audio* at audiobus?
 
 # The spkr driver provides a simple tone interface to the built in speaker.
-spkr0  at pcppi?               # PC speaker
-
-#spkr0 at audio0               # PC speaker (synthesized)
+spkr*  at pcppi?               # PC speaker
+spkr*  at audio?               # PC speaker (synthesized)
 
 # MPU 401 UARTs
 #mpu*  at isa? port 0x330 irq 9        # MPU401 or compatible card
diff -r edaa82d8926a -r 625429410187 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Tue Dec 13 20:20:34 2016 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Tue Dec 13 20:42:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.122 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.123 2016/12/13 20:42:16 christos Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -747,7 +747,7 @@
 # Audio support
 audio* at audiobus?
 
-spkr0  at audio0               # PC speaker (synthesized)
+spkr*  at audio?               # PC speaker (synthesized)
 
 # MPU 401 UARTs



Home | Main Index | Thread Index | Old Index