[src/trunk]: src/sys/dev remove VAUDIOSPEAKER, needs to be done differently.

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

details:   https://anonhg.NetBSD.org/src/rev/188360a41629
branches:  trunk
changeset: 819579:188360a41629
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 10 22:36:28 2016 +0000

description:
remove VAUDIOSPEAKER, needs to be done differently.

diffstat:

 sys/dev/audio.c        |  10 ++--------
 sys/dev/wscons/wskbd.c |  25 +++----------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diffs (119 lines):

diff -r c76d0452a9bf -r 188360a41629 sys/dev/audio.c
--- a/sys/dev/audio.c   Sat Dec 10 22:09:49 2016 +0000
+++ b/sys/dev/audio.c   Sat Dec 10 22:36:28 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.274 2016/12/10 17:31:33 martin Exp $       */
+/*     $NetBSD: audio.c,v 1.275 2016/12/10 22:37:12 christos Exp $     */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.274 2016/12/10 17:31:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.275 2016/12/10 22:37:12 christos Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -179,9 +179,6 @@
 #include <dev/audiovar.h>
 #include <dev/auconv.h>
 #include <dev/auvolconv.h>
-#ifdef VAUDIOSPEAKER
-#include <dev/spkrvar.h>
-#endif
 
 #include <machine/endian.h>
 
@@ -840,9 +837,6 @@
            audio_rec_thread, sc, &sc->sc_recthread, "audiorec");
        kthread_create(PRI_NONE, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
            audio_play_thread, sc, &sc->sc_playthread, "audiomix");
-#ifdef VAUDIOSPEAKER
-       speakerattach_mi(self);
-#endif
 }
 
 int
diff -r c76d0452a9bf -r 188360a41629 sys/dev/wscons/wskbd.c
--- a/sys/dev/wscons/wskbd.c    Sat Dec 10 22:09:49 2016 +0000
+++ b/sys/dev/wscons/wskbd.c    Sat Dec 10 22:36:28 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.137 2016/12/08 11:31:08 nat Exp $ */
+/* $NetBSD: wskbd.c,v 1.138 2016/12/10 22:36:28 christos Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.137 2016/12/08 11:31:08 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.138 2016/12/10 22:36:28 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -156,10 +156,6 @@
 
 #include <dev/wscons/wsmuxvar.h>
 
-#ifdef VAUDIOSPEAKER
-#include <dev/spkrvar.h>
-#endif
-
 struct wskbd_internal {
        const struct wskbd_mapdata *t_keymap;
 
@@ -190,7 +186,7 @@
        int     sc_ledstate;
 
        int     sc_isconsole;
-       
+
        struct wskbd_bell_data sc_bell_data;
        struct wskbd_keyrepeat_data sc_keyrepeat_data;
 #ifdef WSDISPLAY_SCROLLSUPPORT
@@ -1093,27 +1089,16 @@
        case WSKBDIO_BELL:
                if ((flag & FWRITE) == 0)
                        return (EACCES);
-#ifndef VAUDIOSPEAKER
                return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
                    WSKBDIO_COMPLEXBELL, (void *)&sc->sc_bell_data, flag, l));
-#else
-               wskbd_cnbell(0, sc->sc_bell_data.pitch, sc->sc_bell_data.period,
-                   sc->sc_bell_data.volume);
-               return 0;
-#endif
 
        case WSKBDIO_COMPLEXBELL:
                if ((flag & FWRITE) == 0)
                        return (EACCES);
                ubdp = (struct wskbd_bell_data *)data;
                SETBELL(ubdp, ubdp, &sc->sc_bell_data);
-#ifndef VAUDIOSPEAKER
                return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
                    WSKBDIO_COMPLEXBELL, (void *)ubdp, flag, l));
-#else
-               wskbd_cnbell(0, ubdp->pitch, ubdp->period, ubdp->volume);
-               return 0;
-#endif
 
        case WSKBDIO_SETBELL:
                if ((flag & FWRITE) == 0)
@@ -1481,14 +1466,10 @@
        if (!wskbd_console_initted)
                return;
 
-#ifndef VAUDIOSPEAKER
        if (wskbd_console_data.t_consops->bell != NULL)
                (*wskbd_console_data.t_consops->bell)
                    (wskbd_console_data.t_consaccesscookie, pitch, period,
                        volume);
-#else
-       speaker_play(pitch, period, volume);
-#endif
 }
 
 static inline void