Remove additional system includes

42 files changed, 49 insertions, 42 deletions

diff --git a/include/APE_APE.h b/include/APE_APE.h
index 9c83870..b8926ea 100644
--- a/include/APE_APE.h
+++ b/include/APE_APE.h
@@ -49,7 +49,7 @@
 #ifndef APE_APE_H
 #define APE_APE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_APE_sim(void* base);
diff --git a/include/APE_APE_PERI.h b/include/APE_APE_PERI.h
index 0330dc4..0ed0752 100644
--- a/include/APE_APE_PERI.h
+++ b/include/APE_APE_PERI.h
@@ -49,7 +49,7 @@
 #ifndef APE_APE_PERI_H
 #define APE_APE_PERI_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_APE_PERI_sim(void* base);
diff --git a/include/APE_DEVICE.h b/include/APE_DEVICE.h
index 28835d0..3dfe4fa 100644
--- a/include/APE_DEVICE.h
+++ b/include/APE_DEVICE.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE_H
 #define APE_DEVICE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_DEVICE_sim(void* base);
diff --git a/include/APE_DEVICE1.h b/include/APE_DEVICE1.h
index 59811db..8c6548e 100644
--- a/include/APE_DEVICE1.h
+++ b/include/APE_DEVICE1.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE1_H
 #define APE_DEVICE1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_DEVICE.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_DEVICE2.h b/include/APE_DEVICE2.h
index b1605d9..7aeb330 100644
--- a/include/APE_DEVICE2.h
+++ b/include/APE_DEVICE2.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE2_H
 #define APE_DEVICE2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_DEVICE.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_DEVICE3.h b/include/APE_DEVICE3.h
index e274848..7b3dfd7 100644
--- a/include/APE_DEVICE3.h
+++ b/include/APE_DEVICE3.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE3_H
 #define APE_DEVICE3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_DEVICE.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_FILTERS.h b/include/APE_FILTERS.h
index 689e50d..e83b039 100644
--- a/include/APE_FILTERS.h
+++ b/include/APE_FILTERS.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS_H
 #define APE_FILTERS_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_FILTERS_sim(void* base);
diff --git a/include/APE_FILTERS1.h b/include/APE_FILTERS1.h
index dad4fdf..42e264f 100644
--- a/include/APE_FILTERS1.h
+++ b/include/APE_FILTERS1.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS1_H
 #define APE_FILTERS1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_FILTERS.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_FILTERS2.h b/include/APE_FILTERS2.h
index 6262da5..e48d71b 100644
--- a/include/APE_FILTERS2.h
+++ b/include/APE_FILTERS2.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS2_H
 #define APE_FILTERS2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_FILTERS.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_FILTERS3.h b/include/APE_FILTERS3.h
index 9b235a9..3f4b5e1 100644
--- a/include/APE_FILTERS3.h
+++ b/include/APE_FILTERS3.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS3_H
 #define APE_FILTERS3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_FILTERS.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_NVIC.h b/include/APE_NVIC.h
index e4a0b65..93a0038 100644
--- a/include/APE_NVIC.h
+++ b/include/APE_NVIC.h
@@ -49,7 +49,7 @@
 #ifndef APE_NVIC_H
 #define APE_NVIC_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_NVIC_sim(void* base);
diff --git a/include/APE_RX_PORT0.h b/include/APE_RX_PORT0.h
index c62d065..1ac06cd 100644
--- a/include/APE_RX_PORT0.h
+++ b/include/APE_RX_PORT0.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT0_H
 #define APE_RX_PORT0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_RX_PORT0_sim(void* base);
diff --git a/include/APE_RX_PORT1.h b/include/APE_RX_PORT1.h
index aaf57d6..f50c164 100644
--- a/include/APE_RX_PORT1.h
+++ b/include/APE_RX_PORT1.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT1_H
 #define APE_RX_PORT1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_RX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_RX_PORT2.h b/include/APE_RX_PORT2.h
index 9792fb3..bb370e8 100644
--- a/include/APE_RX_PORT2.h
+++ b/include/APE_RX_PORT2.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT2_H
 #define APE_RX_PORT2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_RX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_RX_PORT3.h b/include/APE_RX_PORT3.h
index 0f6fd81..16331a3 100644
--- a/include/APE_RX_PORT3.h
+++ b/include/APE_RX_PORT3.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT3_H
 #define APE_RX_PORT3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_RX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM.h b/include/APE_SHM.h
