Update TX/RX sim generation

10 files changed, 22 insertions, 15 deletions

diff --git a/ipxact/regen.sh b/ipxact/regen.sh
index 85b19c3..0925ad0 100755
--- a/ipxact/regen.sh
+++ b/ipxact/regen.sh
@@ -57,6 +57,4 @@ rm APE_APE*.cpp
 rm APE_SHM*.cpp
 rm APE_NVM*.cpp
 rm APE_DEVICE*.cpp
-rm APE_TX_PORT*.cpp
-rm APE_RX_PORT*.cpp
 mv *.cpp ../simulator/
diff --git a/libs/bcm5719/APE_sym.s b/libs/bcm5719/APE_sym.s
index ecb5b80..075d3dd 100644
--- a/libs/bcm5719/APE_sym.s
+++ b/libs/bcm5719/APE_sym.s
@@ -90,7 +90,7 @@
 
 .global RX_PORT
 .equ    RX_PORT, 0xa0000000
-.size   RX_PORT, 0x0
+.size   RX_PORT, 0x4000
 
 .global RX_PORT1
 .equ    RX_PORT1, 0xa0004000
diff --git a/simulator/APE_RX_PORT.cpp b/simulator/APE_RX_PORT.cpp
index 9de1523..4eb4e45 100644
--- a/simulator/APE_RX_PORT.cpp
+++ b/simulator/APE_RX_PORT.cpp
@@ -49,5 +49,7 @@ RX_PORT_t RX_PORT;
 void init_APE_RX_PORT(void)
 {
     /** @brief Component Registers for @ref RX_PORT. */
+    /** @brief Bitmap for @ref RX_PORT_t.In. */
+
 
 }
diff --git a/simulator/APE_RX_PORT1.cpp b/simulator/APE_RX_PORT1.cpp
index b15e9bb..da98e59 100644
--- a/simulator/APE_RX_PORT1.cpp
+++ b/simulator/APE_RX_PORT1.cpp
@@ -49,7 +49,7 @@ RX_PORT_t RX_PORT1;
 void init_APE_RX_PORT1(void)
 {
     /** @brief Component Registers for @ref RX_PORT1. */
-    /** @brief Bitmap for @ref RX_PORT1_t.Queue. */
+    /** @brief Bitmap for @ref RX_PORT1_t.In. */
 
 
 }
diff --git a/simulator/APE_RX_PORT1_sim.cpp b/simulator/APE_RX_PORT1_sim.cpp
index c6472b2..8cfdf65 100644
--- a/simulator/APE_RX_PORT1_sim.cpp
+++ b/simulator/APE_RX_PORT1_sim.cpp
@@ -88,11 +88,11 @@ void init_APE_RX_PORT1_sim(void *arg0)
     RX_PORT1.mIndexWriteCallbackArgs = base;
 
     /** @brief Component Registers for @ref RX_PORT1. */
-    /** @brief Bitmap for @ref RX_PORT1_t.Queue. */
+    /** @brief Bitmap for @ref RX_PORT1_t.In. */
     for(int i = 0; i < 4096; i++)
     {
-        RX_PORT1.Queue[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        RX_PORT1.Queue[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        RX_PORT1.In[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        RX_PORT1.In[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
 
diff --git a/simulator/APE_RX_PORT2.cpp b/simulator/APE_RX_PORT2.cpp
index fc52c61..27a2d08 100644
--- a/simulator/APE_RX_PORT2.cpp
+++ b/simulator/APE_RX_PORT2.cpp
@@ -49,7 +49,7 @@ RX_PORT_t RX_PORT2;
 void init_APE_RX_PORT2(void)
 {
     /** @brief Component Registers for @ref RX_PORT2. */
-    /** @brief Bitmap for @ref RX_PORT2_t.Queue. */
+    /** @brief Bitmap for @ref RX_PORT2_t.In. */
 
 
 }
diff --git a/simulator/APE_RX_PORT2_sim.cpp b/simulator/APE_RX_PORT2_sim.cpp
index 4bfee63..c78d278 100644
--- a/simulator/APE_RX_PORT2_sim.cpp
+++ b/simulator/APE_RX_PORT2_sim.cpp
@@ -88,11 +88,11 @@ void init_APE_RX_PORT2_sim(void *arg0)
     RX_PORT2.mIndexWriteCallbackArgs = base;
 
     /** @brief Component Registers for @ref RX_PORT2. */
-    /** @brief Bitmap for @ref RX_PORT2_t.Queue. */
+    /** @brief Bitmap for @ref RX_PORT2_t.In. */
     for(int i = 0; i < 4096; i++)
     {
-        RX_PORT2.Queue[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        RX_PORT2.Queue[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        RX_PORT2.In[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        RX_PORT2.In[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
 
diff --git a/simulator/APE_RX_PORT3.cpp b/simulator/APE_RX_PORT3.cpp
index 7003194..f444fe2 100644
--- a/simulator/APE_RX_PORT3.cpp
+++ b/simulator/APE_RX_PORT3.cpp
@@ -49,7 +49,7 @@ RX_PORT_t RX_PORT3;
 void init_APE_RX_PORT3(void)
 {
     /** @brief Component Registers for @ref RX_PORT3. */
-    /** @brief Bitmap for @ref RX_PORT3_t.Queue. */
+    /** @brief Bitmap for @ref RX_PORT3_t.In. */
 
 
 }
diff --git a/simulator/APE_RX_PORT3_sim.cpp b/simulator/APE_RX_PORT3_sim.cpp
index 6ce0c7e..a46dc3e 100644
--- a/simulator/APE_RX_PORT3_sim.cpp
+++ b/simulator/APE_RX_PORT3_sim.cpp
@@ -88,11 +88,11 @@ void init_APE_RX_PORT3_sim(void *arg0)
     RX_PORT3.mIndexWriteCallbackArgs = base;
 
     /** @brief Component Registers for @ref RX_PORT3. */
-    /** @brief Bitmap for @ref RX_PORT3_t.Queue. */
+    /** @brief Bitmap for @ref RX_PORT3_t.In. */
     for(int i = 0; i < 4096; i++)
     {
-        RX_PORT3.Queue[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
-        RX_PORT3.Queue[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+        RX_PORT3.In[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        RX_PORT3.In[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
     }
 
 
diff --git a/simulator/APE_RX_PORT_sim.cpp b/simulator/APE_RX_PORT_sim.cpp
index 0691736..9f63ecb 100644
--- a/simulator/APE_RX_PORT_sim.cpp
+++ b/simulator/APE_RX_PORT_sim.cpp
@@ -88,5 +88,12 @@ void init_APE_RX_PORT_sim(void *arg0)
     RX_PORT.mIndexWriteCallbackArgs = base;
 
     /** @brief Component Registers for @ref RX_PORT. */
+    /** @brief Bitmap for @ref RX_PORT_t.In. */
+    for(int i = 0; i < 4096; i++)
+    {
+        RX_PORT.In[i].r32.installReadCallback(loader_read_mem, (uint8_t *)base);
+        RX_PORT.In[i].r32.installWriteCallback(loader_write_mem, (uint8_t *)base);
+    }
+
 
 }