26c26
< * $FreeBSD: head/sys/dev/sound/pcm/vchan.h 139749 2005-01-06 01:43:34Z imp $
---
> * $FreeBSD: head/sys/dev/sound/pcm/vchan.h 170161 2007-05-31 18:43:33Z ariff $
29c29
< int vchan_create(struct pcm_channel *parent);
---
> int vchan_create(struct pcm_channel *parent, int num);
32a33,38
> /*
> * Default speed / format
> */
> #define VCHAN_DEFAULT_SPEED 48000
> #define VCHAN_DEFAULT_AFMT (AFMT_S16_LE | AFMT_STEREO)
> #define VCHAN_DEFAULT_STRFMT "s16le"
33a40,52
> #define VCHAN_PLAY 0
> #define VCHAN_REC 1
>
> /*
> * Offset by +/- 1 so we can distinguish bogus pointer.
> */
> #define VCHAN_SYSCTL_DATA(x, y) \
> ((void *)((intptr_t)(((((x) + 1) & 0xfff) << 2) | \
> (((VCHAN_##y) + 1) & 0x3))))
>
> #define VCHAN_SYSCTL_DATA_SIZE sizeof(void *)
> #define VCHAN_SYSCTL_UNIT(x) ((int)(((intptr_t)(x) >> 2) & 0xfff) - 1)
> #define VCHAN_SYSCTL_DIR(x) ((int)((intptr_t)(x) & 0x3) - 1)
< * $FreeBSD: head/sys/dev/sound/pcm/vchan.h 139749 2005-01-06 01:43:34Z imp $
---
> * $FreeBSD: head/sys/dev/sound/pcm/vchan.h 170161 2007-05-31 18:43:33Z ariff $
29c29
< int vchan_create(struct pcm_channel *parent);
---
> int vchan_create(struct pcm_channel *parent, int num);
32a33,38
> /*
> * Default speed / format
> */
> #define VCHAN_DEFAULT_SPEED 48000
> #define VCHAN_DEFAULT_AFMT (AFMT_S16_LE | AFMT_STEREO)
> #define VCHAN_DEFAULT_STRFMT "s16le"
33a40,52
> #define VCHAN_PLAY 0
> #define VCHAN_REC 1
>
> /*
> * Offset by +/- 1 so we can distinguish bogus pointer.
> */
> #define VCHAN_SYSCTL_DATA(x, y) \
> ((void *)((intptr_t)(((((x) + 1) & 0xfff) << 2) | \
> (((VCHAN_##y) + 1) & 0x3))))
>
> #define VCHAN_SYSCTL_DATA_SIZE sizeof(void *)
> #define VCHAN_SYSCTL_UNIT(x) ((int)(((intptr_t)(x) >> 2) & 0xfff) - 1)
> #define VCHAN_SYSCTL_DIR(x) ((int)((intptr_t)(x) & 0x3) - 1)