28a29
> #include <dev/sound/version.h>
33c34
< SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/sndstat.c 170289 2007-06-04 18:25:08Z dwmalone $");
---
> SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/sndstat.c 170815 2007-06-16 03:37:28Z ariff $");
48d48
< .d_flags = D_NEEDGIANT,
140,141d139
< int error;
<
153,159d150
< error = ENXIO;
< goto out;
< }
< sndstat_bufptr = 0;
< error = (sndstat_prepare(&sndstat_sbuf) > 0) ? 0 : ENOMEM;
< out:
< if (error) {
161d151
< SNDSTAT_FLUSH();
163a154
> return ENXIO;
165c156,157
< return (error);
---
> sndstat_bufptr = 0;
> return 0;
203a196,205
> if (sndstat_bufptr == 0) {
> err = (sndstat_prepare(&sndstat_sbuf) > 0) ? 0 : ENOMEM;
> if (err) {
> mtx_lock(&sndstat_lock);
> SNDSTAT_FLUSH();
> mtx_unlock(&sndstat_lock);
> return err;
> }
> }
>
350a353
> struct snddev_info *d;
353,354c356,357
< sbuf_printf(s, "FreeBSD Audio Driver (newpcm: %ubit)\n",
< (unsigned int)sizeof(intpcm_t) << 3);
---
> sbuf_printf(s, "FreeBSD Audio Driver (newpcm: %ubit %d/%s)\n",
> (u_int)sizeof(intpcm_t) << 3, SND_DRV_VERSION, MACHINE_ARCH);
367a371,375
> d = device_get_softc(ent->dev);
> if (!PCM_REGISTERED(d))
> continue;
> /* XXX Need Giant magic entry ??? */
> PCM_ACQUIRE_QUICK(d);
370c378,379
< sbuf_printf(s, " %s", ent->str);
---
> sbuf_printf(s, " %s [%s]", ent->str,
> (d->flags & SD_F_MPSAFE) ? "MPSAFE" : "GIANT");
375a385
> PCM_RELEASE_QUICK(d);