[src/trunk]: src/sys/dev Remove unused code - it will reappear in a new device.

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

details:   https://anonhg.NetBSD.org/src/rev/55a97510cf07
branches:  trunk
changeset: 354301:55a97510cf07
user:      nat <nat%NetBSD.org@localhost>
date:      Sun Jun 11 03:25:02 2017 +0000

description:
Remove unused code - it will reappear in a new device.

Ok pgoyette@.

diffstat:

 sys/dev/spkr_audio.c |  79 +--------------------------------------------------
 1 files changed, 2 insertions(+), 77 deletions(-)

diffs (139 lines):

diff -r 56259f4b4f37 -r 55a97510cf07 sys/dev/spkr_audio.c
--- a/sys/dev/spkr_audio.c      Sun Jun 11 01:15:11 2017 +0000
+++ b/sys/dev/spkr_audio.c      Sun Jun 11 03:25:02 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spkr_audio.c,v 1.3 2017/01/06 09:32:08 pgoyette Exp $  */
+/*     $NetBSD: spkr_audio.c,v 1.4 2017/06/11 03:25:02 nat Exp $       */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.3 2017/01/06 09:32:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.4 2017/06/11 03:25:02 nat Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,22 +39,10 @@
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
-#include <sys/condvar.h>
-#include <sys/mutex.h>
-#include <sys/kthread.h>
 #include <sys/sysctl.h>
 #include <dev/audio_if.h>
 #include <dev/audiovar.h>
 
-struct vbell_args {
-       u_int pitch;
-       u_int period;
-       u_int volume;
-       bool dying;
-};
-
-static void bell_thread(void *) __dead;
-
 #include <dev/audiobellvar.h>
 
 #include <dev/spkrvar.h>
@@ -66,11 +54,7 @@
 
 struct spkr_audio_softc {
        struct spkr_softc sc_spkr;
-       lwp_t           *sc_bellthread;
-       kmutex_t        sc_bellock;
-       kcondvar_t      sc_bellcv;
        device_t                sc_audiodev;
-       struct vbell_args sc_bell_args;
 };
 
 CFATTACH_DECL_NEW(spkr_audio, sizeof(struct spkr_audio_softc),
@@ -99,23 +83,6 @@
                audiobell(sc->sc_audiodev, 0, ticks * (1000 / hz), 80, 0);
 }
 
-#ifdef notyet
-static void
-spkr_audio_play(device_t self, u_int pitch, u_int period, u_int volume)
-{
-       struct spkr_audio_softc *sc = device_private(self);
-
-       mutex_enter(&sc->sc_bellock);
-       sc->sc_bell_args.dying = false;
-       sc->sc_bell_args.pitch = pitch;
-       sc->sc_bell_args.period = period;
-       sc->sc_bell_args.volume = volume;
-
-       cv_broadcast(&sc->sc_bellcv);
-       mutex_exit(&sc->sc_bellock);
-}
-#endif
-
 static int
 spkr_audio_probe(device_t parent, cfdata_t cf, void *aux)
 {
@@ -135,11 +102,6 @@
        
        if (!pmf_device_register(self, NULL, NULL))
                aprint_error_dev(self, "couldn't establish power handler\n"); 
-       mutex_init(&sc->sc_bellock, MUTEX_DEFAULT, IPL_SCHED);
-       cv_init(&sc->sc_bellcv, "bellcv");
-
-       kthread_create(PRI_BIO, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
-           bell_thread, sc, &sc->sc_bellthread, "%s", device_xname(self));
 
        spkr_attach(self, spkr_audio_tone, spkr_audio_rest);
 }
@@ -147,7 +109,6 @@
 static int
 spkr_audio_detach(device_t self, int flags)
 {
-       struct spkr_audio_softc *sc = device_private(self);
        int error;
 
        if ((error = spkr_detach(self, flags)) != 0)
@@ -155,41 +116,5 @@
 
        pmf_device_deregister(self);
 
-       mutex_enter(&sc->sc_bellock);
-       sc->sc_bell_args.dying = true;
-
-       cv_broadcast(&sc->sc_bellcv);
-       mutex_exit(&sc->sc_bellock);
-
-       kthread_join(sc->sc_bellthread);
-       cv_destroy(&sc->sc_bellcv);
-       mutex_destroy(&sc->sc_bellock);
-
        return 0;
 }
-
-static void
-bell_thread(void *arg)
-{
-       struct spkr_audio_softc *sc = arg;
-       struct vbell_args *vb = &sc->sc_bell_args;
-       u_int bpitch;
-       u_int bperiod;
-       u_int bvolume;
-       
-       for (;;) {
-               mutex_enter(&sc->sc_bellock);
-               cv_wait_sig(&sc->sc_bellcv, &sc->sc_bellock);
-               
-               if (vb->dying == true) {
-                       mutex_exit(&sc->sc_bellock);
-                       kthread_exit(0);
-               }
-               
-               bpitch = vb->pitch;
-               bperiod = vb->period;
-               bvolume = vb->volume;
-               mutex_exit(&sc->sc_bellock);
-               audiobell(sc->sc_audiodev, bpitch, bperiod, bvolume, 0);
-       }
-}