index f7b30d9..7865dc1 100644
--- a/include/APE_SHM.h
+++ b/include/APE_SHM.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_H
 #define APE_SHM_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_SHM_sim(void* base);
diff --git a/include/APE_SHM1.h b/include/APE_SHM1.h
index cd2f495..05c5b2d 100644
--- a/include/APE_SHM1.h
+++ b/include/APE_SHM1.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM1_H
 #define APE_SHM1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM2.h b/include/APE_SHM2.h
index bd92e45..84443ea 100644
--- a/include/APE_SHM2.h
+++ b/include/APE_SHM2.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM2_H
 #define APE_SHM2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM3.h b/include/APE_SHM3.h
index d3deb09..d257cd8 100644
--- a/include/APE_SHM3.h
+++ b/include/APE_SHM3.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM3_H
 #define APE_SHM3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM_CHANNEL0.h b/include/APE_SHM_CHANNEL0.h
index 7669923..dbb66b3 100644
--- a/include/APE_SHM_CHANNEL0.h
+++ b/include/APE_SHM_CHANNEL0.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL0_H
 #define APE_SHM_CHANNEL0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_SHM_CHANNEL0_sim(void* base);
diff --git a/include/APE_SHM_CHANNEL1.h b/include/APE_SHM_CHANNEL1.h
index aa5838d..d2f6e15 100644
--- a/include/APE_SHM_CHANNEL1.h
+++ b/include/APE_SHM_CHANNEL1.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL1_H
 #define APE_SHM_CHANNEL1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM_CHANNEL2.h b/include/APE_SHM_CHANNEL2.h
index 2cf6d4a..8719902 100644
--- a/include/APE_SHM_CHANNEL2.h
+++ b/include/APE_SHM_CHANNEL2.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL2_H
 #define APE_SHM_CHANNEL2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM_CHANNEL3.h b/include/APE_SHM_CHANNEL3.h
index 907d2dc..470e808 100644
--- a/include/APE_SHM_CHANNEL3.h
+++ b/include/APE_SHM_CHANNEL3.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL3_H
 #define APE_SHM_CHANNEL3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_TX_PORT0.h b/include/APE_TX_PORT0.h
index f397178..c3e3c56 100644
--- a/include/APE_TX_PORT0.h
+++ b/include/APE_TX_PORT0.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT0_H
 #define APE_TX_PORT0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_TX_PORT0_sim(void* base);
diff --git a/include/APE_TX_PORT1.h b/include/APE_TX_PORT1.h
index 124dffd..e07b369 100644
--- a/include/APE_TX_PORT1.h
+++ b/include/APE_TX_PORT1.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT1_H
 #define APE_TX_PORT1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_TX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_TX_PORT2.h b/include/APE_TX_PORT2.h
index a288f08..a733046 100644
--- a/include/APE_TX_PORT2.h
+++ b/include/APE_TX_PORT2.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT2_H
 #define APE_TX_PORT2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_TX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_TX_PORT3.h b/include/APE_TX_PORT3.h
index 01109a5..cefd987 100644
--- a/include/APE_TX_PORT3.h
+++ b/include/APE_TX_PORT3.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT3_H
 #define APE_TX_PORT3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_TX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_APE.h b/include/bcm5719_APE.h
index 30d4a03..891bf6c 100644
--- a/include/bcm5719_APE.h
+++ b/include/bcm5719_APE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_APE_H
 #define BCM5719_APE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_APE_sim(void* base);
diff --git a/include/bcm5719_APE_PERI.h b/include/bcm5719_APE_PERI.h
index 734339b..ec13bd8 100644
--- a/include/bcm5719_APE_PERI.h
+++ b/include/bcm5719_APE_PERI.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_APE_PERI_H
 #define BCM5719_APE_PERI_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_APE_PERI_sim(void* base);
diff --git a/include/bcm5719_BOOTCODE.h b/include/bcm5719_BOOTCODE.h
index 023303b..83b81b2 100644
--- a/include/bcm5719_BOOTCODE.h
+++ b/include/bcm5719_BOOTCODE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_BOOTCODE_H
 #define BCM5719_BOOTCODE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_BOOTCODE_sim(void* base);
diff --git a/include/bcm5719_DEVICE.h b/include/bcm5719_DEVICE.h
index d25c2f2..b900f85 100644
--- a/include/bcm5719_DEVICE.h
+++ b/include/bcm5719_DEVICE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_DEVICE_H
 #define BCM5719_DEVICE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_DEVICE_sim(void* base);
