diff options
author | archie <archie@FreeBSD.org> | 1998-12-07 21:58:50 +0000 |
---|---|---|
committer | archie <archie@FreeBSD.org> | 1998-12-07 21:58:50 +0000 |
commit | 60d13c7a9dd18f720483338ebef03609492ca98c (patch) | |
tree | 5709d8cdab99e3c1cb9ae7c2117627c1031fdf39 /sys/i386/isa/sound | |
parent | 2f8d013d96c256b3a48e227aab238e53eb9304cf (diff) | |
download | FreeBSD-src-60d13c7a9dd18f720483338ebef03609492ca98c.zip FreeBSD-src-60d13c7a9dd18f720483338ebef03609492ca98c.tar.gz |
The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static
and local variables, goto labels, and functions declared but not defined.
Diffstat (limited to 'sys/i386/isa/sound')
-rw-r--r-- | sys/i386/isa/sound/ad1848.c | 1 | ||||
-rw-r--r-- | sys/i386/isa/sound/dmabuf.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/sound/patmgr.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/sound/sb16_dsp.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/sound/sb_dsp.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/sound/sequencer.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/sound/soundcard.c | 1 | ||||
-rw-r--r-- | sys/i386/isa/sound/sscape.c | 11 |
8 files changed, 10 insertions, 16 deletions
diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c index 08b0a1e..243ed78 100644 --- a/sys/i386/isa/sound/ad1848.c +++ b/sys/i386/isa/sound/ad1848.c @@ -914,7 +914,6 @@ ad1848_start_input(int dev, u_long buf, int count, static int ad1848_prepare_for_IO(int dev, int bsize, int bcount) { - int timeout; u_char fs, old_fs; u_long flags; ad1848_info *devc = (ad1848_info *) audio_devs[dev]->devc; diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c index 613e30b..76494ad 100644 --- a/sys/i386/isa/sound/dmabuf.c +++ b/sys/i386/isa/sound/dmabuf.c @@ -331,7 +331,6 @@ static int dma_sync(int dev) { u_long flags; - int i = 0; if (!audio_devs[dev]->go && (!audio_devs[dev]->enable_bits & PCM_ENABLE_OUTPUT)) return 0; @@ -1155,8 +1154,6 @@ DMAbuf_outputintr(int dev, int event_type) if (dmap->mapping_flags & DMA_MAP_MAPPED) { /* mmapped access */ - int p = dmap->fragment_size * dmap->qhead; - dmap->qhead = (dmap->qhead + 1) % dmap->nbufs; dmap->qlen++; /* Yes increment it (don't decrement) */ dmap->flags &= ~DMA_ACTIVE; diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c index 60f0ed6..752b2e9 100644 --- a/sys/i386/isa/sound/patmgr.c +++ b/sys/i386/isa/sound/patmgr.c @@ -181,7 +181,7 @@ pmgr_access(int dev, struct patmgr_info * rec) if (mbox[dev]) printf(" PATMGR: Server %d mbox full. Why?\n", dev); else { - int flag, chn; + int chn; rec->key = PM_K_COMMAND; mbox[dev] = rec; @@ -235,7 +235,7 @@ pmgr_inform(int dev, int event, u_long p1, u_long p2, u_long p3, u_long p4) if (mbox[dev]) printf(" PATMGR: Server %d mbox full. Why?\n", dev); else { - int flag, chn; + int chn; mbox[dev] = tmp_mbox; mbox[dev]->key = PM_K_EVENT; diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c index f94675b..e923176 100644 --- a/sys/i386/isa/sound/sb16_dsp.c +++ b/sys/i386/isa/sound/sb16_dsp.c @@ -197,8 +197,6 @@ sb16_dsp_ioctl(int dev, u_int cmd, ioctl_arg arg, int local) static int sb16_dsp_open(int dev, int mode) { - int retval; - DEB(printf("sb16_dsp_open()\n")); if (!sb16_dsp_ok) { diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c index 7d48ec8..2facd33 100644 --- a/sys/i386/isa/sound/sb_dsp.c +++ b/sys/i386/isa/sound/sb_dsp.c @@ -539,8 +539,6 @@ sb_dsp_halt_xfer(int dev) static int sb_dsp_open(int dev, int mode) { - int retval; - if (!sb_dsp_ok) { printf("SB Error: SoundBlaster board not installed\n"); return -(ENXIO); diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c index 3639cf6..4990774 100644 --- a/sys/i386/isa/sound/sequencer.c +++ b/sys/i386/isa/sound/sequencer.c @@ -157,7 +157,7 @@ sequencer_read(int dev, struct fileinfo * file, snd_rw_buf * buf, int count) flags = splhigh(); if (!iqlen) { - int flag, chn; + int chn; midi_sleeper = &chn; diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 4272b15..e490541 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -147,7 +147,6 @@ get_time(void) static int sndmmap( dev_t dev, int offset, int nprot ) { - int unit; struct dma_buffparms * dmap; dev = minor(dev) >> 4; diff --git a/sys/i386/isa/sound/sscape.c b/sys/i386/isa/sound/sscape.c index bfd5abe..28ef044 100644 --- a/sys/i386/isa/sound/sscape.c +++ b/sys/i386/isa/sound/sscape.c @@ -292,7 +292,6 @@ void sscapeintr(int irq) { u_char bits, tmp; - static int debug = 0; DEB(printf("sscapeintr(0x%02x)\n", (bits = sscape_read(devc, GA_INTSTAT_REG)))); if ((sscape_sleep_flag.mode & WK_SLEEP)) { @@ -304,6 +303,8 @@ sscapeintr(int irq) } #if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI) if (bits & 0x01) { + static int debug = 0; + mpuintr(irq); if (debug++ > 10) { /* Temporary debugging hack */ sscape_write(devc, GA_INTENA_REG, 0x00); /* Disable all interr. */ @@ -454,7 +455,6 @@ sscape_download_boot(struct sscape_info * devc, u_char *block, int size, int fla done = 0; timeout_val = 100; while (!done && timeout_val-- > 0) { - int resid; int chn; sscape_sleeper = &chn; DO_SLEEP(chn, sscape_sleep_flag, 1); @@ -733,6 +733,8 @@ sscape_audio_reset(int dev) sscape_audio_halt(dev); } + +#if !defined(EXCLUDE_NATIVE_PCM) && defined(CONFIG_AUDIO) static struct audio_operations sscape_audio_operations = { "Not functional", @@ -751,14 +753,13 @@ static struct audio_operations sscape_audio_operations = NULL, NULL }; +#endif /* !defined(EXCLUDE_NATIVE_PCM) && defined(CONFIG_AUDIO) */ static int sscape_detected = 0; void attach_sscape(struct address_info * hw_config) { - int my_dev; - #ifndef SSCAPE_REGS /* * Config register values for Spea/V7 Media FX and Ensoniq S-2000. @@ -877,6 +878,8 @@ attach_sscape(struct address_info * hw_config) #ifdef CONFIG_AUDIO if (num_audiodevs < MAX_AUDIO_DEV) { + int my_dev; + audio_devs[my_dev = num_audiodevs++] = &sscape_audio_operations; audio_devs[my_dev]->dmachan1 = hw_config->dma; audio_devs[my_dev]->buffsize = DSP_BUFFSIZE; |