Tue Jul 25 23:20:57 2017 UTC ()
Use the correct attachment for dreamcast audio.

Found and tested by Bjorn Johannesson on port-dreamcast.


(nat)
diff -r1.1 -r1.2 src/sys/arch/dreamcast/conf/G1IDE
diff -r1.125 -r1.126 src/sys/arch/dreamcast/conf/GENERIC

cvs diff -r1.1 -r1.2 src/sys/arch/dreamcast/conf/G1IDE (expand / switch to unified diff)

--- src/sys/arch/dreamcast/conf/G1IDE 2016/12/29 11:49:05 1.1
+++ src/sys/arch/dreamcast/conf/G1IDE 2017/07/25 23:20:57 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: G1IDE,v 1.1 2016/12/29 11:49:05 tsutsui Exp $ 1# $NetBSD: G1IDE,v 1.2 2017/07/25 23:20:57 nat Exp $
2 2
3include "arch/dreamcast/conf/std.dreamcast" 3include "arch/dreamcast/conf/std.dreamcast"
4 4
5options INCLUDE_CONFIG_FILE # embed config file in kernel binary 5options INCLUDE_CONFIG_FILE # embed config file in kernel binary
6 6
7maxusers 16 # estimated number of users 7maxusers 16 # estimated number of users
8 8
9# Standard system options 9# Standard system options
10#options INSECURE # disable kernel security levels 10#options INSECURE # disable kernel security levels
11 11
12#options RTC_OFFSET=-540 12#options RTC_OFFSET=-540
13options HZ=100 # clock interrupt generates every 1/HZ sec 13options HZ=100 # clock interrupt generates every 1/HZ sec
14options NTP # NTP phase/frequency locked loop 14options NTP # NTP phase/frequency locked loop
@@ -180,27 +180,27 @@ wd* at atabus? drive ? flags 0x0000 @@ -180,27 +180,27 @@ wd* at atabus? drive ? flags 0x0000
180atapibus* at atabus? 180atapibus* at atabus?
181gdrom0 at atapibus? 181gdrom0 at atapibus?
182 182
183g2bus0 at shb? 183g2bus0 at shb?
184g2rtc0 at g2bus? # time-of-day clock 184g2rtc0 at g2bus? # time-of-day clock
185gapspci* at g2bus? # GAPS PCI bridge 185gapspci* at g2bus? # GAPS PCI bridge
186pci* at gapspci? 186pci* at gapspci?
187rtk* at pci? dev ? function ? # SEGA Broadband Adapter 187rtk* at pci? dev ? function ? # SEGA Broadband Adapter
188rlphy* at mii? phy ? 188rlphy* at mii? phy ?
189 189
190mbe* at g2bus? # SEGA LAN Adapter 190mbe* at g2bus? # SEGA LAN Adapter
191 191
192#aica* at g2bus? # AICA Sound Processing Unit 192#aica* at g2bus? # AICA Sound Processing Unit
193#audio* at aica? 193#audio* at audiobus?
194 194
195#spkr* at audio? # PC speaker (synthesized) 195#spkr* at audio? # PC speaker (synthesized)
196 196
197#pseudo-device cgd # cryptographic disk devices 197#pseudo-device cgd # cryptographic disk devices
198pseudo-device md # memory disk device (ramdisk) 198pseudo-device md # memory disk device (ramdisk)
199pseudo-device vnd # disk-like interface to files 199pseudo-device vnd # disk-like interface to files
200#options VND_COMPRESSION # compressed vnd(4) 200#options VND_COMPRESSION # compressed vnd(4)
201 201
202# network pseudo-devices 202# network pseudo-devices
203pseudo-device bpfilter # Berkeley packet filter 203pseudo-device bpfilter # Berkeley packet filter
204#pseudo-device carp # Common Address Redundancy Protocol 204#pseudo-device carp # Common Address Redundancy Protocol
205#pseudo-device ipfilter # IP filter (firewall) and NAT 205#pseudo-device ipfilter # IP filter (firewall) and NAT
206pseudo-device loop # network loopback 206pseudo-device loop # network loopback

cvs diff -r1.125 -r1.126 src/sys/arch/dreamcast/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/dreamcast/conf/GENERIC 2016/12/13 20:42:17 1.125
+++ src/sys/arch/dreamcast/conf/GENERIC 2017/07/25 23:20:57 1.126
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: GENERIC,v 1.125 2016/12/13 20:42:17 christos Exp $ 1# $NetBSD: GENERIC,v 1.126 2017/07/25 23:20:57 nat Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4#  4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
@@ -181,27 +181,27 @@ mlcd* at maple? port ? subunit ? @@ -181,27 +181,27 @@ mlcd* at maple? port ? subunit ?
181 181
182gdrom0 at shb? 182gdrom0 at shb?
183 183
184g2bus0 at shb? 184g2bus0 at shb?
185g2rtc0 at g2bus? # time-of-day clock 185g2rtc0 at g2bus? # time-of-day clock
186gapspci* at g2bus? # GAPS PCI bridge 186gapspci* at g2bus? # GAPS PCI bridge
187pci* at gapspci? 187pci* at gapspci?
188rtk* at pci? dev ? function ? # SEGA Broadband Adapter 188rtk* at pci? dev ? function ? # SEGA Broadband Adapter
189rlphy* at mii? phy ? 189rlphy* at mii? phy ?
190 190
191mbe* at g2bus? # SEGA LAN Adapter 191mbe* at g2bus? # SEGA LAN Adapter
192 192
193aica* at g2bus? # AICA Sound Processing Unit 193aica* at g2bus? # AICA Sound Processing Unit
194audio* at aica? 194audio* at audiobus?
195 195
196spkr* at audio? # PC speaker (synthesized) 196spkr* at audio? # PC speaker (synthesized)
197 197
198#pseudo-device cgd # cryptographic disk devices 198#pseudo-device cgd # cryptographic disk devices
199pseudo-device md # memory disk device (ramdisk) 199pseudo-device md # memory disk device (ramdisk)
200pseudo-device vnd # disk-like interface to files 200pseudo-device vnd # disk-like interface to files
201#options VND_COMPRESSION # compressed vnd(4) 201#options VND_COMPRESSION # compressed vnd(4)
202 202
203# network pseudo-devices 203# network pseudo-devices
204pseudo-device bpfilter # Berkeley packet filter 204pseudo-device bpfilter # Berkeley packet filter
205#pseudo-device carp # Common Address Redundancy Protocol 205#pseudo-device carp # Common Address Redundancy Protocol
206#pseudo-device ipfilter # IP filter (firewall) and NAT 206#pseudo-device ipfilter # IP filter (firewall) and NAT
207pseudo-device loop # network loopback 207pseudo-device loop # network loopback