summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/pcm/channel.c
diff options
context:
space:
mode:
authorcg <cg@FreeBSD.org>2001-08-23 11:30:52 +0000
committercg <cg@FreeBSD.org>2001-08-23 11:30:52 +0000
commit2cfb90cc8dc9d8f8ae1f12afed63cf0409ed6dd2 (patch)
tree069cd9e58d47e13e77afc32cbb02b958a6dbc95e /sys/dev/sound/pcm/channel.c
parent1a36f4817c302232acb54087dddcd1d1f4c6a36f (diff)
downloadFreeBSD-src-2cfb90cc8dc9d8f8ae1f12afed63cf0409ed6dd2.zip
FreeBSD-src-2cfb90cc8dc9d8f8ae1f12afed63cf0409ed6dd2.tar.gz
many changes:
* add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
Diffstat (limited to 'sys/dev/sound/pcm/channel.c')
-rw-r--r--sys/dev/sound/pcm/channel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 9d9fa8f..6f4893a 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -23,14 +23,14 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#include <dev/sound/pcm/sound.h>
#include "feeder_if.h"
+SND_DECLARE_FILE("$FreeBSD$");
+
#define MIN_CHUNK_SIZE 256 /* for uiomove etc. */
#define DMA_ALIGN_THRESHOLD 4
#define DMA_ALIGN_MASK (~(DMA_ALIGN_THRESHOLD - 1))
@@ -276,7 +276,7 @@ chn_write(struct pcm_channel *c, struct uio *buf)
if (count <= 0) {
c->flags |= CHN_F_DEAD;
- device_printf(c->parentsnddev->dev, "play interrupt timeout, channel dead\n");
+ printf("play interrupt timeout, channel dead\n", c->name);
}
return ret;
@@ -396,7 +396,7 @@ chn_read(struct pcm_channel *c, struct uio *buf)
if (count <= 0) {
c->flags |= CHN_F_DEAD;
- device_printf(c->parentsnddev->dev, "record interrupt timeout, channel dead\n");
+ printf("%s record interrupt timeout, channel dead\n", c->name);
}
return ret;
OpenPOWER on IntegriCloud