Remove dependencies with kernel headers from instrument layer codes

Don't include kernel headers from alsa-lib codes.
Still remained in instrument layer codes, but now all should be gone.

diff --git a/include/sound/Makefile.am b/include/sound/Makefile.am
index 85418d60d8c0b55c578004dd825cef83866cdebe..7958357fe9a91351c0e33360e8be52ef1ef32c7a 100644 (file)
--- a/include/sound/Makefile.am
+++ b/include/sound/Makefile.am
@@ -1,6 +1,7 @@
 alsasoundincludedir = ${includedir}/alsa/sound
 
 alsasoundinclude_HEADERS = ainstr_fm.h ainstr_gf1.h ainstr_simple.h ainstr_iw.h \
-                          asound_fm.h hdsp.h sb16_csp.h sscape_ioctl.h emu10k1.h
+                          asound_fm.h hdsp.h sb16_csp.h sscape_ioctl.h emu10k1.h \
+                          type_compat.h
 
 noinst_HEADERS = asound.h asoundef.h asequencer.h

diff --git a/include/sound/ainstr_fm.h b/include/sound/ainstr_fm.h
index 2dfa9a5ed32747b27f0678708354c0e467b254ad..43a10a0e6b44a9c5a187986f6fe3ca86e9f99c24 100644 (file)
--- a/include/sound/ainstr_fm.h
+++ b/include/sound/ainstr_fm.h
@@ -24,12 +24,7 @@
 #ifndef __SOUND_AINSTR_FM_H
 #define __SOUND_AINSTR_FM_H
 
-#ifndef __KERNEL__
-#define __KERNEL__
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#undef __KERNEL__
-#endif
+#include "type_compat.h"
 
 /*
  *  share types (share ID 1)

diff --git a/include/sound/ainstr_gf1.h b/include/sound/ainstr_gf1.h
index 882d17b395ff40c0f7e2f4f2f91fa446e73b8dbf..32dcfafb9ac826082aacd8ce58dd59a5a17b3b2f 100644 (file)
--- a/include/sound/ainstr_gf1.h
+++ b/include/sound/ainstr_gf1.h
@@ -24,10 +24,7 @@
 #ifndef __SOUND_AINSTR_GF1_H
 #define __SOUND_AINSTR_GF1_H
 
-#ifndef __KERNEL__
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#endif
+#include "type_compat.h"
 
 /*
  *  share types (share ID 1)

diff --git a/include/sound/ainstr_iw.h b/include/sound/ainstr_iw.h
index 1ddb54f9aac68b8beb1dfa81ee473e226dea298d..590cb41e8fbc3ca6df142fc5aa0a94a5a38a6624 100644 (file)
--- a/include/sound/ainstr_iw.h
+++ b/include/sound/ainstr_iw.h
@@ -24,12 +24,7 @@
 #ifndef __SOUND_AINSTR_IW_H
 #define __SOUND_AINSTR_IW_H
 
-#ifndef __KERNEL__
-#define __KERNEL__
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#undef __KERNEL__
-#endif
+#include "type_compat.h"
 
 /*
  *  share types (share ID 1)

diff --git a/include/sound/ainstr_simple.h b/include/sound/ainstr_simple.h
index 52974e2b85918c3eec1ced0e8ab3b5a563c1be63..6b2a814bfd85caa913e2e5d31956711579eb4dfe 100644 (file)
--- a/include/sound/ainstr_simple.h
+++ b/include/sound/ainstr_simple.h
@@ -24,12 +24,7 @@
 #ifndef __SOUND_AINSTR_SIMPLE_H
 #define __SOUND_AINSTR_SIMPLE_H
 
-#ifndef __KERNEL__
-#define __KERNEL__
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#undef __KERNEL__
-#endif
+#include "type_compat.h"
 
 /*
  *  share types (share ID 1)

diff --git a/include/sound/type_compat.h b/include/sound/type_compat.h
new file mode 100644 (file)
index 0000000..eec86e4
--- /dev/null
+++ b/include/sound/type_compat.h
@@ -0,0 +1,40 @@
+#ifndef __TYPE_COMPAT_H
+#define __TYPE_COMPAT_H
+
+#ifndef DOC_HIDDEN
+#include <stdint.h>
+typedef uint8_t __u8;
+typedef uint16_t __u16;
+typedef uint32_t __u32;
+typedef int8_t __s8;
+typedef int16_t __s16;
+typedef int32_t __s32;
+
+#include <endian.h>
+#include <byteswap.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_be32(x) bswap_32(x)
+#define __cpu_to_le16(x) (x)
+#define __cpu_to_be16(x) bswap_16(x)
+#else
+#define __cpu_to_le32(x) bswap_32(x)
+#define __cpu_to_be32(x) (x)
+#define __cpu_to_le16(x) bswap_16(x)
+#define __cpu_to_be16(x) (x)
+#endif
+
+#define __le32_to_cpu __cpu_to_le32
+#define __be32_to_cpu __cpu_to_be32
+#define __le16_to_cpu __cpu_to_le16
+#define __be16_to_cpu __cpu_to_be16
+
+#define __le64 __u64
+#define __le32 __u32
+#define __le16 __u16
+#define __be64 __u64
+#define __be32 __u32
+#define __be16 __u16
+#endif /* DOC_HIDDEN */
+
+#endif /* __TYPE_COMPAT_H */

