diff options
| author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:35 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:35 +0000 |
| commit | d281074565525b1dfa00c6fad20aa0005b0a7867 (patch) | |
| tree | a2ebd09ce98a8b00d2a186ca988a9440e10b3744 /sys | |
| parent | e1b0aaaa7646122022e6179a0b6406809f2126b8 (diff) | |
| download | FreeBSD-src-d281074565525b1dfa00c6fad20aa0005b0a7867.zip FreeBSD-src-d281074565525b1dfa00c6fad20aa0005b0a7867.tar.gz | |
soundcard.c:
Update for changes in the callout interface.
sequencer.c:
Add a paren that seems to have gone missing.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/isa/sound/sequencer.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/sound/soundcard.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c index ea049a6..bf50bd7 100644 --- a/sys/i386/isa/sound/sequencer.c +++ b/sys/i386/isa/sound/sequencer.c @@ -1957,7 +1957,7 @@ sequencer_init (long mem_start) int sequencer_poll (int dev, struct fileinfo *file, int events, select_table * wait) { - return (events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLHUP); + return (events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLHUP)); } #endif diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 0c57ee5..95eefb9 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.c,v 1.52 1997/07/20 11:58:40 bde Exp $ + * $Id: soundcard.c,v 1.53 1997/09/14 03:12:54 peter Exp $ */ #include <i386/isa/sound/sound_config.h> @@ -46,6 +46,7 @@ } static int timer_running = 0; +static struct callout_handle timer_ch; static int soundcards_installed = 0; /* Number of installed * soundcards */ @@ -488,7 +489,7 @@ request_sound_timer (int count) if (!count) count = 1; - timeout (sequencer_timer, 0, count); + timer_ch = timeout (sequencer_timer, 0, count); } timer_running = 1; } @@ -497,7 +498,7 @@ void sound_stop_timer (void) { if (timer_running) - untimeout (sequencer_timer, 0); + untimeout (sequencer_timer, 0, timer_ch); timer_running = 0; } #endif |
