Remove config.h from types.h; all .c files are required to include it.

[openocd.git] / src / helper / types.h

diff --git a/src/helper/types.h b/src/helper/types.h
index e4b37a42d0b8af471bb11353ee69908d19376843..8ee41105f1651be3efb5e2fb7213a8accbc28c0f 100644 (file)
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -23,8 +23,8 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
 #endif
 
 #ifndef u8
@@ -45,19 +45,43 @@ typedef unsigned long long u64;
 
 typedef struct jtag_tap_s jtag_tap_t;
 
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#else  /* HAVE_STDBOOL_H */
+#define __bool_true_false_are_defined 1
 
-/* DANGER!!!! here be dragons! 
- * 
+#ifndef HAVE__BOOL
+#ifndef __cplusplus
+
+#define false  0
+#define true           1
+
+typedef int _Bool;
+#else 
+typedef bool _Bool;
+#endif /* __cplusplus */
+#endif /* HAVE__BOOL */
+
+#define bool _Bool
+
+#endif /* HAVE_STDBOOL_H */
+
+/* DANGER!!!! here be dragons!
+ *
  * Leave these fn's as byte accesses because it is safe
  * across architectures. Clever usage of 32 bit access
  * will create problems on some hosts.
- * 
- * Note that the pointer in memory might be unaligned. 
- * 
- * On some CPU's, i.e. ARM7, the 2 lsb are ignored for 32 
- * bit access, on others it will cause an exception and 
- * on e.g. x86, it works the same as if aligned.
- * 
+ *
+ * Note that the "buf" pointer in memory is probably unaligned.
+ *
+ * Were these functions to be re-written to take a 32 bit wide or 16 bit wide
+ * memory access shortcut, then on some CPU's, i.e. ARM7, the 2 lsbytes of the address are
+ * ignored for 32 bit access, whereas on other CPU's a 32 bit wide unaligned memory access
+ * will cause an exception, and lastly on x86, an unaligned "greater than bytewide"
+ * memory access works as if aligned.  So what follows below will work for all
+ * platforms and gives the compiler leeway to do its own platform specific optimizations.
+ *
+ * Again, note that the "buf" pointer in memory is probably unaligned.
  */