statistics: Enable recording packet statistics for NCSI TX/RX and Ethernet TX/RX (#102)v0.3.378

8 files changed, 140 insertions, 144 deletions

diff --git a/simulator/bcm5719_SHM_CHANNEL0.cpp b/simulator/bcm5719_SHM_CHANNEL0.cpp
index 94519ed..d1fac5e 100644
--- a/simulator/bcm5719_SHM_CHANNEL0.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL0.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL0(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */
@@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL0(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL0_sim.cpp b/simulator/bcm5719_SHM_CHANNEL0_sim.cpp
index 3f19cfd..59230ad 100644
--- a/simulator/bcm5719_SHM_CHANNEL0_sim.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL0_sim.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL0_sim(void *base)
     SHM_CHANNEL0.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL0.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-    SHM_CHANNEL0.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
-
+    for(int i = 0; i < 1; i++)
+    {
+        SHM_CHANNEL0.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base);
+        SHM_CHANNEL0.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base);
+    }
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
     SHM_CHANNEL0.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL0.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
@@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL0_sim(void *base)
         SHM_CHANNEL0.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base);
         SHM_CHANNEL0.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base);
     }
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
+    SHM_CHANNEL0.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
+    SHM_CHANNEL0.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
+    SHM_CHANNEL0.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
+    SHM_CHANNEL0.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
+    SHM_CHANNEL0.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
+    SHM_CHANNEL0.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
-    SHM_CHANNEL0.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL0.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
+    SHM_CHANNEL0.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL0.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL1.cpp b/simulator/bcm5719_SHM_CHANNEL1.cpp
index 98998a2..55a979d 100644
--- a/simulator/bcm5719_SHM_CHANNEL1.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL1.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL1(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */
@@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL1(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL1_sim.cpp b/simulator/bcm5719_SHM_CHANNEL1_sim.cpp
index 1c82fda..3b6f011 100644
--- a/simulator/bcm5719_SHM_CHANNEL1_sim.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL1_sim.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL1_sim(void *base)
     SHM_CHANNEL1.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL1.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-    SHM_CHANNEL1.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
-
+    for(int i = 0; i < 1; i++)
+    {
+        SHM_CHANNEL1.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base);
+        SHM_CHANNEL1.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base);
+    }
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
     SHM_CHANNEL1.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL1.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
@@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL1_sim(void *base)
         SHM_CHANNEL1.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base);
         SHM_CHANNEL1.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base);
     }
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
+    SHM_CHANNEL1.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
+    SHM_CHANNEL1.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
+    SHM_CHANNEL1.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
+    SHM_CHANNEL1.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
+    SHM_CHANNEL1.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
+    SHM_CHANNEL1.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
-    SHM_CHANNEL1.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL1.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
+    SHM_CHANNEL1.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL1.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL2.cpp b/simulator/bcm5719_SHM_CHANNEL2.cpp
index 5afe988..b233379 100644
--- a/simulator/bcm5719_SHM_CHANNEL2.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL2.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL2(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */
@@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL2(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL2_sim.cpp b/simulator/bcm5719_SHM_CHANNEL2_sim.cpp
index c01aa6f..34b4d98 100644
--- a/simulator/bcm5719_SHM_CHANNEL2_sim.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL2_sim.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL2_sim(void *base)
     SHM_CHANNEL2.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL2.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-    SHM_CHANNEL2.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
-
+    for(int i = 0; i < 1; i++)
+    {
+        SHM_CHANNEL2.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base);
+        SHM_CHANNEL2.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base);
+    }
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
     SHM_CHANNEL2.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL2.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
@@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL2_sim(void *base)
         SHM_CHANNEL2.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base);
         SHM_CHANNEL2.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base);
     }
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
+    SHM_CHANNEL2.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
+    SHM_CHANNEL2.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
+    SHM_CHANNEL2.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
+    SHM_CHANNEL2.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
+    SHM_CHANNEL2.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
+    SHM_CHANNEL2.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
-    SHM_CHANNEL2.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL2.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
+    SHM_CHANNEL2.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL2.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL3.cpp b/simulator/bcm5719_SHM_CHANNEL3.cpp
index a1a5663..f844395 100644
--- a/simulator/bcm5719_SHM_CHANNEL3.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL3.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL3(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */
@@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL3(void)
 
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
 
 
 }
diff --git a/simulator/bcm5719_SHM_CHANNEL3_sim.cpp b/simulator/bcm5719_SHM_CHANNEL3_sim.cpp
index a28e58c..550b2a5 100644
--- a/simulator/bcm5719_SHM_CHANNEL3_sim.cpp
+++ b/simulator/bcm5719_SHM_CHANNEL3_sim.cpp
@@ -10,7 +10,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @copyright Copyright (c) 2018, Evan Lojewski
+/// @copyright Copyright (c) 2020, Evan Lojewski
 /// @cond
 ///
 /// All rights reserved.
@@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL3_sim(void *base)
     SHM_CHANNEL3.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL3.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
-    SHM_CHANNEL3.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
-
+    for(int i = 0; i < 1; i++)
+    {
+        SHM_CHANNEL3.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base);
+        SHM_CHANNEL3.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base);
+    }
     /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */
     SHM_CHANNEL3.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base);
     SHM_CHANNEL3.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
@@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL3_sim(void *base)
         SHM_CHANNEL3.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base);
         SHM_CHANNEL3.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base);
     }
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */
+    SHM_CHANNEL3.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */
+    SHM_CHANNEL3.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */
+    SHM_CHANNEL3.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */
+    SHM_CHANNEL3.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */
+    SHM_CHANNEL3.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */
+    SHM_CHANNEL3.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */
-    SHM_CHANNEL3.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
-    SHM_CHANNEL3.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
+    /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */
+    SHM_CHANNEL3.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base);
+    SHM_CHANNEL3.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base);
 
 
 }