diff --git a/include/bcm5719_GEN.h b/include/bcm5719_GEN.h
index 865f602..3be821d 100644
--- a/include/bcm5719_GEN.h
+++ b/include/bcm5719_GEN.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_GEN_H
 #define BCM5719_GEN_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_GEN_sim(void* base);
diff --git a/include/bcm5719_RXMBUF.h b/include/bcm5719_RXMBUF.h
index 56730ee..8324631 100644
--- a/include/bcm5719_RXMBUF.h
+++ b/include/bcm5719_RXMBUF.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_RXMBUF_H
 #define BCM5719_RXMBUF_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_RXMBUF_sim(void* base);
diff --git a/include/bcm5719_SDBCACHE.h b/include/bcm5719_SDBCACHE.h
index 96b95f5..e390daa 100644
--- a/include/bcm5719_SDBCACHE.h
+++ b/include/bcm5719_SDBCACHE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SDBCACHE_H
 #define BCM5719_SDBCACHE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_SDBCACHE_sim(void* base);
diff --git a/include/bcm5719_SHM.h b/include/bcm5719_SHM.h
index 24eec7d..a7b5309 100644
--- a/include/bcm5719_SHM.h
+++ b/include/bcm5719_SHM.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_H
 #define BCM5719_SHM_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_SHM_sim(void* base);
diff --git a/include/bcm5719_SHM_CHANNEL0.h b/include/bcm5719_SHM_CHANNEL0.h
index f91f3fc..d68bce6 100644
--- a/include/bcm5719_SHM_CHANNEL0.h
+++ b/include/bcm5719_SHM_CHANNEL0.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL0_H
 #define BCM5719_SHM_CHANNEL0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_SHM_CHANNEL0_sim(void* base);
diff --git a/include/bcm5719_SHM_CHANNEL1.h b/include/bcm5719_SHM_CHANNEL1.h
index 3211bfc..637e3bd 100644
--- a/include/bcm5719_SHM_CHANNEL1.h
+++ b/include/bcm5719_SHM_CHANNEL1.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL1_H
 #define BCM5719_SHM_CHANNEL1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "bcm5719_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_SHM_CHANNEL2.h b/include/bcm5719_SHM_CHANNEL2.h
index b4222b2..2f3423c 100644
--- a/include/bcm5719_SHM_CHANNEL2.h
+++ b/include/bcm5719_SHM_CHANNEL2.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL2_H
 #define BCM5719_SHM_CHANNEL2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "bcm5719_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_SHM_CHANNEL3.h b/include/bcm5719_SHM_CHANNEL3.h
index bf1db4e..8d82547 100644
--- a/include/bcm5719_SHM_CHANNEL3.h
+++ b/include/bcm5719_SHM_CHANNEL3.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL3_H
 #define BCM5719_SHM_CHANNEL3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "bcm5719_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_TXMBUF.h b/include/bcm5719_TXMBUF.h
index 0b43c1c..2778cf3 100644
--- a/include/bcm5719_TXMBUF.h
+++ b/include/bcm5719_TXMBUF.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_TXMBUF_H
 #define BCM5719_TXMBUF_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_TXMBUF_sim(void* base);
diff --git a/include/bcm5719_eeprom.h b/include/bcm5719_eeprom.h
index 204d8d4..4086898 100644
--- a/include/bcm5719_eeprom.h
+++ b/include/bcm5719_eeprom.h
@@ -1,12 +1,17 @@
 #ifndef BCMNVRAM
 #define BCMNVRAM
 
-#include <stdint.h>
+#ifdef CXX_SIMULATOR
 #include <stddef.h>     /* offsetof */
+#define ELEMENT_OFFSET(__struct__, __elememnt__)        offsetof(__struct__, __elememnt__)
+#else
+#define _Static_assert(...)
+#define ELEMENT_OFFSET(__struct__, __elememnt__)        
+#endif
+
 #include <types.h>
 #include <vpd.h>
 
-#define ELEMENT_OFFSET(__struct__, __elememnt__)        offsetof(__struct__, __elememnt__)
 #define BCM_NVRAM_MAGIC	(0x669955AAu)
 
 #define BCM_CODE_DIRECTORY_TYPE_BC2             (0x00u)  /*< Second-phase bootcode */
diff --git a/include/types.h b/include/types.h
index f594686..e95c213 100644
--- a/include/types.h
+++ b/include/types.h
@@ -19,6 +19,8 @@ typedef long long signed int int64_t;
 
 typedef _Bool    bool;
 
+typedef uint32_t size_t;
+
 #define true (1)
 #define false (0)
 #else