[PATCH] include/linux/soundcard.h: endianness fix
Fixes for big-endian systems in soundcard.h and awe_voice.h This patch fixes the AFMT_S16_NE (include/linux/soundcard.h) and AWE_PATCH (awe_voice.h) macros on big-endian systems. It also moves _PATCHKEY into a new file, patchkey.h, in order to remove a duplicate definition of it from awe_voice.h. Signed-off-by: Stuart Brady <sdbrady@ntlworld.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
42d77c7017
Коммит
60d300c02f
|
@ -29,9 +29,9 @@
|
|||
#define SAMPLE_TYPE_AWE32 0x20
|
||||
#endif
|
||||
|
||||
#ifndef _PATCHKEY
|
||||
#define _PATCHKEY(id) ((id<<8)|0xfd)
|
||||
#endif
|
||||
#define _LINUX_PATCHKEY_H_INDIRECT
|
||||
#include <linux/patchkey.h>
|
||||
#undef _LINUX_PATCHKEY_H_INDIRECT
|
||||
|
||||
/*----------------------------------------------------------------
|
||||
* patch information record
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* <linux/patchkey.h> -- definition of _PATCHKEY macro
|
||||
*
|
||||
* Copyright (C) 2005 Stuart Brady
|
||||
*
|
||||
* This exists because awe_voice.h defined its own _PATCHKEY and it wasn't
|
||||
* clear whether removing this would break anything in userspace.
|
||||
*
|
||||
* Do not include this file directly. Please use <sys/soundcard.h> instead.
|
||||
* For kernel code, use <linux/soundcard.h>
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_PATCHKEY_H_INDIRECT
|
||||
#error "patchkey.h included directly"
|
||||
#endif
|
||||
|
||||
#ifndef _LINUX_PATCHKEY_H
|
||||
#define _LINUX_PATCHKEY_H
|
||||
|
||||
/* Endian macros. */
|
||||
#ifdef __KERNEL__
|
||||
# include <asm/byteorder.h>
|
||||
#else
|
||||
# include <endian.h>
|
||||
#endif
|
||||
|
||||
#if defined(__KERNEL__)
|
||||
# if defined(__BIG_ENDIAN)
|
||||
# define _PATCHKEY(id) (0xfd00|id)
|
||||
# elif defined(__LITTLE_ENDIAN)
|
||||
# define _PATCHKEY(id) ((id<<8)|0x00fd)
|
||||
# else
|
||||
# error "could not determine byte order"
|
||||
# endif
|
||||
#elif defined(__BYTE_ORDER)
|
||||
# if __BYTE_ORDER == __BIG_ENDIAN
|
||||
# define _PATCHKEY(id) (0xfd00|id)
|
||||
# elif __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
# define _PATCHKEY(id) ((id<<8)|0x00fd)
|
||||
# else
|
||||
# error "could not determine byte order"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif /* _LINUX_PATCHKEY_H */
|
|
@ -39,6 +39,13 @@
|
|||
/* In Linux we need to be prepared for cross compiling */
|
||||
#include <linux/ioctl.h>
|
||||
|
||||
/* Endian macros. */
|
||||
#ifdef __KERNEL__
|
||||
# include <asm/byteorder.h>
|
||||
#else
|
||||
# include <endian.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Supported card ID numbers (Should be somewhere else?)
|
||||
*/
|
||||
|
@ -179,13 +186,26 @@ typedef struct seq_event_rec {
|
|||
* Some big endian/little endian handling macros
|
||||
*/
|
||||
|
||||
#if defined(_AIX) || defined(AIX) || defined(sparc) || defined(__sparc__) || defined(HPPA) || defined(PPC) || defined(__mc68000__)
|
||||
/* Big endian machines */
|
||||
# define _PATCHKEY(id) (0xfd00|id)
|
||||
# define AFMT_S16_NE AFMT_S16_BE
|
||||
#else
|
||||
# define _PATCHKEY(id) ((id<<8)|0xfd)
|
||||
# define AFMT_S16_NE AFMT_S16_LE
|
||||
#define _LINUX_PATCHKEY_H_INDIRECT
|
||||
#include <linux/patchkey.h>
|
||||
#undef _LINUX_PATCHKEY_H_INDIRECT
|
||||
|
||||
#if defined(__KERNEL__)
|
||||
# if defined(__BIG_ENDIAN)
|
||||
# define AFMT_S16_NE AFMT_S16_BE
|
||||
# elif defined(__LITTLE_ENDIAN)
|
||||
# define AFMT_S16_NE AFMT_S16_LE
|
||||
# else
|
||||
# error "could not determine byte order"
|
||||
# endif
|
||||
#elif defined(__BYTE_ORDER)
|
||||
# if __BYTE_ORDER == __BIG_ENDIAN
|
||||
# define AFMT_S16_NE AFMT_S16_BE
|
||||
# elif __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
# define AFMT_S16_NE AFMT_S16_LE
|
||||
# else
|
||||
# error "could not determine byte order"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
Загрузка…
Ссылка в новой задаче