Rename FILTERS to FILTERS0 to match the rest of the APE network peripherals.

4 files changed, 49 insertions, 40 deletions

diff --git a/simulator/APE_FILTERS.cpp b/simulator/APE_FILTERS0.cpp
index 04f9d16..7cc38ff 100644
--- a/simulator/APE_FILTERS.cpp
+++ b/simulator/APE_FILTERS0.cpp
@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @file       APE_FILTERS.cpp
+/// @file       APE_FILTERS0.cpp
 ///
 /// @project    ape
 ///
-/// @brief      APE_FILTERS
+/// @brief      APE_FILTERS0
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
@@ -42,22 +42,22 @@
 /// @endcond
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <APE_FILTERS.h>
+#include <APE_FILTERS0.h>
 
-FILTERS_t FILTERS;
+FILTERS_t FILTERS0;
 
-void init_APE_FILTERS(void)
+void init_APE_FILTERS0(void)
 {
-    /** @brief Component Registers for @ref FILTERS. */
-    /** @brief Bitmap for @ref FILTERS_t.ElementConfig. */
+    /** @brief Component Registers for @ref FILTERS0. */
+    /** @brief Bitmap for @ref FILTERS0_t.ElementConfig. */
 
-    /** @brief Bitmap for @ref FILTERS_t.ElementPattern. */
+    /** @brief Bitmap for @ref FILTERS0_t.ElementPattern. */
 
-    /** @brief Bitmap for @ref FILTERS_t.RuleConfiguration. */
+    /** @brief Bitmap for @ref FILTERS0_t.RuleConfiguration. */
 
-    /** @brief Bitmap for @ref FILTERS_t.RuleSet. */
+    /** @brief Bitmap for @ref FILTERS0_t.RuleSet. */
 
-    /** @brief Bitmap for @ref FILTERS_t.RuleMask. */
+    /** @brief Bitmap for @ref FILTERS0_t.RuleMask. */
 
 
 }
diff --git a/simulator/APE_FILTERS_sim.cpp b/simulator/APE_FILTERS0_sim.cpp
index c3d2a4d..175a4ba 100644
--- a/simulator/APE_FILTERS_sim.cpp
+++ b/simulator/APE_FILTERS0_sim.cpp
@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// @file       APE_FILTERS_sim.cpp
+/// @file       APE_FILTERS0_sim.cpp
 ///
 /// @project    ape
 ///
-/// @brief      APE_FILTERS_sim
+/// @brief      APE_FILTERS0_sim
 ///
 ////////////////////////////////////////////////////////////////////////////////
 ///
@@ -45,7 +45,7 @@
 #include <stdint.h>
 #include <utility>
 #include <bcm5719_SHM.h>
-#include <APE_FILTERS.h>
+#include <APE_FILTERS0.h>
 
 static uint32_t loader_read_mem(uint32_t val, uint32_t offset, void *args)
 {
@@ -76,48 +76,48 @@ static uint32_t loader_write_mem(uint32_t val, uint32_t offset, void *args)
     return val;
 }
 