diff --git a/src/instr/fm.c b/src/instr/fm.c
index 715b7efb99d95926874005896928a462fcaf76df..df12763a63a75e0288b095500ceaa7a059ad9ed3 100644 (file)
--- a/src/instr/fm.c
+++ b/src/instr/fm.c
@@ -30,20 +30,6 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include "local.h"
-/* linux 2.6.9 workaround */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,9)
-#include <asm/types.h>
-#ifndef DOC_HIDDEN
-#define __le64 __u64
-#define __le32 __u32
-#define __le16 __u16
-#define __be64 __u64
-#define __be32 __u32
-#define __be16 __u16
-#endif
-#endif /* linux 2.6.9 workaround */
-#include <asm/byteorder.h>
 #include <sound/ainstr_fm.h>
 
 /**

diff --git a/src/instr/iwffff.c b/src/instr/iwffff.c
index 7f15ed03a5d208fff7a6896eb39f5577d87d26d7..5d5999c529ebe0eacebb0b66155f1fbbd4b2febf 100644 (file)
--- a/src/instr/iwffff.c
+++ b/src/instr/iwffff.c
@@ -31,19 +31,6 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include "local.h"
-/* linux 2.6.9 workaround */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,9)
-#include <asm/types.h>
-#ifndef DOC_HIDDEN
-#define __le64 __u64
-#define __le32 __u32
-#define __le16 __u16
-#define __be64 __u64
-#define __be32 __u32
-#define __be16 __u16
-#endif
-#endif /* linux 2.6.9 workaround */
 #include <sound/ainstr_iw.h>
 
 /*

diff --git a/src/instr/simple.c b/src/instr/simple.c
index 8d3d442a99608377fdca9bdce215a3e6cd9ad959..d91f247f9554eb602e84347c999e727cd48121dc 100644 (file)
--- a/src/instr/simple.c
+++ b/src/instr/simple.c
@@ -31,20 +31,6 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include "local.h"
-/* linux 2.6.9 workaround */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,9)
-#include <asm/types.h>
-#ifndef DOC_HIDDEN
-#define __le64 __u64
-#define __le32 __u32
-#define __le16 __u16
-#define __be64 __u64
-#define __be32 __u32
-#define __be16 __u16
-#endif
-#endif /* linux 2.6.9 workaround */
-#include <asm/byteorder.h>
 #include <sound/ainstr_simple.h>
 
 /**