Deleted Added
full compact
sound.c (107237) sound.c (107285)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 17 unchanged lines hidden (view full) ---

26 */
27
28#include <dev/sound/pcm/sound.h>
29#include <dev/sound/pcm/vchan.h>
30#include <sys/sysctl.h>
31
32#include "feeder_if.h"
33
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 17 unchanged lines hidden (view full) ---

26 */
27
28#include <dev/sound/pcm/sound.h>
29#include <dev/sound/pcm/vchan.h>
30#include <sys/sysctl.h>
31
32#include "feeder_if.h"
33
34SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/sound.c 107237 2002-11-25 17:17:43Z cg $");
34SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/sound.c 107285 2002-11-26 18:16:27Z cg $");
35
36struct snddev_channel {
37 SLIST_ENTRY(snddev_channel) link;
38 struct pcm_channel *channel;
39};
40
41struct snddev_info {
42 SLIST_HEAD(, snddev_channel) channels;
43 struct pcm_channel *fakechan;
44 unsigned devcount, playcount, reccount, vchancount;
45 unsigned flags;
46 int inprog;
47 unsigned int bufsz;
48 void *devinfo;
49 device_t dev;
50 char status[SND_STATUSLEN];
51 struct sysctl_ctx_list sysctl_tree;
52 struct sysctl_oid *sysctl_tree_top;
35
36struct snddev_channel {
37 SLIST_ENTRY(snddev_channel) link;
38 struct pcm_channel *channel;
39};
40
41struct snddev_info {
42 SLIST_HEAD(, snddev_channel) channels;
43 struct pcm_channel *fakechan;
44 unsigned devcount, playcount, reccount, vchancount;
45 unsigned flags;
46 int inprog;
47 unsigned int bufsz;
48 void *devinfo;
49 device_t dev;
50 char status[SND_STATUSLEN];
51 struct sysctl_ctx_list sysctl_tree;
52 struct sysctl_oid *sysctl_tree_top;
53 void *lock;
53 struct mtx *lock;
54};
55
56devclass_t pcm_devclass;
57
58int pcm_veto_load = 1;
59
60#ifdef USING_DEVFS
61int snd_unit = 0;

--- 846 unchanged lines hidden ---
54};
55
56devclass_t pcm_devclass;
57
58int pcm_veto_load = 1;
59
60#ifdef USING_DEVFS
61int snd_unit = 0;

--- 846 unchanged lines hidden ---