summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/sound/isa/sb.c1
-rw-r--r--sys/dev/sound/isa/sb16.c1
-rw-r--r--sys/dev/sound/isa/sb8.c1
-rw-r--r--sys/dev/sound/pcm/channel.c11
4 files changed, 5 insertions, 9 deletions
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c
index 3d39c63..622df44 100644
--- a/sys/dev/sound/isa/sb.c
+++ b/sys/dev/sound/isa/sb.c
@@ -1015,7 +1015,6 @@ sbmix_set(snd_mixer *m, unsigned dev, unsigned left, unsigned right)
default:
return -1;
- /* XXX how about the SG NX Pro, iomap = sgnxpro_mix */
}
/* Change left channel */
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 3d39c63..622df44 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -1015,7 +1015,6 @@ sbmix_set(snd_mixer *m, unsigned dev, unsigned left, unsigned right)
default:
return -1;
- /* XXX how about the SG NX Pro, iomap = sgnxpro_mix */
}
/* Change left channel */
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 3d39c63..622df44 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -1015,7 +1015,6 @@ sbmix_set(snd_mixer *m, unsigned dev, unsigned left, unsigned right)
default:
return -1;
- /* XXX how about the SG NX Pro, iomap = sgnxpro_mix */
}
/* Change left channel */
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 48d2085..665e5b2 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -317,7 +317,7 @@ chn_wrintr(pcm_channel *c)
*/
if (chn_wrfeed(c) > 0) {
chn_dmawakeup(c);
- while(chn_wrfeed(c) > 0);
+ while (chn_wrfeed(c) > 0);
}
start = (b->rl >= DMA_ALIGN_THRESHOLD && !(c->flags & CHN_F_ABORTING));
}
@@ -327,13 +327,12 @@ chn_wrintr(pcm_channel *c)
if (c->flags & CHN_F_MAPPED) l = c->blocksize;
else l = min(b->rl, c->blocksize) & DMA_ALIGN_MASK;
/*
- * check if we need to reprogram the DMA on the sound card.
- * This happens if the size has changed from zero
- *
- */
+ * check if we need to reprogram the DMA on the sound card.
+ * This happens if the size has changed from zero
+ */
if (b->dl == 0) {
/* Start DMA operation */
- b->dl = c->blocksize ; /* record new transfer size */
+ b->dl = c->blocksize; /* record new transfer size */
chn_trigger(c, PCMTRIG_START);
}
if (b->dl != l)
OpenPOWER on IntegriCloud