coverity: Fix issues found with coverity (#78)

37 files changed, 179 insertions, 179 deletions

diff --git a/include/APE_APE.h b/include/APE_APE.h
index 2aa5397..a7c1fd0 100644
--- a/include/APE_APE.h
+++ b/include/APE_APE.h
@@ -2292,7 +2292,14 @@ typedef struct APE_t {
     RegAPETxToNetBufferRing_t TxToNetBufferRing3;
 
 #ifdef CXX_SIMULATOR
-    APE_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    APE_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         Mode.r32.setComponentOffset(0x0);
         Status.r32.setComponentOffset(0x4);
@@ -2554,13 +2561,6 @@ typedef struct APE_t {
         TxToNetBufferReturn3.print();
         TxToNetBufferRing3.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_APE_PERI.h b/include/APE_APE_PERI.h
index 59e9391..b347798 100644
--- a/include/APE_APE_PERI.h
+++ b/include/APE_APE_PERI.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -3603,7 +3603,14 @@ typedef struct APE_PERI_t {
     RegAPE_PERIPerLockGrantGpio_t PerLockGrantGpio;
 
 #ifdef CXX_SIMULATOR
-    APE_PERI_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    APE_PERI_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 192; i++)
         {
@@ -3735,13 +3742,6 @@ typedef struct APE_PERI_t {
         PerLockGrantPort6.print();
         PerLockGrantGpio.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_DEVICE.h b/include/APE_DEVICE.h
index 59c30ea..e5892bb 100644
--- a/include/APE_DEVICE.h
+++ b/include/APE_DEVICE.h
@@ -9763,7 +9763,14 @@ typedef struct DEVICE_t {
     RegDEVICE7c04_t _7c04;
 
 #ifdef CXX_SIMULATOR
-    DEVICE_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    DEVICE_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 26; i++)
         {
@@ -10487,13 +10494,6 @@ typedef struct DEVICE_t {
         }
         _7c04.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_DEVICE1.h b/include/APE_DEVICE1.h
index 68b4c24..166d4da 100644
--- a/include/APE_DEVICE1.h
+++ b/include/APE_DEVICE1.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_DEVICE2.h b/include/APE_DEVICE2.h
index 07063c6..83d32c0 100644
--- a/include/APE_DEVICE2.h
+++ b/include/APE_DEVICE2.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_DEVICE3.h b/include/APE_DEVICE3.h
index 95f9e3e..96d560d 100644
--- a/include/APE_DEVICE3.h
+++ b/include/APE_DEVICE3.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_FILTERS0.h b/include/APE_FILTERS0.h
index f66762d..f141370 100644
--- a/include/APE_FILTERS0.h
+++ b/include/APE_FILTERS0.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -476,7 +476,14 @@ typedef struct FILTERS_t {
     RegFILTERSRuleMask_t RuleMask[31];
 
 #ifdef CXX_SIMULATOR
-    FILTERS_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    FILTERS_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 32; i++)
         {
@@ -524,13 +531,6 @@ typedef struct FILTERS_t {
             RuleMask[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_FILTERS1.h b/include/APE_FILTERS1.h
index e0bd2eb..8843b76 100644
--- a/include/APE_FILTERS1.h
+++ b/include/APE_FILTERS1.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_FILTERS2.h b/include/APE_FILTERS2.h
index a099a34..378d5ad 100644
--- a/include/APE_FILTERS2.h
+++ b/include/APE_FILTERS2.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_FILTERS3.h b/include/APE_FILTERS3.h
index 8850009..4d249d0 100644
--- a/include/APE_FILTERS3.h
+++ b/include/APE_FILTERS3.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_NVIC.h b/include/APE_NVIC.h
index 4d255cd..70f342e 100644
--- a/include/APE_NVIC.h
+++ b/include/APE_NVIC.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -2330,7 +2330,14 @@ typedef struct NVIC_t {
     RegNVICSoftwareTriggerInterrupt_t SoftwareTriggerInterrupt;
 
 #ifdef CXX_SIMULATOR
-    NVIC_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    NVIC_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 1; i++)
         {
@@ -2626,13 +2633,6 @@ typedef struct NVIC_t {
         }
         SoftwareTriggerInterrupt.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_RX_PORT0.h b/include/APE_RX_PORT0.h
index 4866090..5500cd3 100644
--- a/include/APE_RX_PORT0.h
+++ b/include/APE_RX_PORT0.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -143,7 +143,14 @@ typedef struct RX_PORT_t {
     RegRX_PORTIn_t In[4096];
 
 #ifdef CXX_SIMULATOR
-    RX_PORT_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    RX_PORT_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 4096; i++)
         {
@@ -157,13 +164,6 @@ typedef struct RX_PORT_t {
             In[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_RX_PORT1.h b/include/APE_RX_PORT1.h
index 145fa51..96e1f77 100644
--- a/include/APE_RX_PORT1.h
+++ b/include/APE_RX_PORT1.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_RX_PORT2.h b/include/APE_RX_PORT2.h
index 0705656..9b5fafc 100644
--- a/include/APE_RX_PORT2.h
+++ b/include/APE_RX_PORT2.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_RX_PORT3.h b/include/APE_RX_PORT3.h
index abf52c4..7f4440d 100644
--- a/include/APE_RX_PORT3.h
+++ b/include/APE_RX_PORT3.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_SHM.h b/include/APE_SHM.h
index e5e0ad3..718f2a3 100644
--- a/include/APE_SHM.h
+++ b/include/APE_SHM.h
@@ -1723,7 +1723,14 @@ typedef struct SHM_t {
     RegSHMRcpuPrintfBuffer_t RcpuPrintfBuffer[372];
 
 #ifdef CXX_SIMULATOR
-    SHM_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    SHM_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         SegSig.r32.setComponentOffset(0x0);
         ApeSegLength.r32.setComponentOffset(0x4);
@@ -1893,13 +1900,6 @@ typedef struct SHM_t {
             RcpuPrintfBuffer[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_SHM_CHANNEL0.h b/include/APE_SHM_CHANNEL0.h
index 0dd8c9c..50a3364 100644
--- a/include/APE_SHM_CHANNEL0.h
+++ b/include/APE_SHM_CHANNEL0.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -1853,7 +1853,14 @@ typedef struct SHM_CHANNEL_t {
     RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t NcsiChannelCtrlstatAllAen;
 
 #ifdef CXX_SIMULATOR
-    SHM_CHANNEL_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    SHM_CHANNEL_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         NcsiChannelInfo.r32.setComponentOffset(0x0);
         NcsiChannelMcid.r32.setComponentOffset(0x4);
@@ -1995,13 +2002,6 @@ typedef struct SHM_CHANNEL_t {
         NcsiChannelCtrlstatAllTx.print();
         NcsiChannelCtrlstatAllAen.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_SHM_CHANNEL1.h b/include/APE_SHM_CHANNEL1.h
index ea0b2d1..90d34e8 100644
--- a/include/APE_SHM_CHANNEL1.h
+++ b/include/APE_SHM_CHANNEL1.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_SHM_CHANNEL2.h b/include/APE_SHM_CHANNEL2.h
index c42084e..714b6bc 100644
--- a/include/APE_SHM_CHANNEL2.h
+++ b/include/APE_SHM_CHANNEL2.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_SHM_CHANNEL3.h b/include/APE_SHM_CHANNEL3.h
index ef1ac6c..35eb126 100644
--- a/include/APE_SHM_CHANNEL3.h
+++ b/include/APE_SHM_CHANNEL3.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_TX_PORT0.h b/include/APE_TX_PORT0.h
index daee3f3..2264da8 100644
--- a/include/APE_TX_PORT0.h
+++ b/include/APE_TX_PORT0.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -147,7 +147,14 @@ typedef struct TX_PORT_t {
     RegTX_PORTOut_t Out[2048];
 
 #ifdef CXX_SIMULATOR
-    TX_PORT_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    TX_PORT_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 2048; i++)
         {
@@ -161,13 +168,6 @@ typedef struct TX_PORT_t {
             Out[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/APE_TX_PORT1.h b/include/APE_TX_PORT1.h
index 895e09c..8a785eb 100644
--- a/include/APE_TX_PORT1.h
+++ b/include/APE_TX_PORT1.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_TX_PORT2.h b/include/APE_TX_PORT2.h
index 8c51c8c..5dea3cb 100644
--- a/include/APE_TX_PORT2.h
+++ b/include/APE_TX_PORT2.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/APE_TX_PORT3.h b/include/APE_TX_PORT3.h
index 3a31869..aacfb09 100644
--- a/include/APE_TX_PORT3.h
+++ b/include/APE_TX_PORT3.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/bcm5719_APE.h b/include/bcm5719_APE.h
index 50e84d4..15cd138 100644
--- a/include/bcm5719_APE.h
+++ b/include/bcm5719_APE.h
@@ -2292,7 +2292,14 @@ typedef struct APE_t {
     RegAPETxToNetBufferRing_t TxToNetBufferRing3;
 
 #ifdef CXX_SIMULATOR
-    APE_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    APE_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         Mode.r32.setComponentOffset(0x0);
         Status.r32.setComponentOffset(0x4);
@@ -2554,13 +2561,6 @@ typedef struct APE_t {
         TxToNetBufferReturn3.print();
         TxToNetBufferRing3.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_APE_PERI.h b/include/bcm5719_APE_PERI.h
index 452cb0b..80b6cf9 100644
--- a/include/bcm5719_APE_PERI.h
+++ b/include/bcm5719_APE_PERI.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -3603,7 +3603,14 @@ typedef struct APE_PERI_t {
     RegAPE_PERIPerLockGrantGpio_t PerLockGrantGpio;
 
 #ifdef CXX_SIMULATOR
-    APE_PERI_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    APE_PERI_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 192; i++)
         {
@@ -3735,13 +3742,6 @@ typedef struct APE_PERI_t {
         PerLockGrantPort6.print();
         PerLockGrantGpio.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_BOOTCODE.h b/include/bcm5719_BOOTCODE.h
index dd7e350..62d136b 100644
--- a/include/bcm5719_BOOTCODE.h
+++ b/include/bcm5719_BOOTCODE.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -84,12 +84,6 @@ typedef uint32_t BCM5719_BOOTCODE_H_uint32_t;
 /** @brief Component definition for @ref BOOTCODE. */
 typedef struct BOOTCODE_t {
 #ifdef CXX_SIMULATOR
-    BOOTCODE_t()
-    {
-    }
-    void print()
-    {
-    }
     typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
     callback_t mIndexReadCallback;
     void* mIndexReadCallbackArgs;
@@ -97,6 +91,12 @@ typedef struct BOOTCODE_t {
     callback_t mIndexWriteCallback;
     void* mIndexWriteCallbackArgs;
 
+    BOOTCODE_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
+    {
+    }
+    void print()
+    {
+    }
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_DEVICE.h b/include/bcm5719_DEVICE.h
index 28d6930..e0b3d26 100644
--- a/include/bcm5719_DEVICE.h
+++ b/include/bcm5719_DEVICE.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -9763,7 +9763,14 @@ typedef struct DEVICE_t {
     RegDEVICE7c04_t _7c04;
 
 #ifdef CXX_SIMULATOR
-    DEVICE_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    DEVICE_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 26; i++)
         {
@@ -10487,13 +10494,6 @@ typedef struct DEVICE_t {
         }
         _7c04.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_GEN.h b/include/bcm5719_GEN.h
index e9ab367..9fd2b9f 100644
--- a/include/bcm5719_GEN.h
+++ b/include/bcm5719_GEN.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -1644,7 +1644,14 @@ typedef struct GEN_t {
     RegGENGenDbgData_t GenDbgData;
 
 #ifdef CXX_SIMULATOR
-    GEN_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    GEN_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         GenFwMbox.r32.setComponentOffset(0x0);
         GenDataSig.r32.setComponentOffset(0x4);
@@ -1776,13 +1783,6 @@ typedef struct GEN_t {
         GenDbgControlStatus.print();
         GenDbgData.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_RXMBUF.h b/include/bcm5719_RXMBUF.h
index a5f3807..db88267 100644
--- a/include/bcm5719_RXMBUF.h
+++ b/include/bcm5719_RXMBUF.h
@@ -112,7 +112,14 @@ typedef struct RXMBUF_t {
     RegRXMBUFWord_t Word[12800];
 
 #ifdef CXX_SIMULATOR
-    RXMBUF_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    RXMBUF_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 12800; i++)
         {
@@ -126,13 +133,6 @@ typedef struct RXMBUF_t {
             Word[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_SDBCACHE.h b/include/bcm5719_SDBCACHE.h
index 3eeb240..eb71a0b 100644
--- a/include/bcm5719_SDBCACHE.h
+++ b/include/bcm5719_SDBCACHE.h
@@ -112,7 +112,14 @@ typedef struct SDBCACHE_t {
     RegSDBCACHEWord_t Word[12800];
 
 #ifdef CXX_SIMULATOR
-    SDBCACHE_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    SDBCACHE_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 12800; i++)
         {
@@ -126,13 +133,6 @@ typedef struct SDBCACHE_t {
             Word[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_SHM.h b/include/bcm5719_SHM.h
index 000480b..00ea0db 100644
--- a/include/bcm5719_SHM.h
+++ b/include/bcm5719_SHM.h
@@ -1723,7 +1723,14 @@ typedef struct SHM_t {
     RegSHMRcpuPrintfBuffer_t RcpuPrintfBuffer[372];
 
 #ifdef CXX_SIMULATOR
-    SHM_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    SHM_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         SegSig.r32.setComponentOffset(0x0);
         ApeSegLength.r32.setComponentOffset(0x4);
@@ -1893,13 +1900,6 @@ typedef struct SHM_t {
             RcpuPrintfBuffer[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_SHM_CHANNEL0.h b/include/bcm5719_SHM_CHANNEL0.h
index 1a064ab..bd2f181 100644
--- a/include/bcm5719_SHM_CHANNEL0.h
+++ b/include/bcm5719_SHM_CHANNEL0.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -1853,7 +1853,14 @@ typedef struct SHM_CHANNEL_t {
     RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t NcsiChannelCtrlstatAllAen;
 
 #ifdef CXX_SIMULATOR
-    SHM_CHANNEL_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    SHM_CHANNEL_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         NcsiChannelInfo.r32.setComponentOffset(0x0);
         NcsiChannelMcid.r32.setComponentOffset(0x4);
@@ -1995,13 +2002,6 @@ typedef struct SHM_CHANNEL_t {
         NcsiChannelCtrlstatAllTx.print();
         NcsiChannelCtrlstatAllAen.print();
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */
diff --git a/include/bcm5719_SHM_CHANNEL1.h b/include/bcm5719_SHM_CHANNEL1.h
index e42824f..bbd748e 100644
--- a/include/bcm5719_SHM_CHANNEL1.h
+++ b/include/bcm5719_SHM_CHANNEL1.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/bcm5719_SHM_CHANNEL2.h b/include/bcm5719_SHM_CHANNEL2.h
index 0b073c4..957b744 100644
--- a/include/bcm5719_SHM_CHANNEL2.h
+++ b/include/bcm5719_SHM_CHANNEL2.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/bcm5719_SHM_CHANNEL3.h b/include/bcm5719_SHM_CHANNEL3.h
index dd2c315..c86f068 100644
--- a/include/bcm5719_SHM_CHANNEL3.h
+++ b/include/bcm5719_SHM_CHANNEL3.h
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
diff --git a/include/bcm5719_TXMBUF.h b/include/bcm5719_TXMBUF.h
index eab155c..cf7b4be 100644
--- a/include/bcm5719_TXMBUF.h
+++ b/include/bcm5719_TXMBUF.h
@@ -112,7 +112,14 @@ typedef struct TXMBUF_t {
     RegTXMBUFWord_t Word[7424];
 
 #ifdef CXX_SIMULATOR
-    TXMBUF_t()
+    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
+    callback_t mIndexReadCallback;
+    void* mIndexReadCallbackArgs;
+
+    callback_t mIndexWriteCallback;
+    void* mIndexWriteCallbackArgs;
+
+    TXMBUF_t() : mIndexReadCallback(0), mIndexReadCallbackArgs(0), mIndexWriteCallback(0), mIndexWriteCallbackArgs(0)
     {
         for(int i = 0; i < 7424; i++)
         {
@@ -126,13 +133,6 @@ typedef struct TXMBUF_t {
             Word[i].print();
         }
     }
-    typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*);
-    callback_t mIndexReadCallback;
-    void* mIndexReadCallbackArgs;
-
-    callback_t mIndexWriteCallback;
-    void* mIndexWriteCallbackArgs;
-
     uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); }
     void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); }
 #endif /* CXX_SIMULATOR */