ASoC: aess: Don't redefine types but use types.h instead.tracking-topic-audio

To be squashed. TODO: look at using Linux MAX_ macros instead

Align the task struct on 32 bits.
Do we need to get apply GCC attributes here too ?

Signed-off-by: Liam Girdwood <lrg@ti.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/sound/soc/omap/aess/abe_typ.h b/sound/soc/omap/aess/abe_typ.h
index 8b2aee09dc9..4a0cd1fd839 100644
--- a/sound/soc/omap/aess/abe_typ.h
+++ b/sound/soc/omap/aess/abe_typ.h
@@ -63,6 +63,7 @@
 /*
  *	BASIC TYPES
  */
+#if 0
 #define MAX_UINT8	((((1L <<  7) - 1) << 1) + 1)
 #define MAX_UINT16	((((1L << 15) - 1) << 1) + 1)
 #define MAX_UINT32	((((1L << 31) - 1) << 1) + 1)
@@ -72,7 +73,12 @@
 #define u16 unsigned short
 #define s32 int
 #define u32 unsigned int
-
+#else
+#define MAX_UINT8	((((1L <<  7) - 1) << 1) + 1)
+#define MAX_UINT16	((((1L << 15) - 1) << 1) + 1)
+#define MAX_UINT32	((((1L << 31) - 1) << 1) + 1)
+#include <linux/types.h>
+#endif
 /* subroutine types */
 typedef void (*abe_subroutine0) (void);
 typedef void (*abe_subroutine1) (u32);
@@ -422,8 +428,8 @@ struct omap_aess_dma_offset {
  */
 
 struct omap_aess_task {
-	int frame;
-	int slot;
+	u32 frame;
+	u32 slot;
 	u16 task;
 };