[src/trunk]: src/sys/dev Revert previous.

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

details:   https://anonhg.NetBSD.org/src/rev/69daab4391fe
branches:  trunk
changeset: 333393:69daab4391fe
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Nov 01 07:54:18 2014 +0000

description:
Revert previous.

Not only audio_attach_mi() but also audioprint() have to be separated.
midi.c has the same problem, and a little more complicated.  These will be
revisited later.

diffstat:

 sys/dev/audio.c    |  25 +++++++++++++++++++++++--
 sys/dev/audio_if.h |  28 +++-------------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diffs (90 lines):

diff -r a8b76b4dcfd3 -r 69daab4391fe sys/dev/audio.c
--- a/sys/dev/audio.c   Sat Nov 01 07:26:11 2014 +0000
+++ b/sys/dev/audio.c   Sat Nov 01 07:54:18 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.264 2014/11/01 05:56:36 uebayasi Exp $     */
+/*     $NetBSD: audio.c,v 1.265 2014/11/01 07:54:18 uebayasi Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.264 2014/11/01 05:56:36 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.265 2014/11/01 07:54:18 uebayasi Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -829,6 +829,27 @@
        }
 }
 
+/*
+ * Called from hardware driver.  This is where the MI audio driver gets
+ * probed/attached to the hardware driver.
+ */
+device_t
+audio_attach_mi(const struct audio_hw_if *ahwp, void *hdlp, device_t dev)
+{
+       struct audio_attach_args arg;
+
+#ifdef DIAGNOSTIC
+       if (ahwp == NULL) {
+               aprint_error("audio_attach_mi: NULL\n");
+               return 0;
+       }
+#endif
+       arg.type = AUDIODEV_TYPE_AUDIO;
+       arg.hwif = ahwp;
+       arg.hdl = hdlp;
+       return config_found(dev, &arg, audioprint);
+}
+
 #ifdef AUDIO_DEBUG
 void   audio_printsc(struct audio_softc *);
 void   audio_print_params(const char *, struct audio_params *);
diff -r a8b76b4dcfd3 -r 69daab4391fe sys/dev/audio_if.h
--- a/sys/dev/audio_if.h        Sat Nov 01 07:26:11 2014 +0000
+++ b/sys/dev/audio_if.h        Sat Nov 01 07:54:18 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio_if.h,v 1.68 2014/11/01 05:56:36 uebayasi Exp $   */
+/*     $NetBSD: audio_if.h,v 1.69 2014/11/01 07:54:18 uebayasi Exp $   */
 
 /*
  * Copyright (c) 1994 Havard Eidnes.
@@ -254,32 +254,10 @@
 #define AUDIODEV_TYPE_MPU      3
 #define AUDIODEV_TYPE_AUX      4
 
+/* Attach the MI driver(s) to the MD driver. */
+device_t audio_attach_mi(const struct audio_hw_if *, void *, device_t);
 int    audioprint(void *, const char *);
 
-/*
- * Called from hardware driver.  This is where the MI audio driver gets
- * probed/attached to the hardware driver.
- *
- * This is provided as inline so that hardware drivers don't need to depend
- * on audio.c.
- */
-static inline device_t
-audio_attach_mi(const struct audio_hw_if *ahwp, void *hdlp, device_t dev)
-{
-       struct audio_attach_args arg;
-
-#ifdef DIAGNOSTIC
-       if (ahwp == NULL) {
-               aprint_error("audio_attach_mi: NULL\n");
-               return 0;
-       }
-#endif
-       arg.type = AUDIODEV_TYPE_AUDIO;
-       arg.hwif = ahwp;
-       arg.hdl = hdlp;
-       return config_found(dev, &arg, audioprint);
-}
-
 /* Device identity flags */
 #define SOUND_DEVICE           0
 #define AUDIO_DEVICE           0x80