diff options
| author | christos <christos@NetBSD.org> | 2016-12-15 04:36:07 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-12-15 04:36:07 +0000 |
| commit | 3e991f7cb3dff4bcf6901fb88511199bc5ab421c (patch) | |
| tree | 144aba806b844a7f8c0abd00cb9c3d5c98665851 /sys/dev | |
| parent | 948ed464723a1e960b0df5416d8f35de6c12d6e5 (diff) | |
name attachment after parent per existing convention.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/files.audio | 8 | ||||
| -rw-r--r-- | sys/dev/spkr_audio.c (renamed from sys/dev/spkr_synth.c) | 42 |
2 files changed, 25 insertions, 25 deletions
diff --git a/sys/dev/files.audio b/sys/dev/files.audio index 8d1f7789ae6..e14833ef03f 100644 --- a/sys/dev/files.audio +++ b/sys/dev/files.audio @@ -1,4 +1,4 @@ -# $NetBSD: files.audio,v 1.8 2016/12/13 20:20:34 christos Exp $ +# $NetBSD: files.audio,v 1.9 2016/12/15 04:36:07 christos Exp $ define audiobus { } define midibus { } @@ -17,7 +17,7 @@ device audio {}: audiodev, auconv, aurateconv attach audio at audiobus device midi: audio attach midi at midibus -attach spkr at audio with spkr_synth +attach spkr at audio with spkr_audio # console bell via audio device # @@ -25,11 +25,11 @@ define audiobell file dev/auconv.c auconv file dev/audio.c audio needs-flag -file dev/audiobell.c spkr_synth needs-flag +file dev/audiobell.c spkr_audio needs-flag file dev/aurateconv.c aurateconv needs-flag file dev/auvolconv.c auvolconv file dev/midi.c midi needs-flag file dev/midictl.c midisyn file dev/midisyn.c midisyn file dev/mulaw.c mulaw needs-flag -file dev/spkr_synth.c spkr_synth needs-flag +file dev/spkr_audio.c spkr_audio needs-flag diff --git a/sys/dev/spkr_synth.c b/sys/dev/spkr_audio.c index c19c55c1a67..996c7219d13 100644 --- a/sys/dev/spkr_synth.c +++ b/sys/dev/spkr_audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: spkr_synth.c,v 1.9 2016/12/14 22:30:42 christos Exp $ */ +/* $NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.9 2016/12/14 22:30:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,11 +61,11 @@ static void bell_thread(void *) __dead; #include <dev/spkrvar.h> #include <dev/spkrio.h> -static int spkr_synth_probe(device_t, cfdata_t, void *); -static void spkr_synth_attach(device_t, device_t, void *); -static int spkr_synth_detach(device_t, int); +static int spkr_audio_probe(device_t, cfdata_t, void *); +static void spkr_audio_attach(device_t, device_t, void *); +static int spkr_audio_detach(device_t, int); -struct spkr_synth_softc { +struct spkr_audio_softc { struct spkr_softc sc_spkr; lwp_t *sc_bellthread; kmutex_t sc_bellock; @@ -74,8 +74,8 @@ struct spkr_synth_softc { struct vbell_args sc_bell_args; }; -CFATTACH_DECL_NEW(spkr_synth, sizeof(struct spkr_synth_softc), - spkr_synth_probe, spkr_synth_attach, spkr_synth_detach, NULL); +CFATTACH_DECL_NEW(spkr_audio, sizeof(struct spkr_audio_softc), + spkr_audio_probe, spkr_audio_attach, spkr_audio_detach, NULL); MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "audio" */); @@ -86,9 +86,9 @@ spkr_modcmd(modcmd_t cmd, void *arg) } static void -spkr_synth_tone(device_t self, u_int xhz, u_int ticks) +spkr_audio_tone(device_t self, u_int xhz, u_int ticks) { - struct spkr_synth_softc *sc = device_private(self); + struct spkr_audio_softc *sc = device_private(self); #ifdef SPKRDEBUG aprint_debug_dev(self, "%s: %u %d\n", __func__, xhz, ticks); @@ -97,9 +97,9 @@ spkr_synth_tone(device_t self, u_int xhz, u_int ticks) } static void -spkr_synth_rest(device_t self, int ticks) +spkr_audio_rest(device_t self, int ticks) { - struct spkr_synth_softc *sc = device_private(self); + struct spkr_audio_softc *sc = device_private(self); #ifdef SPKRDEBUG aprint_debug_dev(self, "%s: %d\n", __func__, ticks); @@ -110,9 +110,9 @@ spkr_synth_rest(device_t self, int ticks) #ifdef notyet static void -spkr_synth_play(device_t self, u_int pitch, u_int period, u_int volume) +spkr_audio_play(device_t self, u_int pitch, u_int period, u_int volume) { - struct spkr_synth_softc *sc = device_private(self); + struct spkr_audio_softc *sc = device_private(self); mutex_enter(&sc->sc_bellock); sc->sc_bell_args.dying = false; @@ -126,16 +126,16 @@ spkr_synth_play(device_t self, u_int pitch, u_int period, u_int volume) #endif static int -spkr_synth_probe(device_t parent, cfdata_t cf, void *aux) +spkr_audio_probe(device_t parent, cfdata_t cf, void *aux) { return 1; } static void -spkr_synth_attach(device_t parent, device_t self, void *aux) +spkr_audio_attach(device_t parent, device_t self, void *aux) { - struct spkr_synth_softc *sc = device_private(self); + struct spkr_audio_softc *sc = device_private(self); aprint_naive("\n"); aprint_normal(": PC Speaker (synthesized)\n"); @@ -150,13 +150,13 @@ spkr_synth_attach(device_t parent, device_t self, void *aux) kthread_create(PRI_BIO, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL, bell_thread, sc, &sc->sc_bellthread, "%s", device_xname(self)); - spkr_attach(self, spkr_synth_tone, spkr_synth_rest); + spkr_attach(self, spkr_audio_tone, spkr_audio_rest); } static int -spkr_synth_detach(device_t self, int flags) +spkr_audio_detach(device_t self, int flags) { - struct spkr_synth_softc *sc = device_private(self); + struct spkr_audio_softc *sc = device_private(self); pmf_device_deregister(self); @@ -177,7 +177,7 @@ spkr_synth_detach(device_t self, int flags) static void bell_thread(void *arg) { - struct spkr_synth_softc *sc = arg; + struct spkr_audio_softc *sc = arg; struct vbell_args *vb = &sc->sc_bell_args; u_int bpitch; u_int bperiod; |