-void init_APE_FILTERS_sim(void *arg0)
+void init_APE_FILTERS0_sim(void *arg0)
 {
     (void)arg0; // unused
     void* base = (void*)0xa0048000;
 
-    FILTERS.mIndexReadCallback = loader_read_mem;
-    FILTERS.mIndexReadCallbackArgs = base;
+    FILTERS0.mIndexReadCallback = loader_read_mem;
+    FILTERS0.mIndexReadCallbackArgs = base;
 
-    FILTERS.mIndexWriteCallback = loader_write_mem;
-    FILTERS.mIndexWriteCallbackArgs = base;
+    FILTERS0.mIndexWriteCallback = loader_write_mem;
+    FILTERS0.mIndexWriteCallbackArgs = base;
 
-    /** @brief Component Registers for @ref FILTERS. */
-    /** @brief Bitmap for @ref FILTERS_t.ElementConfig. */
+    /** @brief Component Registers for @ref FILTERS0. */
+    /** @brief Bitmap for @ref FILTERS0_t.ElementConfig. */
     for(int i = 0; i < 32; i++)
     {
-        FILTERS.ElementConfig[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        FILTERS.ElementConfig[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        FILTERS0.ElementConfig[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        FILTERS0.ElementConfig[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
-    /** @brief Bitmap for @ref FILTERS_t.ElementPattern. */
+    /** @brief Bitmap for @ref FILTERS0_t.ElementPattern. */
     for(int i = 0; i < 32; i++)
     {
-        FILTERS.ElementPattern[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        FILTERS.ElementPattern[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        FILTERS0.ElementPattern[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        FILTERS0.ElementPattern[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
-    /** @brief Bitmap for @ref FILTERS_t.RuleConfiguration. */
-    FILTERS.RuleConfiguration.r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-    FILTERS.RuleConfiguration.r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+    /** @brief Bitmap for @ref FILTERS0_t.RuleConfiguration. */
+    FILTERS0.RuleConfiguration.r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+    FILTERS0.RuleConfiguration.r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
 
-    /** @brief Bitmap for @ref FILTERS_t.RuleSet. */
+    /** @brief Bitmap for @ref FILTERS0_t.RuleSet. */
     for(int i = 0; i < 31; i++)
     {
-        FILTERS.RuleSet[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        FILTERS.RuleSet[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        FILTERS0.RuleSet[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        FILTERS0.RuleSet[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
-    /** @brief Bitmap for @ref FILTERS_t.RuleMask. */
+    /** @brief Bitmap for @ref FILTERS0_t.RuleMask. */
     for(int i = 0; i < 31; i++)
     {
-        FILTERS.RuleMask[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        FILTERS.RuleMask[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        FILTERS0.RuleMask[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        FILTERS0.RuleMask[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
 
diff --git a/simulator/CMakeLists.txt b/simulator/CMakeLists.txt
index 3dc2402..d8061ab 100644
--- a/simulator/CMakeLists.txt
+++ b/simulator/CMakeLists.txt
@@ -27,8 +27,8 @@ simulator_add_library(${PROJECT_NAME} STATIC
             bcm5719_SHM_CHANNEL3_sim.cpp
 
             # APE indirect registers
-            APE_FILTERS.cpp
-            APE_FILTERS_sim.cpp
+            APE_FILTERS0.cpp
+            APE_FILTERS0_sim.cpp
             APE_NVIC.cpp
             APE_NVIC_sim.cpp
 
diff --git a/simulator/HAL.cpp b/simulator/HAL.cpp
index f5c8857..4ad672b 100644
--- a/simulator/HAL.cpp
+++ b/simulator/HAL.cpp
@@ -11,7 +11,7 @@
 #include <bcm5719_SHM_CHANNEL3.h>
 #include <bcm5719_GEN.h>
 #include <APE_NVIC.h>
-#include <APE_FILTERS.h>
+#include <APE_FILTERS0.h>
 #include <APE_TX_PORT0.h>
 #include <APE_RX_PORT0.h>
 #include <APE_TX_PORT1.h>
@@ -20,6 +20,9 @@
 #include <APE_RX_PORT2.h>
 #include <APE_TX_PORT3.h>
 #include <APE_RX_PORT3.h>
+// #include <APE_DEVICE1.h>
+// #include <APE_DEVICE2.h>
+// #include <APE_DEVICE3.h>
 
 #include <dirent.h>
 #include <endian.h>
@@ -284,8 +287,8 @@ bool initHAL(const char *pci_path, int wanted_function)
     init_bcm5719_SHM_CHANNEL3();
     init_bcm5719_SHM_CHANNEL3_sim(&APEBase[0x4c00]);
 
-    init_APE_FILTERS();
-    init_APE_FILTERS_sim(NULL);
+    init_APE_FILTERS0();
+    init_APE_FILTERS0_sim(NULL);
 
     init_APE_NVIC();
     init_APE_NVIC_sim(NULL);
@@ -314,5 +317,11 @@ bool initHAL(const char *pci_path, int wanted_function)
     init_APE_RX_PORT3();
     init_APE_RX_PORT3_sim(NULL);
 
+    // init_APE_DEVICE1();
+    // init_APE_DEVICE1_sim(NULL);
+    // init_APE_DEVICE2();
+    // init_APE_DEVICE2_sim(NULL);
+    // init_APE_DEVICE3();
+    // init_APE_DEVICE3_sim(NULL);
     return true;
 }