Deleted Added
full compact
26c26
< * $FreeBSD: head/sys/dev/sound/pcm/channel.h 170521 2007-06-11 00:49:46Z ariff $
---
> * $FreeBSD: head/sys/dev/sound/pcm/channel.h 170815 2007-06-16 03:37:28Z ariff $
95a96,99
> * For interrupt manipulations.
> */
> struct cv intr_cv;
> /**
201a206,215
> #define CHN_BUF_PARENT(x, y) \
> (((x) != NULL && (x)->parentchannel != NULL && \
> (x)->parentchannel->bufhard != NULL) ? \
> (x)->parentchannel->bufhard : (y))
>
> #define CHN_BROADCAST(x) do { \
> if ((x)->cv_waiters != 0) \
> cv_broadcastpri(x, PRIBIO); \
> } while(0)
>
318,319c332,336
< #define CHN_F_RESET (CHN_F_BUSY | CHN_F_DEAD | \
< CHN_F_HAS_VCHAN | CHN_F_VIRTUAL)
---
> #define CHN_F_RESET (CHN_F_BUSY | CHN_F_DEAD | \
> CHN_F_HAS_VCHAN | CHN_F_VIRTUAL)
>
> #define CHN_F_MMAP_INVALID (CHN_F_DEAD | CHN_F_RUNNING)
>
338a356,364
> #define CHN_STARTED(c) ((c)->flags & CHN_F_TRIGGERED)
> #define CHN_STOPPED(c) (!CHN_STARTED(c))
> #define CHN_DIRSTR(c) (((c)->direction == PCMDIR_PLAY) ? \
> "PCMDIR_PLAY" : "PCMDIR_REC")
>
> #define CHN_TIMEOUT 5
> #define CHN_TIMEOUT_MIN 1
> #define CHN_TIMEOUT_MAX 10
>