diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:27:34 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:27:34 +0000 |
| commit | 378503af2e65497a3503301d51a2e96a9478ebf0 (patch) | |
| tree | ebcca77c9dac4fa1da09314757c7c7a63577cf4b | |
| parent | 9dd3156e546b29b1e6c3047578e91b1d098af171 (diff) | |
Notes
78 files changed, 54 insertions, 319 deletions
diff --git a/sys/dev/sound/clone.h b/sys/dev/sound/clone.h index 67aaf63b7585..54b26e31c8b4 100644 --- a/sys/dev/sound/clone.h +++ b/sys/dev/sound/clone.h @@ -99,7 +99,6 @@ struct snd_clone; #define SND_CLONE_DEVMASK SND_CLONE_ALLOC - void snd_timestamp(struct timespec *); struct snd_clone *snd_clone_create(int, int, int, uint32_t); diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c index e8a8199b5008..e8d7ac7cf62f 100644 --- a/sys/dev/sound/isa/ad1816.c +++ b/sys/dev/sound/isa/ad1816.c @@ -671,7 +671,6 @@ static device_method_t ad1816_methods[] = { DEVMETHOD(device_probe, ad1816_probe), DEVMETHOD(device_attach, ad1816_attach), DEVMETHOD(device_detach, ad1816_detach), - { 0, 0 } }; @@ -685,5 +684,3 @@ DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0); DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_ad1816, 1); - - diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h index d21bba9ba8de..ce906047d051 100644 --- a/sys/dev/sound/isa/ad1816.h +++ b/sys/dev/sound/isa/ad1816.h @@ -94,4 +94,3 @@ #define AD1816_MIXER_DEVICES \ (SOUND_MASK_VOLUME | SOUND_MASK_PCM | SOUND_MASK_SYNTH | \ SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_IGAIN) - diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c index c2f50a8a32bd..424e757a4b00 100644 --- a/sys/dev/sound/isa/ess.c +++ b/sys/dev/sound/isa/ess.c @@ -143,13 +143,11 @@ static int ess_stop(struct ess_chinfo *ch); static void ess_lock(struct ess_info *sc) { - sbc_lock(device_get_softc(sc->parent_dev)); } static void ess_unlock(struct ess_info *sc) { - sbc_unlock(device_get_softc(sc->parent_dev)); } @@ -468,7 +466,6 @@ ess_setupch(struct ess_info *sc, int ch, int dir, int spd, u_int32_t fmt, int le int unsign = (fmt == AFMT_U8 || fmt == AFMT_U16_LE)? 1 : 0; u_int8_t spdval, fmtval; - spdval = (sc->newspeed)? ess_calcspeed9(&spd) : ess_calcspeed8(&spd); len = -len; @@ -932,7 +929,6 @@ static device_method_t ess_methods[] = { DEVMETHOD(device_attach, ess_attach), DEVMETHOD(device_detach, ess_detach), DEVMETHOD(device_resume, ess_resume), - { 0, 0 } }; @@ -1004,7 +1000,6 @@ static device_method_t esscontrol_methods[] = { DEVMETHOD(device_probe, esscontrol_probe), DEVMETHOD(device_attach, esscontrol_attach), DEVMETHOD(device_detach, esscontrol_detach), - { 0, 0 } }; diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c index 302f2f180999..00f59b834f51 100644 --- a/sys/dev/sound/isa/gusc.c +++ b/sys/dev/sound/isa/gusc.c @@ -290,7 +290,6 @@ gusisa_probe(device_t dev) device_set_desc(dev, "Gravis UltraSound MAX"); return 0; } else { - /* * TODO: Support even older GUS cards. MIDI should work on * all models. diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index b79c4fc1c337..eacbbf85849c 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -767,7 +767,6 @@ mss_init(struct mss_info *mss, device_t dev) return 0; } - /* * main irq handler for the CS423x. The OPTi931 code is * a separate one. @@ -1073,7 +1072,6 @@ mss_trigger(struct mss_chinfo *ch, int go) return 0; } - /* * the opti931 seems to miss interrupts when working in full * duplex, so we try some heuristics to catch them. @@ -1527,7 +1525,6 @@ mss_detect(device_t dev, struct mss_info *mss) * b2-b0 = chip id; */ switch (id) { - case 0xa0: name = "CS4231A"; mss->bd_id = MD_CS42XX; @@ -1882,7 +1879,6 @@ static device_method_t mss_methods[] = { DEVMETHOD(device_detach, mss_detach), DEVMETHOD(device_suspend, mss_suspend), DEVMETHOD(device_resume, mss_resume), - { 0, 0 } }; @@ -2099,7 +2095,6 @@ opti_init(device_t dev, struct mss_info *mss) return ENXIO; } - switch (mss->bd_id) { case MD_OPTI924: opti_write(mss, 1, 0x80 | basebits); /* MSS mode */ @@ -2194,7 +2189,6 @@ static device_method_t pnpmss_methods[] = { DEVMETHOD(device_detach, mss_detach), DEVMETHOD(device_suspend, mss_suspend), DEVMETHOD(device_resume, mss_resume), - { 0, 0 } }; @@ -2280,7 +2274,6 @@ static device_method_t guspcm_methods[] = { DEVMETHOD(device_probe, guspcm_probe), DEVMETHOD(device_attach, guspcm_attach), DEVMETHOD(device_detach, mss_detach), - { 0, 0 } }; diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h index 8917214ccbff..58ad1e230043 100644 --- a/sys/dev/sound/isa/mss.h +++ b/sys/dev/sound/isa/mss.h @@ -193,7 +193,6 @@ typedef struct mixer_def mixer_tab[32][2]; #define MSS_REC_DEVICES \ (SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD|SOUND_MASK_IMIX) - /* * Table of mixer registers. There is a default table for the * AD1848/CS423x clones, one for the OPTI931 and one for the @@ -242,7 +241,6 @@ MIX_NONE(SOUND_MIXER_LINE3), (SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_MIC | \ SOUND_MASK_CD | SOUND_MASK_IMIX | SOUND_MASK_IGAIN ) - mixer_ent opti930_devices[32][2] = { MIX_ENT(SOUND_MIXER_VOLUME, 22, 1, 0, 4, 23, 1, 0, 4), MIX_NONE(SOUND_MIXER_BASS), @@ -411,5 +409,3 @@ MIX_NONE(SOUND_MIXER_LINE3), #define OPL3SAx_HWVOL 0x17 /* HW Volume IRQ Configuration (R/W) */ #define OPL3SAx_HWVOL_IRQA 0x10 /* HW Volume IRQ on IRQ-A */ #define OPL3SAx_HWVOL_IRQB 0x20 /* HW Volume IRQ on IRQ-B */ - - diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h index b077a5bc6a30..2af32a03e5c4 100644 --- a/sys/dev/sound/isa/sb.h +++ b/sys/dev/sound/isa/sb.h @@ -86,7 +86,6 @@ void sbc_unlock(struct sbc_softc *); #define DSP_CMD_DAC2S_AUTO 0x1f /* auto 2-bit adpcm dma out (start) */ - /* SB16 commands */ #define DSP_CMD_O16 0xb0 #define DSP_CMD_I16 0xb8 @@ -113,7 +112,6 @@ void sbc_unlock(struct sbc_softc *); #define DSP_CMD_GETVER 0xE1 #define DSP_CMD_GETID 0xE7 /* return id bytes */ - #define DSP_CMD_OUT16 0x41 /* send parms for dma out on sb16 */ #define DSP_CMD_IN16 0x42 /* send parms for dma in on sb16 */ #if 0 /*** unknown ***/ diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c index cf7dd54199dc..73ec7c56245e 100644 --- a/sys/dev/sound/isa/sb16.c +++ b/sys/dev/sound/isa/sb16.c @@ -125,19 +125,16 @@ static void sb_intr(void *arg); static void sb_lock(struct sb_info *sb) { - sbc_lock(device_get_softc(sb->parent_dev)); } static void sb_lockassert(struct sb_info *sb) { - sbc_lockassert(device_get_softc(sb->parent_dev)); } static void sb_unlock(struct sb_info *sb) { - sbc_unlock(device_get_softc(sb->parent_dev)); } @@ -336,7 +333,7 @@ static int rel2abs_volume(int x, int max) { int temp; - + temp = ((x * max) + 50) / 100; if (temp > max) temp = max; @@ -899,7 +896,6 @@ static device_method_t sb16_methods[] = { DEVMETHOD(device_probe, sb16_probe), DEVMETHOD(device_attach, sb16_attach), DEVMETHOD(device_detach, sb16_detach), - { 0, 0 } }; diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index 9cdc1b230ab4..779c6631b264 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -116,13 +116,11 @@ static int sb_stop(struct sb_chinfo *ch); static void sb_lock(struct sb_info *sb) { - sbc_lock(device_get_softc(sb->parent_dev)); } static void sb_unlock(struct sb_info *sb) { - sbc_unlock(device_get_softc(sb->parent_dev)); } @@ -789,7 +787,6 @@ static device_method_t sb_methods[] = { DEVMETHOD(device_probe, sb_probe), DEVMETHOD(device_attach, sb_attach), DEVMETHOD(device_detach, sb_detach), - { 0, 0 } }; @@ -803,7 +800,3 @@ DRIVER_MODULE(snd_sb8, sbc, sb_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_sb8, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_DEPEND(snd_sb8, snd_sbc, 1, 1, 1); MODULE_VERSION(snd_sb8, 1); - - - - diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c index 65911bcac8b6..04a29d3030b6 100644 --- a/sys/dev/sound/macio/aoa.c +++ b/sys/dev/sound/macio/aoa.c @@ -130,7 +130,7 @@ aoa_dma_create(struct aoa_softc *sc) dma->tag = tag; dma->bufsz = AOA_BUFFER_SIZE; dma->blksz = PAGE_SIZE; /* initial blocksize */ - + mtx_init(&dma->mutex, "AOA", NULL, MTX_DEF); sc->sc_intrp = dma; @@ -215,7 +215,7 @@ aoa_chan_getptr(kobj_t obj, void *data) if (!dma->running) return (0); - + return (dma->slot * dma->blksz); } @@ -327,7 +327,6 @@ aoa_interrupt(void *xsc) mtx_lock(&dma->mutex); while (dbdma_get_cmd_status(dma->channel, dma->slot)) { - dbdma_clear_cmd_status(dma->channel, dma->slot); dma->slot = (dma->slot + 1) % dma->slots; @@ -389,4 +388,3 @@ aoa_attach(void *xsc) return (0); } - diff --git a/sys/dev/sound/macio/aoa.h b/sys/dev/sound/macio/aoa.h index 59b8bc0d61de..a6875fbaacf6 100644 --- a/sys/dev/sound/macio/aoa.h +++ b/sys/dev/sound/macio/aoa.h @@ -46,4 +46,3 @@ void aoa_interrupt(void *); int aoa_attach(void *xsc); #endif /* SOUND_AOA_H */ - diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c index c498be157d1f..c174ec155416 100644 --- a/sys/dev/sound/macio/davbus.c +++ b/sys/dev/sound/macio/davbus.c @@ -78,7 +78,6 @@ static device_method_t pcm_davbus_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, davbus_probe), DEVMETHOD(device_attach, davbus_attach), - { 0, 0 } }; @@ -105,7 +104,7 @@ davbus_probe(device_t self) if (strcmp(name, "davbus") != 0) return (ENXIO); - + device_set_desc(self, "Apple DAVBus Audio Controller"); return (0); @@ -159,7 +158,7 @@ burgundy_init(struct snd_mixer *m) mtx_lock(&d->mutex); burgundy_write_locked(d, 0x16700, 0x40); - + burgundy_write_locked(d, BURGUNDY_MIX0_REG, 0); burgundy_write_locked(d, BURGUNDY_MIX1_REG, 0); burgundy_write_locked(d, BURGUNDY_MIX2_REG, BURGUNDY_MIX_ISA); @@ -374,7 +373,6 @@ screamer_reinit(struct snd_mixer *m) return (0); } - static void screamer_write_locked(struct davbus_softc *d, u_int reg, u_int val) { @@ -529,7 +527,7 @@ davbus_attach(device_t self) return (ENXIO); oirq = rman_get_start(dbdma_irq); - + DPRINTF(("interrupting at irq %d\n", oirq)); err = powerpc_config_intr(oirq, INTR_TRIGGER_EDGE, INTR_POLARITY_LOW); @@ -556,7 +554,7 @@ davbus_attach(device_t self) if (cintr != NULL) bus_setup_intr(self, cintr, INTR_TYPE_MISC | INTR_MPSAFE, NULL, davbus_cint, sc, &cookie); - + /* Initialize controller registers. */ bus_write_4(sc->reg, DAVBUS_SOUND_CTRL, DAVBUS_INPUT_SUBFRAME0 | DAVBUS_OUTPUT_SUBFRAME0 | DAVBUS_RATE_44100 | DAVBUS_INTR_PORTCHG); @@ -589,7 +587,6 @@ davbus_cint(void *ptr) status = bus_read_4(d->reg, DAVBUS_CODEC_STATUS); if (d->read_status && d->set_outputs) { - mask = (*d->read_status)(d, status); (*d->set_outputs)(d, mask); } @@ -600,4 +597,3 @@ davbus_cint(void *ptr) mtx_unlock(&d->mutex); } - diff --git a/sys/dev/sound/macio/davbusreg.h b/sys/dev/sound/macio/davbusreg.h index c8307d9f35c2..8b5a8ccefa65 100644 --- a/sys/dev/sound/macio/davbusreg.h +++ b/sys/dev/sound/macio/davbusreg.h @@ -78,7 +78,6 @@ /* DAVBUS_CODEC_CTRL bit definitions. */ #define DAVBUS_CODEC_BUSY 0x01000000 - /* * Burgundy Codec Control Bits */ @@ -235,7 +234,6 @@ #define SCREAMER_CODEC_EMSEL2 0x00800000 #define SCREAMER_CODEC_EMSEL4 0x00c00000 - /* cc0 */ /* * Bits 7-4 specify the left ADC input gain; @@ -284,4 +282,3 @@ #define SCREAMER_STATUS_REVSHFT 12 #endif /* _SOUND_DAVBUS_H */ - diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c index 9cf4c5a6cd34..4d675eb9461d 100644 --- a/sys/dev/sound/macio/i2s.c +++ b/sys/dev/sound/macio/i2s.c @@ -111,7 +111,6 @@ static device_method_t pcm_i2s_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, i2s_probe), DEVMETHOD(device_attach, i2s_attach), - { 0, 0 } }; @@ -131,7 +130,6 @@ static device_method_t aoagpio_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, aoagpio_probe), DEVMETHOD(device_attach, aoagpio_attach), - { 0, 0 } }; @@ -152,7 +150,6 @@ static devclass_t aoagpio_devclass; DRIVER_MODULE(aoagpio, macgpio, aoagpio_driver, aoagpio_devclass, 0, 0); - /***************************************************************************** Probe and attachment routines. *****************************************************************************/ @@ -179,7 +176,7 @@ i2s_probe(device_t self) if (subchild != 0 && OF_getprop(subchild, "name", subchildname, sizeof(subchildname)) > 0 && strcmp(subchildname, "lightshow") == 0) return (ENXIO); - + device_set_desc(self, "Apple I2S Audio Controller"); return (0); @@ -195,7 +192,7 @@ i2s_attach(device_t self) void *dbdma_ih; int rid, oirq, err; phandle_t port; - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->aoa.sc_dev = self; @@ -207,7 +204,7 @@ i2s_attach(device_t self) sc->soundnode = of_find_firstchild_byname(port, "sound"); if (sc->soundnode == -1) return (ENXIO); - + mtx_init(&sc->port_mtx, "port_mtx", NULL, MTX_DEF); /* Map the controller register space. */ @@ -305,7 +302,7 @@ aoagpio_int(void *cookie) struct aoagpio_softc *sc; sc = device_get_softc(self); - + if (macgpio_read(self) & GPIO_LEVEL_RO) sc->level = sc->detect_active; else @@ -460,7 +457,7 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int wordsize, u_int sclk_fs) if (sclk_fs != 32 && sclk_fs != 64) return (EINVAL); - + /* * Find a clock source to derive the master clock (MCLK) * and the I2S bit block (SCLK) and set the divisors as @@ -478,7 +475,7 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int wordsize, u_int sclk_fs) } if (reg == 0) return (EINVAL); - + switch (mdiv) { /* exception cases */ case 1: @@ -514,7 +511,7 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int wordsize, u_int sclk_fs) * revisited if we want to add recording from SPDIF some day. */ reg |= SCLK_MASTER; - + switch (sclk_fs) { case 64: reg |= SERIAL_64x; @@ -582,7 +579,6 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int wordsize, u_int sclk_fs) return (0); } - /* XXX this does not belong here. */ static phandle_t of_find_firstchild_byname(phandle_t node, const char *req_name) @@ -601,7 +597,6 @@ of_find_firstchild_byname(phandle_t node, const char *req_name) return (-1); } - static u_int gpio_read(enum gpio_ctrl ctrl) { @@ -669,7 +664,7 @@ i2s_audio_hw_reset(struct i2s_softc *sc) gpio_write(AUDIO_HW_RESET, !reset_active); /* Negate RESET */ DELAY(RESET_RELEASE_TIME); - + } else { DPRINTF(("no audio_hw_reset\n")); } @@ -762,4 +757,3 @@ i2s_postattach(void *xsc) config_intrhook_disestablish(i2s_delayed_attach); free(i2s_delayed_attach, M_TEMP); } - diff --git a/sys/dev/sound/macio/snapper.c b/sys/dev/sound/macio/snapper.c index 74ed823493b1..fe30357c99fc 100644 --- a/sys/dev/sound/macio/snapper.c +++ b/sys/dev/sound/macio/snapper.c @@ -108,7 +108,6 @@ static device_method_t snapper_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, snapper_probe), DEVMETHOD(device_attach, snapper_attach), - { 0, 0 } }; @@ -190,7 +189,6 @@ MIXER_DECLARE(snapper_mixer); #define SNAPPER_ACR_INP_B 0x02 /* B */ #define SNAPPER_ACR_APD 0x01 /* Analog power down */ - struct snapper_reg { u_char MCR1[1]; u_char DRC[6]; @@ -491,4 +489,3 @@ snapper_setrecsrc(struct snd_mixer *m, u_int32_t src) { return (0); } - diff --git a/sys/dev/sound/macio/tumbler.c b/sys/dev/sound/macio/tumbler.c index 24519eae3e5c..180482e47215 100644 --- a/sys/dev/sound/macio/tumbler.c +++ b/sys/dev/sound/macio/tumbler.c @@ -108,7 +108,6 @@ static device_method_t tumbler_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, tumbler_probe), DEVMETHOD(device_attach, tumbler_attach), - { 0, 0 } }; @@ -437,4 +436,3 @@ tumbler_setrecsrc(struct snd_mixer *m, u_int32_t src) { return (0); } - diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index e33c622540d3..29d3fe7249d0 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -142,7 +142,6 @@ static synth_alloc_t midisynth_alloc; static synth_controller_t midisynth_controller; static synth_bender_t midisynth_bender; - static kobj_method_t midisynth_methods[] = { KOBJMETHOD(synth_open, midisynth_open), KOBJMETHOD(synth_close, midisynth_close), @@ -175,7 +174,6 @@ DEFINE_CLASS(midisynth, midisynth_methods, 0); * */ - /* * midi_devs tailq, holder of all rmidi instances protected by midistat_lock */ @@ -207,7 +205,6 @@ static struct cdevsw midistat_cdevsw = { .d_name = "midistat", }; - /* * /dev/rmidi dev_t declarations, struct variable access is protected by * locks contained within the structure. @@ -452,7 +449,6 @@ static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; #define MIDI_SYSEX_START 0xF0 #define MIDI_SYSEX_END 0xF7 - int midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) { @@ -481,7 +477,6 @@ midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) return size; for (i = sig = 0; i < size; i++) { - data = buf[i]; enq = 0; if (data == MIDI_ACK) @@ -621,7 +616,6 @@ midi_out(struct snd_midi *m, MIDI_TYPE *buf, int size) return used; } - /* * /dev/rmidi#.# device access functions */ @@ -816,7 +810,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_WSIZE]; - MIDI_DEBUG(4, printf("midi_write\n")); retval = 0; if (m == NULL) @@ -865,7 +858,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) uio->uio_resid, (intmax_t)MIDIQ_LEN(m->outq), (intmax_t)MIDIQ_AVAIL(m->outq))); - MIDI_DEBUG(5, printf("midi_write: uiomove cc=%d\n", used)); retval = uiomove(buf, used, uio); if (retval) @@ -1074,7 +1066,6 @@ midi_cmdname(int cmd) * midisynth */ - int midisynth_open(void *n, void *arg, int flags) { @@ -1132,7 +1123,6 @@ midisynth_open(void *n, void *arg, int flags) MPU_CALLBACK(m, m->cookie, m->flags); - err: mtx_unlock(&m->qlock); mtx_unlock(&m->lock); MIDI_DEBUG(2, printf("midisynth_open: return %d.\n", retval)); @@ -1279,7 +1269,6 @@ midisynth_killnote(void *n, uint8_t chn, uint8_t note, uint8_t vel) { u_char c[3]; - if (note > 127 || chn > 15) return (EINVAL); @@ -1355,7 +1344,6 @@ midisynth_bender(void *n, uint8_t chn, uint16_t val) { u_char c[3]; - if (val > 16383 || chn > 15) return EINVAL; diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index ce4b4400cb84..d47c128949a5 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -241,7 +241,6 @@ mpu401_minit(struct snd_midi *sm, void *arg) return 1; } - int mpu401_muninit(struct snd_midi *sm, void *arg) { diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index b264861265d7..ed8ba6dde699 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -310,7 +310,6 @@ static void timer_setvals(struct seq_softc *t, int tempo, int timerbase); static void timer_wait(struct seq_softc *t, int ticks, int wait_abs); static int timer_now(struct seq_softc *t); - static void timer_start(struct seq_softc *t) { @@ -1011,7 +1010,6 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int ioflag) /* Have a look at the event code. */ if (ev_code == SEQ_FULLSIZE) { - /* * TODO: restore code for SEQ_FULLSIZE */ @@ -1044,7 +1042,6 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int ioflag) mtx_lock(&scp->seq_lock); if (retval) goto err0; - } retval = 0; goto err0; @@ -1111,7 +1108,6 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; #endif } - } scp->playing = 1; @@ -1837,7 +1833,6 @@ seq_chncommon(struct seq_softc *scp, kobj_t md, u_char *event) printf("seq_chncommon event type %d not handled.\n", event[1])); break; - } mtx_lock(&scp->seq_lock); return ret; @@ -2028,7 +2023,6 @@ seq_sync(struct seq_softc *scp) * the queue is moving along. If it isn't just abort. */ while (!MIDIQ_EMPTY(scp->out_q)) { - if (!scp->playing) { scp->playing = 1; cv_broadcast(&scp->state_cv); diff --git a/sys/dev/sound/midi/sequencer.h b/sys/dev/sound/midi/sequencer.h index 7a53e6245580..29405ea3c5f8 100644 --- a/sys/dev/sound/midi/sequencer.h +++ b/sys/dev/sound/midi/sequencer.h @@ -36,7 +36,6 @@ #ifndef _SEQUENCER_H_ #define _SEQUENCER_H_ - #define NSEQ_MAX 16 /* diff --git a/sys/dev/sound/pci/allegro_reg.h b/sys/dev/sound/pci/allegro_reg.h index 5a219bb5c832..e340432e881d 100644 --- a/sys/dev/sound/pci/allegro_reg.h +++ b/sys/dev/sound/pci/allegro_reg.h @@ -148,7 +148,6 @@ #define PCI_DDMA_CTRL 0x60 #define DDMA_ENABLE 0x00000001 - /* Allegro registers */ #define HOST_INT_CTRL 0x18 #define SB_INT_ENABLE 0x0001 @@ -446,7 +445,6 @@ #error Data memory map length too short. #endif - /* * Kernel code memory definition */ @@ -456,7 +454,6 @@ #define KCODE_VECTORS_UNIT_LENGTH 0x0002 #define KCODE_VECTORS_LENGTH (KCODE_VECTORS_END - KCODE_VECTORS_BEGIN + 1) - /* * Kernel data memory definition */ diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 7bca1d058691..d12b262e825e 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -312,7 +312,6 @@ als_set_speed(struct sc_chinfo *ch) /* ------------------------------------------------------------------------- */ /* Playback channel implementation */ - #define ALS_8BIT_CMD(x, y) { (x), (y), DSP_DMA8, DSP_CMD_DMAPAUSE_8 } #define ALS_16BIT_CMD(x, y) { (x), (y), DSP_DMA16, DSP_CMD_DMAPAUSE_16 } @@ -896,7 +895,6 @@ als_pci_resume(device_t dev) { struct sc_info *sc = pcm_getdevinfo(dev); - snd_mtxlock(sc->lock); if (als_init(sc) != 0) { device_printf(dev, "unable to reinitialize the card\n"); diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 5d3ba1180e19..21e8350b691e 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -1291,7 +1291,6 @@ atiixp_pci_attach(device_t dev) sizeof(struct atiixp_dma_op), atiixp_dma_cb, sc, 0)) goto bad; - atiixp_chip_pre_init(sc); sc->delayed_attach.ich_func = atiixp_chip_post_init; diff --git a/sys/dev/sound/pci/atiixp.h b/sys/dev/sound/pci/atiixp.h index 0ea872ebbb85..ccd99d6cb6c1 100644 --- a/sys/dev/sound/pci/atiixp.h +++ b/sys/dev/sound/pci/atiixp.h @@ -34,7 +34,7 @@ /* * Constants, pretty much FreeBSD specific. */ - + /* Number of playback / recording channel */ #define ATI_IXP_NPCHAN 1 #define ATI_IXP_NRCHAN 1 diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index 486964c00c49..f4b9906e20e0 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -434,7 +434,6 @@ au_intr (void *p) au_rd(au, 0, AU_REG_IRQSRC, 4); } - /* -------------------------------------------------------------------- */ /* Probe and attach the card */ @@ -673,7 +672,6 @@ static device_method_t au_methods[] = { /* Device interface */ DEVMETHOD(device_probe, au_pci_probe), DEVMETHOD(device_attach, au_pci_attach), - { 0, 0 } }; diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h index 0ca1caf97bc3..c80f246de697 100644 --- a/sys/dev/sound/pci/aureal.h +++ b/sys/dev/sound/pci/aureal.h @@ -97,5 +97,4 @@ #define AC97_REG_ID1 0x7c #define AC97_REG_ID2 0x7e - #endif diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 35b3257a00f8..30868de323b3 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -269,7 +269,6 @@ cmi_dma_prog(struct sc_info *sc, struct sc_chinfo *ch, u_int32_t base) cmi_wr(sc, base + 6, i, 2); } - static void cmi_ch0_start(struct sc_info *sc, struct sc_chinfo *ch) { @@ -544,7 +543,6 @@ cmi_intr(void *data) snd_mtxlock(sc->lock); intrstat = cmi_rd(sc, CMPCI_REG_INTR_STATUS, 4); if ((intrstat & CMPCI_REG_ANY_INTR) != 0) { - toclear = 0; if (intrstat & CMPCI_REG_CH0_INTR) { toclear |= CMPCI_REG_CH0_INTR_ENABLE; @@ -571,7 +569,6 @@ cmi_intr(void *data) snd_mtxlock(sc->lock); cmi_set4(sc, CMPCI_REG_INTR_CTRL, toclear); - } } if(sc->mpu_intr) { @@ -844,8 +841,6 @@ cmi_midiattach(struct sc_info *sc) { sc->mpu = mpu401_init(&cmi_mpu_class, sc, cmi_intr, &sc->mpu_intr); } - - /* ------------------------------------------------------------------------- */ /* Power and reset */ diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 73235f79c416..e3f611ed2949 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -876,7 +876,7 @@ static int csa_transferimage(csa_res *resp, u_int32_t *src, u_long dest, u_long len) { u_long ul; - + /* * We do not allow DMAs from host memory to host memory (although the DMA * can do it) and we do not allow DMAs which are not a multiple of 4 bytes diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h index 85ca663e7673..77a34a2d6bc7 100644 --- a/sys/dev/sound/pci/csareg.h +++ b/sys/dev/sound/pci/csareg.h @@ -1971,5 +1971,4 @@ struct cs461x_firmware_struct u_int32_t BA1Array[INKY_BA1_DWORD_SIZE]; }; - #endif /* _CSA_REG_H */ diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h index 96fa231d27a3..7d4d6aee7a9b 100644 --- a/sys/dev/sound/pci/ds1-fw.h +++ b/sys/dev/sound/pci/ds1-fw.h @@ -1601,4 +1601,3 @@ static u_int32_t CntrlInst1E[] = { }; #endif - diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index 9c7c75cb175b..d9641b632051 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -765,7 +765,6 @@ ds_intr(void *p) i = ds_rd(sc, YDSXGR_MODE, 4); if (x) ds_wr(sc, YDSXGR_MODE, i | 0x00000002, 4); - } snd_mtxunlock(sc->lock); } diff --git a/sys/dev/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h index ad4e829cbfee..9c01f0e287fa 100644 --- a/sys/dev/sound/pci/ds1.h +++ b/sys/dev/sound/pci/ds1.h @@ -8,7 +8,6 @@ * $FreeBSD$ */ - /* ----- YAMAHA DS-XG Devices -------------------------------------------- */ #define YAMAHA 0x1073 #define YMF724 0x0004 @@ -23,34 +22,28 @@ #define YMF738_TEG 0x0006 #define DEVICE4CH(x) ((x == YMF738) || (x == YMF744) || (x == YMF754)) - #define PCIR_DSXGCTRL 0x48 /* ----- interrupt flag -------------------------------------------------- */ #define YDSXG_DEFINT 0x01 #define YDSXG_TIMERINT 0x02 - /* ----- AC97 ------------------------------------------------------------ */ #define YDSXG_AC97TIMEOUT 1000 #define YDSXG_AC97READCMD 0x8000 #define YDSXG_AC97WRITECMD 0x0000 #define YDSXG_AC97READFALSE 0xFFFF - /* ----- AC97 register map _---------------------------------------------- */ #define AC97R_GPIOSTATUS 0x54 - /* ----- work buffer ----------------------------------------------------- */ #define DEF_WORKBUFFLENGTH 0x0400 - /* ----- register size --------------------------------------------------- */ #define YDSXG_MAPLENGTH 0x8000 #define YDSXG_DSPLENGTH 0x0080 #define YDSXG_CTRLLENGTH 0x3000 - /* ----- register map ---------------------------------------------------- */ #define YDSXGR_INTFLAG 0x0004 #define YDSXGR_ACTIVITY 0x0006 @@ -150,7 +143,5 @@ #define YDSXGR_DSPINSTRAM 0x1000 #define YDSXGR_CTRLINSTRAM 0x4000 - /* ----- time out -------------------------------------------------------- */ #define YDSXG_WORKBITTIMEOUT 250000 - diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 94769b38faf0..9ee71ed96847 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -1284,7 +1284,6 @@ emu_intr(void *data) emu_enatimer(sc, 0); } - if (ack & (EMU_IPR_ADCBUFFULL | EMU_IPR_ADCBUFHALFFULL)) { if (sc->rch[0].channel) chn_intr(sc->rch[0].channel); diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c index 778d17013a05..e00a850a66e2 100644 --- a/sys/dev/sound/pci/emu10kx-midi.c +++ b/sys/dev/sound/pci/emu10kx-midi.c @@ -223,7 +223,6 @@ emu_midi_attach(device_t dev) return (0); } - static int emu_midi_detach(device_t dev) { diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index 58d25d7e68c5..4f50ffd1f74f 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -116,7 +116,6 @@ struct emu_pcm_info { unsigned int emu10k1_volcache[2][2]; }; - static uint32_t emu_rfmt_adc[] = { SND_FORMAT(AFMT_S16_LE, 1, 0), SND_FORMAT(AFMT_S16_LE, 2, 0), @@ -404,7 +403,7 @@ emu_dspmixer_setrecsrc(struct snd_mixer *m, u_int32_t src) recmask = 0; for (i=0; i < 8; i++) input[i]=0; - + if (sc->sm != NULL) if ((src & sc->ac97_recdevs) !=0) if (mix_setrecsrc(sc->sm, src & sc->ac97_recdevs) == 0) { @@ -456,7 +455,7 @@ emu_dspmixer_setrecsrc(struct snd_mixer *m, u_int32_t src) emumix_set_volume(sc->card, M_IN6_REC_L, input[6] == 1 ? 100 : 0); emumix_set_volume(sc->card, M_IN6_REC_R, input[6] == 1 ? 100 : 0); - + /* XXX check for K1/k2 differences? */ if ((src & (1 << SOUND_MIXER_PCM)) == (1 << SOUND_MIXER_PCM)) { emumix_set_volume(sc->card, M_FX0_REC_L, emumix_get_volume(sc->card, M_FX0_FRONT_L)); @@ -684,7 +683,6 @@ static kobj_method_t emu_ac97_methods[] = { }; AC97_DECLARE(emu_ac97); - static int emu_k1_recval(int speed) { @@ -717,7 +715,6 @@ emupchan_init(kobj_t obj __unused, void *devinfo, struct snd_dbuf *b, struct pcm KASSERT(dir == PCMDIR_PLAY, ("emupchan_init: bad direction")); KASSERT(sc->card != NULL, ("empchan_init: no soundcard")); - if (sc->pnum >= MAX_CHANNELS) return (NULL); ch = &(sc->pch[sc->pnum++]); @@ -1229,7 +1226,6 @@ static kobj_method_t emufxrchan_methods[] = { }; CHANNEL_DECLARE(emufxrchan); - static uint32_t emu_pcm_intr(void *pcm, uint32_t stat) { @@ -1240,7 +1236,7 @@ emu_pcm_intr(void *pcm, uint32_t stat) ack = 0; snd_mtxlock(sc->lock); - + if (stat & EMU_IPR_INTERVALTIMER) { ack |= EMU_IPR_INTERVALTIMER; for (i = 0; i < MAX_CHANNELS; i++) @@ -1264,7 +1260,6 @@ emu_pcm_intr(void *pcm, uint32_t stat) */ } - if (stat & (EMU_IPR_ADCBUFFULL | EMU_IPR_ADCBUFHALFFULL)) { ack |= stat & (EMU_IPR_ADCBUFFULL | EMU_IPR_ADCBUFHALFFULL); if (sc->rch_adc.channel) { diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 7d2d77abf918..5ae760845008 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -328,7 +328,6 @@ struct emu_sc_info { struct sbuf emu10kx_sbuf; int emu10kx_bufptr; - /* Resources */ struct resource *reg; struct resource *irq; @@ -604,7 +603,6 @@ emu_getcard(device_t dev) return (thiscard); } - /* * Base hardware interface are 32 (Audigy) or 64 (Audigy2) registers. * Some of them are used directly, some of them provide pointer / data pairs. @@ -806,7 +804,6 @@ emu_enable_ir(struct emu_sc_info *sc) } } - /* * emu_timer_ - HW timer management */ @@ -1001,7 +998,6 @@ emu_intr(void *p) if (sc->dbg_level > 1) if (stat & (~ack)) device_printf(sc->dev, "Unhandled interrupt: %08x\n", stat & (~ack)); - } if ((sc->is_ca0102) || (sc->is_ca0108)) @@ -1033,7 +1029,6 @@ emu_intr(void *p) } } - /* * Get data from private emu10kx structure for PCM buffer allocation. * Used by PCM code only. @@ -1188,7 +1183,6 @@ emu_memstart(struct emu_mem *mem, void *membuf) return (blk->pte_start); } - static uint32_t emu_rate_to_pitch(uint32_t rate) { @@ -1387,7 +1381,6 @@ emu_vwrite(struct emu_sc_info *sc, struct emu_voice *v) v->sa = v->start >> s; v->ea = v->end >> s; - if (v->stereo) { emu_wrptr(sc, v->vnum, EMU_CHAN_CPF, EMU_CHAN_CPF_STEREO_MASK); } else { @@ -1513,7 +1506,6 @@ emu_vpos(struct emu_sc_info *sc, struct emu_voice *v) return (ptr & ~0x0000001f); } - /* fx */ static void emu_wrefx(struct emu_sc_info *sc, unsigned int pc, unsigned int data) @@ -1521,7 +1513,6 @@ emu_wrefx(struct emu_sc_info *sc, unsigned int pc, unsigned int data) emu_wrptr(sc, 0, sc->code_base + pc, data); } - static void emu_addefxop(struct emu_sc_info *sc, unsigned int op, unsigned int z, unsigned int w, unsigned int x, unsigned int y, uint32_t * pc) { @@ -1698,7 +1689,6 @@ emu_digitalswitch(struct emu_sc_info *sc) &pc); \ } while (0) - static void emu_initefx(struct emu_sc_info *sc) { @@ -1744,7 +1734,6 @@ emu_initefx(struct emu_sc_info *sc) emu_addefxop(sc, ACC3, OUTP(i), DSP_CONST(0), DSP_CONST(0), DSP_CONST(0), &pc); } - if (sc->is_emu10k1) { EFX_CACHE(C_FRONT_L); EFX_CACHE(C_FRONT_R); @@ -1858,7 +1847,6 @@ emu_initefx(struct emu_sc_info *sc) this output is shared with digital out */ EFX_SKIP(1, ANALOGMUTE); EFX_OUTPUTD(C_SUB, M_MASTER_SUBWOOFER, OUT_A_SUB); - } } else { /* SND_EMU10KX_MULTICHANNEL_DISABLED */ @@ -2194,7 +2182,6 @@ static struct cdevsw emu10kx_cdevsw = { .d_version = D_VERSION, }; - static int emu10kx_open(struct cdev *i_dev, int flags __unused, int mode __unused, struct thread *td __unused) { @@ -2435,7 +2422,6 @@ emu_rm_gpr_alloc(struct emu_rm *rm, int count) rm->allocmap[allocated_gpr] = count; for (i = 1; i < count; i++) rm->allocmap[allocated_gpr + i] = -(count - i); - } } if (allocated_gpr == rm->num_gprs) @@ -2474,7 +2460,6 @@ emumix_set_mode(struct emu_sc_info *sc, int mode) else hcfg |= EMU_HCFG_CODECFMT_I2S | EMU_HCFG_JOYENABLE; - if (mode == MODE_DIGITAL) { if (sc->broken_digital) { device_printf(sc->dev, "Digital mode is reported as broken on this card.\n"); @@ -2576,7 +2561,6 @@ static int l2l_f[L2L_POINTS] = { 0x00000000 /* 0 */ }; - static int log2lin(int log_t) { @@ -2599,7 +2583,6 @@ log2lin(int log_t) return (lin_t); } - void emumix_set_fxvol(struct emu_sc_info *sc, unsigned gpr, int32_t vol) { @@ -2805,7 +2788,6 @@ emu_init(struct emu_sc_info *sc) * 3. Allow EMU10K DSP inputs */ if ((sc->is_ca0102) || (sc->is_ca0108)) { - spdif_sr = emu_rdptr(sc, 0, EMU_A_SPDIF_SAMPLERATE); spdif_sr &= 0xfffff1ff; spdif_sr |= EMU_A_I2S_CAPTURE_96000; @@ -3032,7 +3014,6 @@ emu_pci_probe(device_t dev) return (BUS_PROBE_DEFAULT); } - static int emu_pci_attach(device_t dev) { @@ -3443,7 +3424,7 @@ emu_pci_detach(device_t dev) int r = 0; sc = device_get_softc(dev); - + for (i = 0; i < RT_COUNT; i++) { if (sc->pcm[i] != NULL) { func = device_get_ivars(sc->pcm[i]); @@ -3526,7 +3507,6 @@ static device_method_t emu_methods[] = { DEVMETHOD_END }; - static driver_t emu_driver = { "emu10kx", emu_methods, diff --git a/sys/dev/sound/pci/emu10kx.h b/sys/dev/sound/pci/emu10kx.h index b4cfd7d6bab9..be36c664c36f 100644 --- a/sys/dev/sound/pci/emu10kx.h +++ b/sys/dev/sound/pci/emu10kx.h @@ -47,7 +47,6 @@ #define EMU_MAX_BUFSZ EMUPAGESIZE*16 #define EMU_MAXPAGES 8192 - #define EMU_VAR_FUNC 0 #define EMU_VAR_ROUTE 1 #define EMU_VAR_ISEMU10K1 2 diff --git a/sys/dev/sound/pci/emuxkireg.h b/sys/dev/sound/pci/emuxkireg.h index 555acc93026a..a1cf896db53d 100644 --- a/sys/dev/sound/pci/emuxkireg.h +++ b/sys/dev/sound/pci/emuxkireg.h @@ -200,7 +200,6 @@ #define EMU_CHAN_CPF_STOP_MASK 0x00004000 #define EMU_CHAN_CPF_FRACADDRESS_MASK 0x00003fff - #define EMU_CHAN_PTRX 0x01 #define EMU_CHAN_PTRX_PITCHTARGET_MASK 0xffff0000 #define EMU_CHAN_PTRX_PITCHTARGET EMU_MKSUBREG(16, 16, EMU_CHAN_PTRX) @@ -278,24 +277,20 @@ #define EMU_CHAN_MAP_PTE_MASK 0xffffe000 #define EMU_CHAN_MAP_PTI_MASK 0x00001fff - #define EMU_CHAN_ENVVOL 0x10 #define EMU_CHAN_ENVVOL_MASK 0x0000ffff - #define EMU_CHAN_ATKHLDV 0x11 #define EMU_CHAN_ATKHLDV_PHASE0 0x00008000 #define EMU_CHAN_ATKHLDV_HOLDTIME_MASK 0x00007f00 #define EMU_CHAN_ATKHLDV_ATTACKTIME_MASK 0x0000007f - #define EMU_CHAN_DCYSUSV 0x12 #define EMU_CHAN_DCYSUSV_PHASE1_MASK 0x00008000 #define EMU_CHAN_DCYSUSV_SUSTAINLEVEL_MASK 0x00007f00 #define EMU_CHAN_DCYSUSV_CHANNELENABLE_MASK 0x00000080 #define EMU_CHAN_DCYSUSV_DECAYTIME_MASK 0x0000007f - #define EMU_CHAN_LFOVAL1 0x13 #define EMU_CHAN_LFOVAL_MASK 0x0000ffff @@ -598,7 +593,6 @@ #define EMU_DSP_OP_INTERP 0xE #define EMU_DSP_OP_SKIP 0xF - #define EMU_DSP_FX(num) (num) #define EMU_DSP_IOL(base, num) (base + (num << 1)) diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index f70019b47e59..a6cb28ab6040 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -936,7 +936,7 @@ envy24_delta_ak4524_create(device_t dev, void *info, int dir, int num) #if(0) device_printf(sc->dev, "envy24_delta_ak4524_create(dev, sc, %d, %d)\n", dir, num); #endif - + buff = malloc(sizeof(*buff), M_ENVY24, M_NOWAIT); if (buff == NULL) return NULL; @@ -1427,7 +1427,7 @@ envy24_p32sl(struct sc_chinfo *ch) src += 2; src %= ssize; } - + return; } @@ -1454,7 +1454,7 @@ envy24_p16sl(struct sc_chinfo *ch) #if(0) device_printf(ch->parent->dev, "envy24_p16sl():%lu-->%lu(%lu)\n", src, dst, length); #endif - + for (i = 0; i < length; i++) { dmabuf[dst * ENVY24_PLAY_CHNUM + slot].buffer = (u_int32_t)data[src] << 16; dmabuf[dst * ENVY24_PLAY_CHNUM + slot + 1].buffer = (u_int32_t)data[src + 1] << 16; @@ -1472,7 +1472,7 @@ envy24_p16sl(struct sc_chinfo *ch) #if(0) printf("\n"); #endif - + return; } @@ -1493,7 +1493,7 @@ envy24_p8u(struct sc_chinfo *ch) ssize = ch->size; dsize = ch->size / 4; slot = ch->num * 2; - + for (i = 0; i < length; i++) { dmabuf[dst * ENVY24_PLAY_CHNUM + slot].buffer = ((u_int32_t)data[src] ^ 0x80) << 24; dmabuf[dst * ENVY24_PLAY_CHNUM + slot + 1].buffer = ((u_int32_t)data[src + 1] ^ 0x80) << 24; @@ -1502,7 +1502,7 @@ envy24_p8u(struct sc_chinfo *ch) src += 2; src %= ssize; } - + return; } @@ -1532,7 +1532,7 @@ envy24_r32sl(struct sc_chinfo *ch) src++; src %= ssize; } - + return; } @@ -1562,7 +1562,7 @@ envy24_r16sl(struct sc_chinfo *ch) src++; src %= ssize; } - + return; } @@ -1716,7 +1716,7 @@ envy24chan_setspeed(kobj_t obj, void *data, u_int32_t speed) break; } ch->speed = prev; - + #if(0) device_printf(ch->parent->dev, "envy24chan_setspeed(): return %d\n", ch->speed); #endif @@ -2391,7 +2391,6 @@ envy24_init(struct sc_info *sc) int i; u_int32_t sv, sd; - #if(0) device_printf(sc->dev, "envy24_init()\n"); #endif diff --git a/sys/dev/sound/pci/envy24.h b/sys/dev/sound/pci/envy24.h index 0587fc5a4641..3da4eab7400b 100644 --- a/sys/dev/sound/pci/envy24.h +++ b/sys/dev/sound/pci/envy24.h @@ -28,7 +28,6 @@ * $FreeBSD$ */ - /* -------------------------------------------------------------------- */ /* PCI device ID */ diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index a4d3370dc31c..d794fe605967 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -921,7 +921,7 @@ envy24ht_spi_create(device_t dev, void *info, int dir, int num) #if(0) device_printf(sc->dev, "envy24ht_spi_create(dev, sc, %d, %d)\n", dir, num); #endif - + buff = malloc(sizeof(*buff), M_ENVY24HT, M_NOWAIT); if (buff == NULL) return NULL; @@ -1336,7 +1336,7 @@ envy24ht_p32sl(struct sc_chinfo *ch) src += 2; src %= ssize; } - + return; } @@ -1363,7 +1363,7 @@ envy24ht_p16sl(struct sc_chinfo *ch) #if(0) device_printf(ch->parent->dev, "envy24ht_p16sl():%lu-->%lu(%lu)\n", src, dst, length); #endif - + for (i = 0; i < length; i++) { dmabuf[dst * ENVY24HT_PLAY_CHNUM + slot].buffer = (u_int32_t)data[src] << 16; dmabuf[dst * ENVY24HT_PLAY_CHNUM + slot + 1].buffer = (u_int32_t)data[src + 1] << 16; @@ -1381,7 +1381,7 @@ envy24ht_p16sl(struct sc_chinfo *ch) #if(0) printf("\n"); #endif - + return; } @@ -1402,7 +1402,7 @@ envy24ht_p8u(struct sc_chinfo *ch) ssize = ch->size; dsize = ch->size / 4; slot = ch->num * 2; - + for (i = 0; i < length; i++) { dmabuf[dst * ENVY24HT_PLAY_CHNUM + slot].buffer = ((u_int32_t)data[src] ^ 0x80) << 24; dmabuf[dst * ENVY24HT_PLAY_CHNUM + slot + 1].buffer = ((u_int32_t)data[src + 1] ^ 0x80) << 24; @@ -1411,7 +1411,7 @@ envy24ht_p8u(struct sc_chinfo *ch) src += 2; src %= ssize; } - + return; } @@ -1441,7 +1441,7 @@ envy24ht_r32sl(struct sc_chinfo *ch) src++; src %= ssize; } - + return; } @@ -1471,7 +1471,7 @@ envy24ht_r16sl(struct sc_chinfo *ch) src++; src %= ssize; } - + return; } @@ -1627,7 +1627,7 @@ envy24htchan_setspeed(kobj_t obj, void *data, u_int32_t speed) break; } ch->speed = prev; - + #if(0) device_printf(ch->parent->dev, "envy24htchan_setspeed(): return %d\n", ch->speed); #endif @@ -1875,7 +1875,7 @@ envy24htmixer_init(struct snd_mixer *m) mix_setdevs(m, ENVY24HT_MIX_MASK); mix_setrecdevs(m, ENVY24HT_MIX_REC_MASK); - + snd_mtxunlock(sc->lock); return 0; @@ -2298,7 +2298,6 @@ envy24ht_init(struct sc_info *sc) int i; u_int32_t sv, sd; - #if(0) device_printf(sc->dev, "envy24ht_init()\n"); #endif @@ -2355,7 +2354,7 @@ envy24ht_init(struct sc_info *sc) envy24ht_wri2c(sc, 0x22, 0x04, 0x5f | 0x80); envy24ht_wri2c(sc, 0x22, 0x05, 0x5f | 0x80); } - + for (i = 0; i < sc->adcn; i++) { sc->adc[i] = sc->cfg->codec->create(sc->dev, sc, PCMDIR_REC, i); sc->cfg->codec->init(sc->adc[i]); diff --git a/sys/dev/sound/pci/envy24ht.h b/sys/dev/sound/pci/envy24ht.h index 9b9c19e52a3c..de1b0a54025f 100644 --- a/sys/dev/sound/pci/envy24ht.h +++ b/sys/dev/sound/pci/envy24ht.h @@ -29,7 +29,6 @@ * $FreeBSD$ */ - /* -------------------------------------------------------------------- */ /* PCI device ID */ @@ -92,7 +91,7 @@ #define ENVY24HT_CCSM_SPDIF_OUT 0x01 /* External S/PDIF Out implemented */ /* Professional Multi-Track Control Registers */ - + #define ENVY24HT_MT_INT_STAT 0x00 /* DMA Interrupt Mask and Status Register */ #define ENVY24HT_MT_INT_RSTAT 0x02 /* Multi-track record interrupt status */ #define ENVY24HT_MT_INT_PSTAT 0x01 /* Multi-track playback interrupt status */ @@ -185,4 +184,3 @@ #define ENVY24HT_CCS_GPIO_LMASK 0x16 #define ENVY24HT_CCS_GPIO_HMASK 0x1F #define ENVY24HT_CCS_GPIO_CTLDIR 0x18 - diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 1d6961052095..351b7f5ed287 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1932,7 +1932,6 @@ static device_method_t es_methods[] = { DEVMETHOD(device_probe, es_pci_probe), DEVMETHOD(device_attach, es_pci_attach), DEVMETHOD(device_detach, es_pci_detach), - { 0, 0 } }; diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 4ff48bbffe9e..886d50f27fe7 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -60,7 +60,6 @@ SND_DECLARE_FILE("$FreeBSD$"); #define FM_PLAY_DMABUF1 0x0c #define FM_PLAY_DMABUF2 0x10 - #define FM_REC_CTL 0x14 #define FM_REC_RATE_MASK 0x0f00 #define FM_REC_BUF1_LAST 0x0001 @@ -71,7 +70,6 @@ SND_DECLARE_FILE("$FreeBSD$"); #define FM_REC_16BIT 0x4000 #define FM_REC_STEREO 0x8000 - #define FM_REC_DMALEN 0x16 #define FM_REC_DMABUF1 0x18 #define FM_REC_DMABUF2 0x1c @@ -398,7 +396,6 @@ fm801ch_setspeed(kobj_t obj, void *data, u_int32_t speed) struct fm801_info *fm801 = ch->parent; int i; - for (i = 0; i < 10 && fm801_rates[i].limit <= speed; i++) ; if(ch->dir == PCMDIR_PLAY) { @@ -455,7 +452,6 @@ fm801ch_trigger(kobj_t obj, void *data, int go) if (ch->dir == PCMDIR_PLAY) { if (go == PCMTRIG_START) { - fm801->play_start = baseaddr; fm801->play_nextblk = fm801->play_start + fm801->play_blksize; fm801->play_flip = 0; diff --git a/sys/dev/sound/pci/hda/hda_reg.h b/sys/dev/sound/pci/hda/hda_reg.h index 0be933ed896d..91099caf083d 100644 --- a/sys/dev/sound/pci/hda/hda_reg.h +++ b/sys/dev/sound/pci/hda/hda_reg.h @@ -756,7 +756,6 @@ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_FUNCTION_RESET, 0x0)) - /**************************************************************************** * HDA Device Parameters ****************************************************************************/ @@ -1302,7 +1301,6 @@ (((param) & HDA_PARAM_VOLUME_KNOB_CAP_NUM_STEPS_MASK) >> \ HDA_PARAM_VOLUME_KNOB_CAP_NUM_STEPS_SHIFT) - #define HDA_CONFIG_DEFAULTCONF_SEQUENCE_MASK 0x0000000f #define HDA_CONFIG_DEFAULTCONF_SEQUENCE_SHIFT 0 #define HDA_CONFIG_DEFAULTCONF_ASSOCIATION_MASK 0x000000f0 diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 214c81a3a0c5..8eeeadce6666 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -1128,7 +1128,6 @@ hdaa_dump_amp_sb(struct sbuf *sb, uint32_t cap, const char *banner) ((step - offset) * (size + 1)) / 4); } - static int hdaa_sysctl_caps(SYSCTL_HANDLER_ARGS) { diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 0373dcd5eb9d..118410813505 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -558,7 +558,6 @@ hdac_get_capabilities(struct hdac_softc *sc) return (0); } - /**************************************************************************** * void hdac_dma_cb * @@ -577,7 +576,6 @@ hdac_dma_cb(void *callback_arg, bus_dma_segment_t *segs, int nseg, int error) } } - /**************************************************************************** * int hdac_dma_alloc * diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index c5c70e44d1a3..20cb39d2de14 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -80,7 +80,6 @@ static struct hdspe_rate rate_map[] = { { 0, 0 }, }; - static int hdspe_hw_mixer(struct sc_chinfo *ch, unsigned int dst, unsigned int src, unsigned short data) @@ -330,7 +329,6 @@ clean(struct sc_chinfo *ch) return (0); } - /* Channel interface. */ static void * hdspechan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, @@ -660,7 +658,6 @@ static kobj_method_t hdspechan_methods[] = { }; CHANNEL_DECLARE(hdspechan); - static int hdspe_pcm_probe(device_t dev) { diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 2521dacaac47..2ee8c00cd6e4 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -649,7 +649,6 @@ ich_intr(void *p) lvi += cbi + ch->blkcnt - lbi; lvi %= ICH_DTBL_LENGTH; ich_wr(sc, ch->regbase + ICH_REG_X_LVI, lvi, 1); - } /* clear status bit */ ich_wr(sc, ch->regbase + diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h index 89cbd49d90a7..e3d81890b21c 100644 --- a/sys/dev/sound/pci/ich.h +++ b/sys/dev/sound/pci/ich.h @@ -97,4 +97,3 @@ /* play/record buffer */ #define ICH_BDC_IOC 0x80000000 #define ICH_BDC_BUP 0x40000000 - diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index a45f59ff2fad..0d55e1227b9a 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -88,12 +88,10 @@ SND_DECLARE_FILE("$FreeBSD$"); #define AGG_DEFAULT_BUFSZ 0x4000 /* 0x1000, but gets underflows */ - #ifndef PCIR_BAR #define PCIR_BAR(x) (PCIR_MAPS + (x) * 4) #endif - /* ----------------------------- * Data structures. */ @@ -175,7 +173,6 @@ struct agg_info { volatile u_int8_t curpwr; /* current power status: D[0-3] */ }; - /* ----------------------------- * Sysctls for debug. */ @@ -200,7 +197,6 @@ SYSCTL_UINT(_debug_maestro, OID_AUTO, powerstate_init, CTLFLAG_RW, &powerstate_init, 0, "The Dx power state prior to the first use (0-2)"); - /* ----------------------------- * Prototypes */ @@ -266,7 +262,6 @@ static void *dma_malloc(bus_dma_tag_t, u_int32_t, bus_addr_t*, bus_dmamap_t *); static void dma_free(bus_dma_tag_t, void *, bus_dmamap_t); - /* ----------------------------- * Subsystems. */ @@ -286,7 +281,6 @@ agg_sleep(struct agg_info *sc, const char *wmesg, int msec) msleep(sc, &sc->lock, PWAIT, wmesg, timo); } - /* I/O port */ #if 0 @@ -351,7 +345,6 @@ agg_codec_wait4idle(struct agg_info *ess) return 0; } - static int agg_rdcodec(struct agg_info *ess, int regno) { @@ -582,7 +575,6 @@ agg_stopclock(struct agg_info *ess, int part, int st) } } - /* ----------------------------- * Controller. */ @@ -1227,7 +1219,6 @@ set_timer(struct agg_info *ess) wp_settimer(ess, dv); } - /* ----------------------------- * Newpcm glue. */ @@ -1266,7 +1257,6 @@ agg_ac97_write(kobj_t obj, void *sc, int regno, u_int32_t data) return ret; } - static kobj_method_t agg_ac97_methods[] = { KOBJMETHOD(ac97_init, agg_ac97_init), KOBJMETHOD(ac97_read, agg_ac97_read), @@ -1275,7 +1265,6 @@ static kobj_method_t agg_ac97_methods[] = { }; AC97_DECLARE(agg_ac97); - /* -------------------------------------------------------------------- */ /* Playback channel. */ @@ -1470,7 +1459,6 @@ aggpch_getcaps(kobj_t obj, void *data) return &playcaps; } - static kobj_method_t aggpch_methods[] = { KOBJMETHOD(channel_init, aggpch_init), KOBJMETHOD(channel_free, aggpch_free), @@ -1484,7 +1472,6 @@ static kobj_method_t aggpch_methods[] = { }; CHANNEL_DECLARE(aggpch); - /* -------------------------------------------------------------------- */ /* Recording channel. */ @@ -1624,7 +1611,6 @@ static kobj_method_t aggrch_methods[] = { }; CHANNEL_DECLARE(aggrch); - /* ----------------------------- * Bus space. */ @@ -2040,7 +2026,6 @@ agg_shutdown(device_t dev) return 0; } - static device_method_t agg_methods[] = { DEVMETHOD(device_probe, agg_probe), DEVMETHOD(device_attach, agg_attach), @@ -2048,7 +2033,6 @@ static device_method_t agg_methods[] = { DEVMETHOD(device_suspend, agg_suspend), DEVMETHOD(device_resume, agg_resume), DEVMETHOD(device_shutdown, agg_shutdown), - { 0, 0 } }; diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index cf20488e038b..77b85f20c327 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -1140,7 +1140,6 @@ m3_intr(void *p) device_printf(sc->dev, "Unknown HWVOL event\n"); } m3_wr_1(sc, HW_VOL_COUNTER_MASTER, 0x88); - } if (status & ASSP_INT_PENDING) { diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h index 7db2127f9509..5ec691ca8e8b 100644 --- a/sys/dev/sound/pci/maestro_reg.h +++ b/sys/dev/sound/pci/maestro_reg.h @@ -80,7 +80,6 @@ #define PPMI_D2 2 /* Low power */ #define PPMI_D3 3 /* Turned off */ - /* ----------------------------- * I/O ports */ @@ -212,7 +211,6 @@ #define PORT_ASSP_HOST_WR_DATA 0xaa /* BYTE RW */ #define PORT_ASSP_INT_STAT 0xac /* BYTE RW */ - /* ----------------------------- * Wave Processor Indexed Data Registers. */ @@ -250,7 +248,6 @@ #define WPREG_TIMER_ENABLE 17 #define WPREG_TIMER_START 23 - /* ----------------------------- * Audio Processing Unit. */ @@ -376,7 +373,6 @@ #define APU_DATASRC_A_SHIFT 0 #define APU_DATASRC_B_SHIFT 8 - /* ----------------------------- * Limits. */ diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h index b7fc1ade8d3e..0422e45c0066 100644 --- a/sys/dev/sound/pci/neomagic-coeff.h +++ b/sys/dev/sound/pci/neomagic-coeff.h @@ -4636,5 +4636,3 @@ coefficientSizes[] = { /* Record */ 0x0020, 0x1260, 0x0020, 0x1260, 0x0000, 0x0040, 0x1260, 0x0000, }; - - diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h index 78257c3059e5..1403b535b552 100644 --- a/sys/dev/sound/pci/neomagic.h +++ b/sys/dev/sound/pci/neomagic.h @@ -117,5 +117,4 @@ #define NM_PBUFFER_WMARK (NM_PLAYBACK_REG_OFFSET + 0xc) #define NM_PBUFFER_CURRP (NM_PLAYBACK_REG_OFFSET + 0x8) - #endif diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index abaf74be459c..6d5b833264d6 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -492,7 +492,6 @@ ess_setupch(struct ess_info *sc, int ch, int dir, int spd, u_int32_t fmt, int le /* filter cutoff */ ess_setmixer(sc, 0x72, ess_calcfilter(spd)); } - } return 0; } @@ -795,7 +794,6 @@ ess_dmapos(struct ess_info *sc, int ch) KASSERT(ch == 1 || ch == 2, ("bad ch")); if (ch == 1) { - /* * During recording, this register is known to give back * garbage if it's not quiescent while being read. That's @@ -952,7 +950,7 @@ ess_resume(device_t dev) { uint16_t ddma; struct ess_info *sc = pcm_getdevinfo(dev); - + ess_lock(sc); ddma = rman_get_start(sc->vc) | 1; pci_write_config(dev, ESS_PCI_LEGACYCONTROL, 0x805f, 2); @@ -1092,7 +1090,6 @@ static device_method_t ess_methods[] = { DEVMETHOD(device_detach, ess_detach), DEVMETHOD(device_resume, ess_resume), DEVMETHOD(device_suspend, ess_suspend), - { 0, 0 } }; @@ -1105,6 +1102,3 @@ static driver_t ess_driver = { DRIVER_MODULE(snd_solo, pci, ess_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_solo, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_solo, 1); - - - diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index f046b8a47e21..08edb53b11a0 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -450,7 +450,6 @@ tr_rdch(struct tr_chinfo *ch) cr[i]=tr_rd(tr, TR_REG_CHNBASE+(i<<2), 4); snd_mtxunlock(tr->lock); - if (tr->type == ALI_PCI_ID) ch->lba=(cr[1] & ALI_MAXADDR); else diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h index bdab0be534e3..cd832f4f51e5 100644 --- a/sys/dev/sound/pci/t4dwave.h +++ b/sys/dev/sound/pci/t4dwave.h @@ -87,7 +87,6 @@ #define TNX_CDC_RESET 0x01 #define TNX_CDC_ON (TNX_CDC_ADC1ON|TNX_CDC_DAC1ON) - #define TR_REG_STARTA 0x80 #define TR_REG_STOPA 0x84 #define TR_REG_CSPF_A 0x90 diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index e4f23ee9d84b..de8c4738666b 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -1427,7 +1427,6 @@ via_detach(device_t dev) return (0); } - static device_method_t via_methods[] = { DEVMETHOD(device_probe, via_probe), DEVMETHOD(device_attach, via_attach), diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 88f92d1277ab..04d97ba8aa8d 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -121,7 +121,6 @@ via_rd(struct via_info *via, int regno, int size) } } - static __inline void via_wr(struct via_info *via, int regno, u_int32_t data, int size) { @@ -159,7 +158,6 @@ via_waitready_codec(struct via_info *via) return 0; } - static int via_waitvalid_codec(struct via_info *via) { @@ -177,7 +175,6 @@ via_waitvalid_codec(struct via_info *via) return 0; } - static int via_write_codec(kobj_t obj, void *addr, int reg, u_int32_t val) { @@ -190,7 +187,6 @@ via_write_codec(kobj_t obj, void *addr, int reg, u_int32_t val) return 0; } - static int via_read_codec(kobj_t obj, void *addr, int reg) { @@ -467,7 +463,6 @@ via_probe(device_t dev) return ENXIO; } - static void dma_cb(void *p, bus_dma_segment_t *bds, int a, int b) { @@ -475,7 +470,6 @@ dma_cb(void *p, bus_dma_segment_t *bds, int a, int b) via->sgd_addr = bds->ds_addr; } - static int via_attach(device_t dev) { @@ -639,7 +633,6 @@ via_detach(device_t dev) return 0; } - static device_method_t via_methods[] = { DEVMETHOD(device_probe, via_probe), DEVMETHOD(device_attach, via_attach), diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 969b8dba27d8..34d62f4e15c2 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -325,7 +325,6 @@ uint32_t snd_afmt2str(uint32_t, char *, size_t); #define AFMTSTR_LEN 16 - extern int chn_latency; extern int chn_latency_profile; extern int report_soft_formats; @@ -395,7 +394,6 @@ extern int report_soft_matrix; "\037PASSTHROUGH" \ "\040EXCLUSIVE" - #define CHN_F_RESET (CHN_F_BUSY | CHN_F_DEAD | \ CHN_F_VIRTUAL | CHN_F_HAS_VCHAN | \ CHN_F_VCHAN_DYNAMIC | \ diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 9dfc47d60fb3..4df035f99c82 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -649,7 +649,6 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) } } - PCM_LOCK(d); /* @@ -2894,7 +2893,6 @@ dsp_oss_syncgroup(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_syncgr wrch->sm = smwr; } - out: if (ret != 0) { if (smrd != NULL) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 7b15c00c4170..1a53d1ba5ca1 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -473,7 +473,6 @@ feed_root(struct pcm_feeder *feeder, struct pcm_channel *ch, u_int8_t *buffer, u return l; } - offset = count - l; if (offset > 0) { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index fcce9e56075e..233f8dd212fe 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -240,7 +240,6 @@ FEEDEQ_DECLARE(U, 32, BE) feed_eq_biquad_##SIGN##BIT##ENDIAN \ } - static const struct { uint32_t format; feed_eq_t biquad; @@ -651,7 +650,6 @@ sysctl_dev_pcm_eq_preamp(SYSCTL_HANDLER_ARGS) (void)FEEDER_SET(f, FEEDEQ_PREAMP, val); CHN_UNLOCK(c); } - } PCM_RELEASE(d); diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 5e2bdbcb8471..7d965860f886 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -297,7 +297,6 @@ feed_matrix_setup(struct feed_matrix_info *info, struct pcmchan_matrix *m_in, uint32_t i, j, ch, in_mask, merge_mask; int mul, shift; - if (info == NULL || m_in == NULL || m_out == NULL || AFMT_CHANNEL(info->in) != m_in->channels || AFMT_CHANNEL(info->out) != m_out->channels || diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index bca5528a558a..88a58461b1ed 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -291,7 +291,6 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, feeder_rate_quality, __XSTRING(Z_QUALITY_MAX)"=high)"); #endif /* _KERNEL */ - /* * Resampler type. */ @@ -1081,7 +1080,7 @@ z_resampler_build_polyphase(struct z_info *info) z += info->z_dy; } } - + #ifndef _KERNEL fprintf(stderr, "Polyphase: [%d/%d] %d entries\n", info->z_gx, info->z_gy, info->z_size * info->z_gy * 2); diff --git a/sys/dev/sound/pcm/g711.h b/sys/dev/sound/pcm/g711.h index 039f5692bfbc..08c4b0e0a578 100644 --- a/sys/dev/sound/pcm/g711.h +++ b/sys/dev/sound/pcm/g711.h @@ -173,13 +173,11 @@ 171, 171, 171, 171, 170, 170, 170, 170, \ } - #define _G711_TO_INTPCM(t, v) ((intpcm_t) \ ((int8_t)((t)[(uint8_t)(v)] ^ 0x80))) #define _INTPCM_TO_G711(t, v) ((t)[(uint8_t)((v) ^ 0x80)]) - #define G711_DECLARE_TABLE(t) \ static const struct { \ const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; \ diff --git a/sys/dev/sound/pcm/intpcm.h b/sys/dev/sound/pcm/intpcm.h index f7574718f8c8..aecdee7b5c8f 100644 --- a/sys/dev/sound/pcm/intpcm.h +++ b/sys/dev/sound/pcm/intpcm.h @@ -87,7 +87,6 @@ intpcm_write_##SIGN##32##ENDIAN(uint8_t *dst, intpcm_t v) \ _PCM_WRITE_##SIGN##32##_##ENDIAN(dst, v); \ } - #define INTPCM_DECLARE(t) \ \ G711_DECLARE_TABLE(t); \ diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index bd3089d59bf9..09b0bb8ab148 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -160,7 +160,7 @@ mixer_set_softpcmvol(struct snd_mixer *m, struct snddev_info *d, dropmtx = 1; else dropmtx = 0; - + if (!(d->flags & SD_F_MPSAFE) || mtx_owned(d->lock) != 0) acquiremtx = 0; else @@ -213,7 +213,7 @@ mixer_set_eq(struct snd_mixer *m, struct snddev_info *d, dropmtx = 1; else dropmtx = 0; - + if (!(d->flags & SD_F_MPSAFE) || mtx_owned(d->lock) != 0) acquiremtx = 0; else @@ -1048,7 +1048,6 @@ mixer_open(struct cdev *i_dev, int flags, int mode, struct thread *td) struct snddev_info *d; struct snd_mixer *m; - if (i_dev == NULL || i_dev->si_drv1 == NULL) return (EBADF); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 99b35e923d47..31c4a1b14a79 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -344,7 +344,7 @@ sndstat_prepare(struct sndstat_file *pf_self) /* make sure buffer is reset */ sbuf_clear(s); - + if (snd_verbose > 0) { sbuf_printf(s, "FreeBSD Audio Driver (%ubit %d/%s)\n", (u_int)sizeof(intpcm32_t) << 3, SND_DRV_VERSION, diff --git a/sys/dev/sound/pcm/sndstat.h b/sys/dev/sound/pcm/sndstat.h index 026b37722449..b0b59c3d7ea3 100644 --- a/sys/dev/sound/pcm/sndstat.h +++ b/sys/dev/sound/pcm/sndstat.h @@ -62,7 +62,6 @@ (d->flags & SD_F_SIMPLEX)) ? " simplex" : "", \ (device_get_unit(dev) == snd_unit) ? " default" : "") - #define SNDSTAT_PREPARE_PCM_END() \ if (verbose <= 1) \ return (0); \ diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 601474190d10..299e4937f8e4 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -491,7 +491,6 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c PCM_LOCKASSERT(d); KASSERT(num >= -1, ("invalid num=%d", num)); - switch (dir) { case PCMDIR_PLAY: dirs = "play"; @@ -1163,7 +1162,7 @@ pcm_unregister(device_t dev) PCM_WAIT(d); d->flags |= SD_F_DETACHING; - + if (d->inprog != 0) { device_printf(dev, "unregister: operation in progress\n"); PCM_UNLOCK(d); @@ -1210,7 +1209,7 @@ pcm_unregister(device_t dev) /* remove /dev/sndstat entry first */ sndstat_unregister(dev); - + PCM_LOCK(d); d->flags |= SD_F_DYING; d->flags &= ~SD_F_REGISTERED; @@ -1284,7 +1283,7 @@ sound_oss_sysinfo(oss_sysinfo *si) struct snddev_info *d; struct pcm_channel *c; int i, j, ncards; - + ncards = 0; strlcpy(si->product, si_product, sizeof(si->product)); @@ -1370,7 +1369,7 @@ sound_oss_card_info(oss_card_info *si) { struct snddev_info *d; int i, ncards; - + ncards = 0; for (i = 0; pcm_devclass != NULL && diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 5730e7fa39aa..cdae5e837cdc 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -337,7 +337,6 @@ u_int32_t pcm_getflags(device_t dev); void pcm_setflags(device_t dev, u_int32_t val); void *pcm_getdevinfo(device_t dev); - int snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand, void *param, void **cookiep); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index a731968931b6..a2e25e352055 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -822,7 +822,7 @@ vchan_create(struct pcm_channel *parent, int num) d->rvchanrate = parent->speed; } } - + /* * If the parent channel supports digital format, * enable passthrough mode. diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index b149de3a93a3..01c0ce8b77c0 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -296,7 +296,6 @@ struct umidi_sub_chan { }; struct umidi_chan { - struct umidi_sub_chan sub[UMIDI_EMB_JACK_MAX]; struct mtx mtx; @@ -431,7 +430,6 @@ struct uaudio_format { }; static const struct uaudio_format uaudio10_formats[] = { - {UA_FMT_PCM8, 8, AFMT_U8, "8-bit U-LE PCM"}, {UA_FMT_PCM8, 16, AFMT_U16_LE, "16-bit U-LE PCM"}, {UA_FMT_PCM8, 24, AFMT_U24_LE, "24-bit U-LE PCM"}, @@ -444,12 +442,10 @@ static const struct uaudio_format uaudio10_formats[] = { {UA_FMT_ALAW, 8, AFMT_A_LAW, "8-bit A-Law"}, {UA_FMT_MULAW, 8, AFMT_MU_LAW, "8-bit mu-Law"}, - {0, 0, 0, NULL} }; static const struct uaudio_format uaudio20_formats[] = { - {UA20_FMT_PCM, 8, AFMT_S8, "8-bit S-LE PCM"}, {UA20_FMT_PCM, 16, AFMT_S16_LE, "16-bit S-LE PCM"}, {UA20_FMT_PCM, 24, AFMT_S24_LE, "24-bit S-LE PCM"}, @@ -462,7 +458,6 @@ static const struct uaudio_format uaudio20_formats[] = { {UA20_FMT_ALAW, 8, AFMT_A_LAW, "8-bit A-Law"}, {UA20_FMT_MULAW, 8, AFMT_MU_LAW, "8-bit mu-Law"}, - {0, 0, 0, NULL} }; @@ -1082,7 +1077,6 @@ uaudio_attach(device_t dev) } if (sc->sc_midi_chan.valid) { - if (umidi_probe(dev)) { goto detach; } @@ -1164,7 +1158,6 @@ uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, kobj_class_t chan_clas } if (sc->sc_play_chan[i].num_alt > 0 && (sc->sc_child[i].mix_info & SOUND_MASK_PCM) == 0) { - DPRINTF("software controlled main volume\n"); /* @@ -1530,7 +1523,6 @@ uaudio_record_fix_fs(usb_endpoint_descriptor_audio_t *ep, * sample rate indicates, we apply the workaround. */ if (mps > xps) { - /* allow additional data */ xps += add; @@ -1608,7 +1600,7 @@ uaudio20_check_rate(struct usb_device *udev, uint8_t iface_no, error = usbd_do_request_flags(udev, NULL, &req, data, USB_SHORT_XFER_OK, &actlen, USB_DEFAULT_TIMEOUT); - + if (error != 0 || actlen < 2) return (USB_ERR_INVAL); @@ -1694,10 +1686,8 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev, uint8_t uma_if_class; while ((desc = usb_desc_foreach(cd, desc))) { - if ((desc->bDescriptorType == UDESC_INTERFACE) && (desc->bLength >= sizeof(*id))) { - id = (void *)desc; if (id->bInterfaceNumber != lastidx) { @@ -1735,7 +1725,6 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev, if ((uma_if_class != 0) && (id->bInterfaceSubClass == UISUBCLASS_MIDISTREAM)) { - /* * XXX could allow multiple MIDI interfaces */ @@ -1878,7 +1867,6 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev, if (audio_rev >= UAUDIO_VERSION_30) { goto next_ep; } else if (audio_rev >= UAUDIO_VERSION_20) { - uint32_t dwFormat; dwFormat = UGETDW(asid.v2->bmFormats); @@ -1941,7 +1929,6 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev, (rate <= UA_SAMP_HI(asf1d.v1))) goto found_rate; } else { - for (x = 0; x < asf1d.v1->bSamFreqType; x++) { DPRINTFN(16, "Sample rate = %dHz\n", UA_GETSAMP(asf1d.v1, x)); @@ -2158,7 +2145,6 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) for (x = channels; x; x--) { for (y = bits; y; y -= 8) { - /* try user defined rate, if any */ if (rate != 0) uaudio_chan_fill_info_sub(sc, udev, rate, x, y); @@ -2228,7 +2214,7 @@ uaudio_chan_play_sync_callback(struct usb_xfer *xfer, usb_error_t error) /* auto adjust */ while (temp < (sample_rate - (sample_rate / 4))) temp *= 2; - + while (temp > (sample_rate + (sample_rate / 2))) temp /= 2; @@ -2429,7 +2415,6 @@ tr_setup: pc = usbd_xfer_get_frame(xfer, 0); while (total > 0) { - n = (ch->end - ch->cur); if (n > total) n = total; @@ -2519,7 +2504,6 @@ uaudio_chan_record_callback(struct usb_xfer *xfer, usb_error_t error) /* fill ring buffer with samples, if any */ while (len > 0) { - m = (ch->end - ch->cur); if (m > len) @@ -2936,7 +2920,6 @@ found: if (pmc != NULL && temp >= pmc->minval && temp <= pmc->maxval) { - pmc->wData[chan] = temp; pmc->update[(chan / 8)] |= (1 << (chan % 8)); @@ -2982,9 +2965,7 @@ uaudio_mixer_register_sysctl(struct uaudio_softc *sc, device_t dev, for (n = 0, pmc = sc->sc_mixer_root; pmc != NULL; pmc = pmc->next, n++) { - for (chan = 0; chan < pmc->nchan; chan++) { - if (pmc->nchan > 1) { snprintf(buf, sizeof(buf), "%s_%d_%d", pmc->name, n, chan); @@ -3053,7 +3034,6 @@ uaudio_mixer_controls_create_ftu(struct uaudio_softc *sc) for (chx = 0; chx != 8; chx++) { for (chy = 0; chy != 8; chy++) { - MIX(sc).wValue[0] = MAKE_WORD(chx + 1, chy + 1); MIX(sc).type = MIX_SIGNED_16; MIX(sc).ctl = SOUND_MIXER_NRDEVICES; @@ -3131,7 +3111,6 @@ uaudio_mixer_controls_create_ftu(struct uaudio_softc *sc) memset(&MIX(sc), 0, sizeof(MIX(sc))); MIX(sc).wIndex = MAKE_WORD(7, sc->sc_mixer_iface_no); for (chy = 0; chy != 4; chy++) { - MIX(sc).wValue[0] = MAKE_WORD(7, chy + 1); MIX(sc).type = MIX_SIGNED_16; MIX(sc).ctl = SOUND_MIXER_NRDEVICES; @@ -3243,7 +3222,6 @@ uaudio_mixer_add_ctl(struct uaudio_softc *sc, struct uaudio_mixer_node *mc) mc->maxval = 1; } else if (mc->type == MIX_SELECTOR) { } else { - /* determine min and max values */ mc->minval = uaudio_mixer_get(sc->sc_udev, @@ -3348,7 +3326,6 @@ uaudio_mixer_add_mixer(struct uaudio_softc *sc, mc++; } if ((mc == chs) && (chs <= MIX_MAX_CHAN)) { - /* repeat bit-scan */ mc = 0; @@ -3426,7 +3403,6 @@ uaudio20_mixer_add_mixer(struct uaudio_softc *sc, mc++; } if ((mc == chs) && (chs <= MIX_MAX_CHAN)) { - /* repeat bit-scan */ mc = 0; @@ -3660,7 +3636,6 @@ uaudio_mixer_add_feature(struct uaudio_softc *sc, } for (ctl = 1; ctl <= LOUDNESS_CONTROL; ctl++) { - fumask = FU_MASK(ctl); DPRINTFN(5, "ctl=%d fumask=0x%04x\n", @@ -3795,7 +3770,6 @@ uaudio20_mixer_add_feature(struct uaudio_softc *sc, } for (ctl = 3; ctl != 0; ctl <<= 2) { - mixernumber = uaudio20_mixer_determine_class(&iot[id]); switch (ctl) { @@ -3990,7 +3964,6 @@ uaudio_mixer_add_extension(struct uaudio_softc *sc, return; } if (d1->bmControls[0] & UA_EXT_ENABLE_MASK) { - memset(&MIX(sc), 0, sizeof(MIX(sc))); MIX(sc).wIndex = MAKE_WORD(d0->bUnitId, sc->sc_mixer_iface_no); @@ -4469,7 +4442,6 @@ struct uaudio_tt_to_feature { }; static const struct uaudio_tt_to_feature uaudio_tt_to_feature[] = { - {UATI_MICROPHONE, SOUND_MIXER_MIC}, {UATI_DESKMICROPHONE, SOUND_MIXER_MIC}, {UATI_PERSONALMICROPHONE, SOUND_MIXER_MIC}, @@ -4675,7 +4647,6 @@ uaudio_mixer_find_inputs_sub(struct uaudio_terminal_node *root, uint8_t i; for (n = 0; n < n_id; n++) { - i = p_id[n]; if (info->recurse_level == UAUDIO_RECURSE_LIMIT) { @@ -4753,7 +4724,6 @@ uaudio20_mixer_find_inputs_sub(struct uaudio_terminal_node *root, uint8_t i; for (n = 0; n < n_id; n++) { - i = p_id[n]; if (info->recurse_level == UAUDIO_RECURSE_LIMIT) { @@ -4847,7 +4817,6 @@ uaudio20_mixer_find_clocks_sub(struct uaudio_terminal_node *root, top: for (n = 0; n < n_id; n++) { - i = p_id[n]; if (info->recurse_level == UAUDIO_RECURSE_LIMIT) { @@ -4971,7 +4940,6 @@ uaudio_mixer_fill_info(struct uaudio_softc *sc, M_WAITOK | M_ZERO); while ((desc = usb_desc_foreach(cd, desc))) { - dp = desc; if (dp->bLength > wTotalLen) { @@ -5044,7 +5012,6 @@ uaudio_mixer_fill_info(struct uaudio_softc *sc, if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { continue; } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { - switch (dp->bDescriptorSubtype) { case UDESCSUB_AC_HEADER: DPRINTF("unexpected AC header\n"); @@ -5224,7 +5191,6 @@ tr_setup: } while (mc) { while (sc->sc_mixer_chan < mc->nchan) { - chan = sc->sc_mixer_chan; sc->sc_mixer_chan++; @@ -5235,7 +5201,6 @@ tr_setup: mc->update[chan / 8] &= ~(1 << (chan % 8)); if (update) { - req.bmRequestType = UT_WRITE_CLASS_INTERFACE; USETW(req.wValue, mc->wValue[chan]); USETW(req.wIndex, mc->wIndex); @@ -5350,7 +5315,6 @@ uaudio_mixer_bsd2value(struct uaudio_mixer_node *mc, int val) if (mc->type == MIX_ON_OFF) { val = (val != 0); } else if (mc->type != MIX_SELECTOR) { - /* compute actual volume */ val = (val * mc->mul) / 100; @@ -5391,7 +5355,6 @@ uaudio_mixer_init(struct uaudio_softc *sc, unsigned index) if (index != 0) return; for (mc = sc->sc_mixer_root; mc; mc = mc->next) { - if (mc->ctl != SOUND_MIXER_NRDEVICES) { /* * Set device mask bits. See @@ -5401,7 +5364,6 @@ uaudio_mixer_init(struct uaudio_softc *sc, unsigned index) } if ((mc->ctl == SOUND_MIXER_NRDEVICES) && (mc->type == MIX_SELECTOR)) { - for (i = mc->minval; (i > 0) && (i <= mc->maxval); i++) { if (mc->slctrtype[i - 1] == SOUND_MIXER_NRDEVICES) continue; @@ -5486,10 +5448,8 @@ uaudio_mixer_setrecsrc(struct uaudio_softc *sc, struct snd_mixer *m, uint32_t sr if (index != 0) return (0); for (mc = sc->sc_mixer_root; mc; mc = mc->next) { - if ((mc->ctl == SOUND_MIXER_NRDEVICES) && (mc->type == MIX_SELECTOR)) { - /* compute selector mask */ mask = 0; @@ -5545,7 +5505,6 @@ umidi_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) pc = usbd_xfer_get_frame(xfer, 0); while (actlen >= 4) { - /* copy out the MIDI data */ usbd_copy_out(pc, pos, buf, 4); /* command length */ @@ -5560,7 +5519,6 @@ umidi_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) if ((cmd_len != 0) && (cn < chan->max_emb_jack) && (sub->read_open != 0)) { - /* Send data to the application */ usb_fifo_put_data_linear( sub->fifo.fp[USB_FIFO_RX], @@ -5757,7 +5715,6 @@ tr_setup: pc = usbd_xfer_get_frame(xfer, 0); while (1) { - /* round robin de-queueing */ sub = &chan->sub[chan->curr_cable]; @@ -5770,14 +5727,12 @@ tr_setup: } if (actlen) { - tr_any = 1; DPRINTF("byte=0x%02x from FIFO %u\n", buf, (unsigned int)chan->curr_cable); if (umidi_convert_to_usb(sub, chan->curr_cable, buf)) { - DPRINTF("sub=0x%02x 0x%02x 0x%02x 0x%02x\n", sub->temp_cmd[0], sub->temp_cmd[1], sub->temp_cmd[2], sub->temp_cmd[3]); @@ -5947,7 +5902,6 @@ umidi_close(struct usb_fifo *fifo, int fflags) } } - static int umidi_ioctl(struct usb_fifo *fifo, u_long cmd, void *data, int fflags) @@ -6035,7 +5989,6 @@ umidi_probe(device_t dev) } for (n = 0; n < chan->max_emb_jack; n++) { - sub = &chan->sub[n]; error = usb_fifo_attach(sc->sc_udev, chan, &chan->mtx, @@ -6118,7 +6071,6 @@ uaudio_hid_rx_callback(struct usb_xfer *xfer, usb_error_t error) (sc->sc_hid.mute_id == id) && hid_get_data(buffer, actlen, &sc->sc_hid.mute_loc)) { - DPRINTF("Mute toggle\n"); mixer_hwvol_mute_locked(m); @@ -6128,7 +6080,6 @@ uaudio_hid_rx_callback(struct usb_xfer *xfer, usb_error_t error) (sc->sc_hid.volume_up_id == id) && hid_get_data(buffer, actlen, &sc->sc_hid.volume_up_loc)) { - DPRINTF("Volume Up\n"); mixer_hwvol_step_locked(m, 1, 1); @@ -6138,7 +6089,6 @@ uaudio_hid_rx_callback(struct usb_xfer *xfer, usb_error_t error) (sc->sc_hid.volume_down_id == id) && hid_get_data(buffer, actlen, &sc->sc_hid.volume_down_loc)) { - DPRINTF("Volume Down\n"); mixer_hwvol_step_locked(m, -1, -1); diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 916d90a17402..9c4666c41bba 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ - #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h" #endif @@ -190,7 +189,6 @@ static kobj_method_t ua_mixer_methods[] = { MIXER_DECLARE(ua_mixer); /************************************************************/ - static int ua_probe(device_t dev) { diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h index 13ebf06c9d6b..39fd2a7c0299 100644 --- a/sys/dev/sound/usb/uaudioreg.h +++ b/sys/dev/sound/usb/uaudioreg.h @@ -352,7 +352,6 @@ struct usb_audio_extension_unit_1 { #define UATF_MULTITRACK 0x0712 #define UATF_SYNTHESIZER 0x0713 - #define SET_CUR 0x01 #define GET_CUR 0x81 #define SET_MIN 0x02 |