1 files changed, 17 insertions, 57 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_32Bit_Generic/etDatatypes.h b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_32Bit_Generic/etDatatypes.h
index 762d9b50c..f21fb05d4 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_32Bit_Generic/etDatatypes.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_32Bit_Generic/etDatatypes.h
@@ -16,75 +16,35 @@
 /*
  * typedefs for platform specific datatypes
  * Version for 32 Bit Controllers like ARM Cortex M
- *
- * */
-
-#include <stdio.h>
-
-/* unsigned integer datatypes */
-typedef unsigned char uint8;
-typedef unsigned short int uint16;
-typedef unsigned int uint32;
-typedef unsigned long long uint64;
-
-/* signed integer datatypes */
-typedef char int8;
-typedef short int int16;
-typedef int int32;
-typedef long long int64;
+ */
 
+#define ET_INT64
+#define ET_FLOAT32
+//#define ET_FLOAT64 /* not available on this platform */
 
-/* float datatypes */
-typedef float float32;
-/* typedef double float64; */ /* not available on this platform */
 
-/* boolean datatypes and values */
-typedef char boolean;
-#ifndef ET_TRUE
-	#define ET_TRUE 1
-#endif
-#ifndef ET_FALSE
-	#define ET_FALSE 0
-#endif
+#include "etStdDatatypes.h"
 
-/*
- * typedefs for eTrice Runtime and Testing
- *
- * */
+#include <stdio.h>
 
-typedef int8 etInt8;
-typedef int16 etInt16;
-typedef int32 etInt32;
+/*--- Data types for room.basic.types */
 
-typedef uint8 etUInt8;
-typedef uint16 etUInt16;
-typedef uint32 etUInt32;
+/*-----------------------------------------------------------*/
 
-//typedef bool etBool;
-typedef char etBool;
+/*--- Data types for runtime */
 
 #define ALIGNMENT		4	/* power of 2 and >= sizeof(int) ! */
 
-typedef float32 etFloat32;
-typedef float32 etFloat64;
-
-/* string datatypes */
-typedef char* charPtr;
-
-
 typedef FILE* etFileHandle;
 
-typedef int8 etAddressId;
+/* types for osal */
+typedef etUInt32 etOSMutexData;
+typedef etUInt32 etOSSemaData;
+typedef etUInt32 etOSThreadData;
+typedef etUInt32 etOSThreadId;
+typedef etUInt32 etOSTimerData;
+typedef etUInt32 etOSTimerId;
 
-
-/*
- * typedefs for OS-specific types
- */
-typedef uint32 etOSMutexData;
-typedef uint32 etOSSemaData;
-typedef uint32 etOSThreadData;
-typedef uint32 etOSThreadId;
-typedef uint32 etOSTimerData;
-typedef uint32 etOSTimerId;
+/*-----------------------------------------------------------*/
 
 #endif /* _DATATYPES_H_ */