From bd6d5fc6d18a3d36b2fee80401c67d5fc466d4c5 Mon Sep 17 00:00:00 2001
From: Anatole SCHRAMM <schramma@ldlcxl0013.ldl.st.com>
Date: Wed, 5 Apr 2023 14:27:22 +0200
Subject: [PATCH] Finally cleaned the wm_type_def.h file which was provided by
 WinnerMicro's SDK...

---
 src/W800_SDK_v1.00.10/include/wm_type_def.h | 219 ++++++++++++--------
 1 file changed, 130 insertions(+), 89 deletions(-)

diff --git a/src/W800_SDK_v1.00.10/include/wm_type_def.h b/src/W800_SDK_v1.00.10/include/wm_type_def.h
index 2701a34..716df01 100644
--- a/src/W800_SDK_v1.00.10/include/wm_type_def.h
+++ b/src/W800_SDK_v1.00.10/include/wm_type_def.h
@@ -11,30 +11,47 @@
 #define __WM_TYPE_DEF_H__
 #include <stdbool.h>
 
+// Defining types under the uX forme.
 #ifdef u8
 #undef u8
 #endif
-#ifdef s8
-#undef s8
-#endif
+typedef unsigned char        u8;
+
 #ifdef u16
 #undef u16
 #endif
-#ifdef s16
-#undef s16
-#endif
+typedef unsigned short       u16;
+
 #ifdef u32
 #undef u32
 #endif
-#ifdef s32
-#undef s32
-#endif
+typedef unsigned int         u32;
+
 #ifdef u64
 #undef u64
 #endif
+typedef unsigned long long   u64;
+
+// Defining types under the sX forme.
+#ifdef s8
+#undef s8
+#endif
+typedef signed char          s8;
+
+#ifdef s16
+#undef s16
+#endif
+typedef signed short         s16;
+
+#ifdef s32
+#undef s32
+#endif
+typedef signed int           s32;
+
 #ifdef s64
 #undef s64
 #endif
+typedef signed long long     s64;
 
 #ifdef u_char
 #undef u_char
@@ -51,15 +68,6 @@ typedef unsigned char INT8U;
 #endif
 typedef signed char INT8S;
 
-typedef unsigned char        u8;
-typedef signed char          s8;
-typedef unsigned short       u16;
-typedef signed short         s16;
-typedef unsigned int         u32;
-typedef signed int           s32;
-typedef unsigned long long   u64;
-typedef long long                    s64;
-
 #if defined(_NEWLIB_VERSION_H__)
 #ifdef int32_t
 #undef int32_t
@@ -77,91 +85,28 @@ typedef int int32_t;
 typedef unsigned int uint32_t;
 #endif
 
-#ifdef int64
-#undef int64
-#endif
-typedef long long int64;
-
-#ifdef int64_t
-#undef int64_t
-#endif
-typedef long long int64_t;
-
-#ifdef uint64
-#undef uint64
-#endif
-typedef unsigned long long uint64;
-
-#ifdef uint64_t
-#undef uint64_t
-#endif
-typedef unsigned long long uint64_t;
-
-#ifdef int32
-#undef int32
-#endif
-typedef int int32;
-
-#ifdef int32_t
-#undef int32_t
-#endif
-typedef int int32_t;
-
-#ifdef uint32
-#undef uint32
-#endif
-typedef unsigned int uint32;
-
-#ifdef uint32_t
-#undef uint32_t
-#endif
-typedef unsigned int uint32_t;
-
-#ifdef int16
-#undef int16
-#endif
-typedef short int16;
-
-#ifdef uint16
-#undef uint16
-#endif
-typedef unsigned short uint16;
-
-#ifdef ULONG
-#undef ULONG
-#endif
-typedef unsigned long ULONG;
-
+// Defining types under the uX_t forme.
 #ifdef u8_t
 #undef u8_t
 #endif
 typedef unsigned char u8_t;
 
-#ifdef int8_t
-#undef int8_t
-#endif
-typedef signed char int8_t;
-
-#ifdef uint8_t
-#undef uint8_t
-#endif
-typedef unsigned char uint8_t;
-
 #ifdef u16_t
 #undef u16_t
 #endif
 typedef unsigned short u16_t;
 
-#ifdef uint16_t
-#undef uint16_t
-#endif
-typedef unsigned short uint16_t;
-
 #ifdef u32_t
 #undef u32_t
 #endif
 typedef unsigned int u32_t;
 
+#ifdef u64_t
+#undef u64_t
+#endif
+typedef unsigned long long u64_t;
+
+// Defining types under the sX_t forme.
 #ifdef s8_t
 #undef s8_t
 #endif
@@ -176,6 +121,103 @@ typedef signed short s16_t;
 #undef s32_t
 #endif
 typedef signed int s32_t;
+
+#ifdef s64_t
+#undef s64_t
+#endif
+typedef signed long long s64_t;
+
+// Defining types under the intX forme.
+#ifdef int8
+#undef int8
+#endif
+typedef signed char int8;
+
+#ifdef int16
+#undef int16
+#endif
+typedef signed short int16;
+
+#ifdef int32
+#undef int32
+#endif
+typedef signed int int32;
+
+#ifdef int64
+#undef int64
+#endif
+typedef signed long long int64;
+
+// Defining types under the uintX forme.
+#ifdef uint8
+#undef uint8
+#endif
+typedef unsigned char uint8;
+
+#ifdef uint16
+#undef uint16
+#endif
+typedef unsigned short uint16;
+
+#ifdef uint32
+#undef uint32
+#endif
+typedef unsigned int uint32;
+
+#ifdef uint64
+#undef uint64
+#endif
+typedef unsigned long long uint64;
+
+// Defining types under the intX_t forme.
+#ifdef int8_t
+#undef int8_t
+#endif
+typedef signed char int8_t;
+
+#ifdef int16_t
+#undef int16_t
+#endif
+typedef signed short int16_t;
+
+#ifdef int32_t
+#undef int32_t
+#endif
+typedef signed int int32_t;
+
+#ifdef int64_t
+#undef int64_t
+#endif
+typedef signed long long int64_t;
+
+
+// Defining types under the uintX_t forme.
+#ifdef uint8_t
+#undef uint8_t
+#endif
+typedef unsigned char uint8_t;
+
+#ifdef uint16_t
+#undef uint16_t
+#endif
+typedef unsigned short uint16_t;
+
+#ifdef uint32_t
+#undef uint32_t
+#endif
+typedef unsigned int uint32_t;
+
+#ifdef uint64_t
+#undef uint64_t
+#endif
+typedef unsigned long long uint64_t;
+
+
+#ifdef ULONG
+#undef ULONG
+#endif
+typedef unsigned long ULONG;
+
 #if (GCC_COMPILE==0)
 #ifdef size_t
 #undef size_t
@@ -188,7 +230,6 @@ typedef unsigned int size_t;
 #endif
 typedef signed char err_t;
 
-
 #ifdef mem_ptr_t
 #undef mem_ptr_t
 #endif