Module Name: src
Committed By: martin
Date: Wed Jul 26 07:34:37 UTC 2017
Modified Files:
src/sys/arch/dreamcast/conf [netbsd-8]: G1IDE GENERIC
src/sys/arch/dreamcast/dev/g2 [netbsd-8]: aica.c
Log Message:
Pull up following revision(s) (requested by nat in ticket #160):
sys/arch/dreamcast/conf/G1IDE: revision 1.2
sys/arch/dreamcast/conf/GENERIC: revision 1.126
sys/arch/dreamcast/dev/g2/aica.c: revision 1.23
Dreamcast audio only supports playback so set it in the props.
This makes dreamcast audio work again.
Tested by Bjorn Johannesson.
cvs: ----------------------------------------------------------------------
Use the correct attachment for dreamcast audio.
Found and tested by Bjorn Johannesson on port-dreamcast.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.12.1 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.125 -r1.125.8.1 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.22 -r1.22.42.1 src/sys/arch/dreamcast/dev/g2/aica.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/dreamcast/conf/G1IDE
diff -u src/sys/arch/dreamcast/conf/G1IDE:1.1 src/sys/arch/dreamcast/conf/G1IDE:1.1.12.1
--- src/sys/arch/dreamcast/conf/G1IDE:1.1 Thu Dec 29 11:49:05 2016
+++ src/sys/arch/dreamcast/conf/G1IDE Wed Jul 26 07:34:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: G1IDE,v 1.1 2016/12/29 11:49:05 tsutsui Exp $
+# $NetBSD: G1IDE,v 1.1.12.1 2017/07/26 07:34:37 martin Exp $
include "arch/dreamcast/conf/std.dreamcast"
@@ -190,7 +190,7 @@ rlphy* at mii? phy ?
mbe* at g2bus? # SEGA LAN Adapter
#aica* at g2bus? # AICA Sound Processing Unit
-#audio* at aica?
+#audio* at audiobus?
#spkr* at audio? # PC speaker (synthesized)
Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.125 src/sys/arch/dreamcast/conf/GENERIC:1.125.8.1
--- src/sys/arch/dreamcast/conf/GENERIC:1.125 Tue Dec 13 20:42:17 2016
+++ src/sys/arch/dreamcast/conf/GENERIC Wed Jul 26 07:34:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2016/12/13 20:42:17 christos Exp $
+# $NetBSD: GENERIC,v 1.125.8.1 2017/07/26 07:34:37 martin Exp $
#
# GENERIC machine description file
#
@@ -191,7 +191,7 @@ rlphy* at mii? phy ?
mbe* at g2bus? # SEGA LAN Adapter
aica* at g2bus? # AICA Sound Processing Unit
-audio* at aica?
+audio* at audiobus?
spkr* at audio? # PC speaker (synthesized)
Index: src/sys/arch/dreamcast/dev/g2/aica.c
diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.22 src/sys/arch/dreamcast/dev/g2/aica.c:1.22.42.1
--- src/sys/arch/dreamcast/dev/g2/aica.c:1.22 Wed Nov 23 23:07:29 2011
+++ src/sys/arch/dreamcast/dev/g2/aica.c Wed Jul 26 07:34:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aica.c,v 1.22 2011/11/23 23:07:29 jmcneill Exp $ */
+/* $NetBSD: aica.c,v 1.22.42.1 2017/07/26 07:34:37 martin Exp $ */
/*
* Copyright (c) 2003 SHIMIZU Ryo <[email protected]>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.22 2011/11/23 23:07:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.22.42.1 2017/07/26 07:34:37 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -774,7 +774,7 @@ int
aica_get_props(void *addr)
{
- return 0;
+ return AUDIO_PROP_PLAYBACK;
}
void
