d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move machine dependant AFMT_* definition from sound.h

Browse Source 
to global soundcard.h .
This commit is contained in:
Ariff Abdullah 2009-06-10 03:56:24 +00:00
parent eddfd57fa7
commit 5cda20cfdb
2 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/sound/pcm/sound.h
View File

@ -257,36 +257,6 @@ struct snd_mixer;
#define AFMT_U8_NE AFMT_U8
#define AFMT_S8_NE AFMT_S8
#undef AFMT_S16_NE
#if BYTE_ORDER == LITTLE_ENDIAN
#define AFMT_S16_NE AFMT_S16_LE
#define AFMT_S24_NE AFMT_S24_LE
#define AFMT_S32_NE AFMT_S32_LE
#define AFMT_U16_NE AFMT_U16_LE
#define AFMT_U24_NE AFMT_U24_LE
#define AFMT_U32_NE AFMT_U32_LE
#define AFMT_S16_OE AFMT_S16_BE
#define AFMT_S24_OE AFMT_S24_BE
#define AFMT_S32_OE AFMT_S32_BE
#define AFMT_U16_OE AFMT_U16_BE
#define AFMT_U24_OE AFMT_U24_BE
#define AFMT_U32_OE AFMT_U32_BE
#else
#define AFMT_S16_OE AFMT_S16_LE
#define AFMT_S24_OE AFMT_S24_LE
#define AFMT_S32_OE AFMT_S32_LE
#define AFMT_U16_OE AFMT_U16_LE
#define AFMT_U24_OE AFMT_U24_LE
#define AFMT_U32_OE AFMT_U32_LE
#define AFMT_S16_NE AFMT_S16_BE
#define AFMT_S24_NE AFMT_S24_BE
#define AFMT_S32_NE AFMT_S32_BE
#define AFMT_U16_NE AFMT_U16_BE
#define AFMT_U24_NE AFMT_U24_BE
#define AFMT_U32_NE AFMT_U32_BE
#endif
#define AFMT_SIGNED_NE (AFMT_S8_NE | AFMT_S16_NE | AFMT_S24_NE | AFMT_S32_NE)
#define AFMT_NE (AFMT_SIGNED_NE | AFMT_U8_NE | AFMT_U16_NE | \

35
sys/sys/soundcard.h
View File

@ -171,12 +171,6 @@ struct snd_size {
#define AFMT_MPEG 0x00000200 /* MPEG MP2/MP3 audio */
#define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */
#if _BYTE_ORDER == _LITTLE_ENDIAN
#define AFMT_S16_NE AFMT_S16_LE /* native endian signed 16 */
#else
#define AFMT_S16_NE AFMT_S16_BE
#endif
/*
* 32-bit formats below used for 24-bit audio data where the data is stored
* in the 24 most significant bits and the least significant bits are not used
@ -191,6 +185,35 @@ struct snd_size {
#define AFMT_U24_LE 0x00040000 /* Little endian unsigned 24-bit */
#define AFMT_U24_BE 0x00080000 /* Big endian unsigned 24-bit */
/* Machine dependant AFMT_* definitions. */
#if BYTE_ORDER == LITTLE_ENDIAN
#define AFMT_S16_NE AFMT_S16_LE
#define AFMT_S24_NE AFMT_S24_LE
#define AFMT_S32_NE AFMT_S32_LE
#define AFMT_U16_NE AFMT_U16_LE
#define AFMT_U24_NE AFMT_U24_LE
#define AFMT_U32_NE AFMT_U32_LE
#define AFMT_S16_OE AFMT_S16_BE
#define AFMT_S24_OE AFMT_S24_BE
#define AFMT_S32_OE AFMT_S32_BE
#define AFMT_U16_OE AFMT_U16_BE
#define AFMT_U24_OE AFMT_U24_BE
#define AFMT_U32_OE AFMT_U32_BE
#else
#define AFMT_S16_OE AFMT_S16_LE
#define AFMT_S24_OE AFMT_S24_LE
#define AFMT_S32_OE AFMT_S32_LE
#define AFMT_U16_OE AFMT_U16_LE
#define AFMT_U24_OE AFMT_U24_LE
#define AFMT_U32_OE AFMT_U32_LE
#define AFMT_S16_NE AFMT_S16_BE
#define AFMT_S24_NE AFMT_S24_BE
#define AFMT_S32_NE AFMT_S32_BE
#define AFMT_U16_NE AFMT_U16_BE
#define AFMT_U24_NE AFMT_U24_BE
#define AFMT_U32_NE AFMT_U32_BE
#endif
#define AFMT_STEREO 0x10000000 /* can do/want stereo */
/*