mega-commit.

this introduces a new buffering mechanism which results in dramatic
simplification of the channel manager.

as several structures have changed, we take the opportunity to move their
definitions into the source files where they are used, make them private and
de-typedef them.

the sound drivers are updated to use snd_setup_intr instead of
bus_setup_intr, and to comply with the de-typedefed structures.

the ac97, mixer and channel layers have been updated with finegrained
locking, as have some drivers- not all though.  the rest will follow soon.

1 files changed, 36 insertions, 30 deletions

diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 1d7af27..bfa9aba 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -105,20 +105,20 @@ cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m)
 }
 
 static void
-feeder_destroy(pcm_feeder *f)
+feeder_destroy(struct pcm_feeder *f)
 {
 	FEEDER_FREE(f);
 	free(f->desc, M_FEEDER);
 	kobj_delete((kobj_t)f, M_FEEDER);
 }
 
-static pcm_feeder *
+static struct pcm_feeder *
 feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc)
 {
-	pcm_feeder *f;
+	struct pcm_feeder *f;
 	int err;
 
-	f = (pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_WAITOK | M_ZERO);
+	f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_WAITOK | M_ZERO);
 	f->align = fc->align;
 	f->desc = malloc(sizeof(*(f->desc)), M_FEEDER, M_WAITOK | M_ZERO);
 	if (desc)
@@ -155,9 +155,9 @@ feeder_getclass(struct pcm_feederdesc *desc)
 }
 
 int
-chn_addfeeder(pcm_channel *c, struct feeder_class *fc, struct pcm_feederdesc *desc)
+chn_addfeeder(struct pcm_channel *c, struct feeder_class *fc, struct pcm_feederdesc *desc)
 {
-	pcm_feeder *nf;
+	struct pcm_feeder *nf;
 
 	nf = feeder_create(fc, desc);
 	if (nf == NULL)
@@ -176,9 +176,9 @@ chn_addfeeder(pcm_channel *c, struct feeder_class *fc, struct pcm_feederdesc *de
 }
 
 int
-chn_removefeeder(pcm_channel *c)
+chn_removefeeder(struct pcm_channel *c)
 {
-	pcm_feeder *f;
+	struct pcm_feeder *f;
 
 	if (c->feeder == NULL)
 		return -1;
@@ -188,10 +188,10 @@ chn_removefeeder(pcm_channel *c)
 	return 0;
 }
 
-pcm_feeder *
-chn_findfeeder(pcm_channel *c, u_int32_t type)
+struct pcm_feeder *
+chn_findfeeder(struct pcm_channel *c, u_int32_t type)
 {
-	pcm_feeder *f;
+	struct pcm_feeder *f;
 
 	f = c->feeder;
 	while (f != NULL) {
@@ -203,7 +203,7 @@ chn_findfeeder(pcm_channel *c, u_int32_t type)
 }
 
 static int
-chainok(pcm_feeder *test, pcm_feeder *stop)
+chainok(struct pcm_feeder *test, struct pcm_feeder *stop)
 {
 	u_int32_t visited[MAXFEEDERS / 32];
 	u_int32_t idx, mask;
@@ -225,11 +225,11 @@ chainok(pcm_feeder *test, pcm_feeder *stop)
 	return 1;
 }
 
-static pcm_feeder *
-feeder_fmtchain(u_int32_t *to, pcm_feeder *source, pcm_feeder *stop, int maxdepth)
+static struct pcm_feeder *
+feeder_fmtchain(u_int32_t *to, struct pcm_feeder *source, struct pcm_feeder *stop, int maxdepth)
 {
 	struct feedertab_entry *fte;
-	pcm_feeder *try, *ret;
+	struct pcm_feeder *try, *ret;
 	struct pcm_feederdesc trydesc;
 
 	/* printf("trying %s...\n", source->name); */
@@ -266,9 +266,9 @@ feeder_fmtchain(u_int32_t *to, pcm_feeder *source, pcm_feeder *stop, int maxdept
 }
 
 u_int32_t
-chn_fmtchain(pcm_channel *c, u_int32_t *to)
+chn_fmtchain(struct pcm_channel *c, u_int32_t *to)
 {
-	pcm_feeder *try, *stop;
+	struct pcm_feeder *try, *stop;
 	int max;
 
 	stop = c->feeder;
@@ -306,21 +306,27 @@ chn_fmtchain(pcm_channel *c, u_int32_t *to)
 /*****************************************************************************/
 
 static int
-feed_root(pcm_feeder *feeder, pcm_channel *ch, u_int8_t *buffer, u_int32_t count, struct uio *stream)
+feed_root(struct pcm_feeder *feeder, struct pcm_channel *ch, u_int8_t *buffer, u_int32_t count, void *source)
 {
-	int ret, s;
+	struct snd_dbuf *src = source;
+	int l;
+	u_int8_t x;
 
-	KASSERT(count, ("feed_root: count == 0"));
-	count &= ~((1 << ch->align) - 1);
-	KASSERT(count, ("feed_root: aligned count == 0 (align = %d)", ch->align));
+	KASSERT(count > 0, ("feed_root: count == 0"));
+	/* count &= ~((1 << ch->align) - 1); */
+	KASSERT(count > 0, ("feed_root: aligned count == 0 (align = %d)", ch->align));
 
-	s = spltty();
-	count = min(count, stream->uio_resid);
-	if (count) {
-		ret = uiomove(buffer, count, stream);
-		KASSERT(ret == 0, ("feed_root: uiomove failed (%d)", ret));
-	}
-	splx(s);
+	l = min(count, sndbuf_getready(src));
+	sndbuf_dispose(src, buffer, l);
+
+/*
+	if (l < count)
+		printf("appending %d bytes\n", count - l);
+*/
+
+	x = (sndbuf_getfmt(src) & AFMT_SIGNED)? 0 : 0x80;
+	while (l < count)
+		buffer[l++] = x;
 
 	return count;
 }
@@ -332,7 +338,7 @@ static kobj_method_t feeder_root_methods[] = {
 static struct feeder_class feeder_root_class = {
 	name:		"feeder_root",
 	methods:	feeder_root_methods,
-	size:		sizeof(pcm_feeder),
+	size:		sizeof(struct pcm_feeder),
 	align:		0,
 	desc:		NULL,
 	data:		NULL,