[src/netbsd-8]: src/sys/arch/dreamcast Pull up following revision(s) (request...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f8511885073f
branches:  netbsd-8
changeset: 850886:f8511885073f
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jul 26 07:34:37 2017 +0000

description:
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.

diffstat:

 sys/arch/dreamcast/conf/G1IDE    |  4 ++--
 sys/arch/dreamcast/conf/GENERIC  |  4 ++--
 sys/arch/dreamcast/dev/g2/aica.c |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 6e6cee7cfe8a -r f8511885073f sys/arch/dreamcast/conf/G1IDE
--- a/sys/arch/dreamcast/conf/G1IDE     Wed Jul 26 07:32:06 2017 +0000
+++ b/sys/arch/dreamcast/conf/G1IDE     Wed Jul 26 07:34:37 2017 +0000
@@ -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 @@
 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)
 
diff -r 6e6cee7cfe8a -r f8511885073f sys/arch/dreamcast/conf/GENERIC
--- a/sys/arch/dreamcast/conf/GENERIC   Wed Jul 26 07:32:06 2017 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC   Wed Jul 26 07:34:37 2017 +0000
@@ -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 @@
 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)
 
diff -r 6e6cee7cfe8a -r f8511885073f sys/arch/dreamcast/dev/g2/aica.c
--- a/sys/arch/dreamcast/dev/g2/aica.c  Wed Jul 26 07:32:06 2017 +0000
+++ b/sys/arch/dreamcast/dev/g2/aica.c  Wed Jul 26 07:34:37 2017 +0000
@@ -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 <ryo%misakimix.org@localhost>
@@ -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 @@
 aica_get_props(void *addr)
 {
 
-       return 0;
+       return AUDIO_PROP_PLAYBACK;
 }
 
 void