Changeset 548 for trunk/platforms

Timestamp:

Oct 7, 2013, 6:35:20 PM (11 years ago)

Author:

meunier

Message:

Last commit contained unwanted local modifications; reverting them.

Location:

trunk/platforms/tsar_generic_xbar

Files:

• top.cpp (modified) (1 diff)
• top.desc (modified) (1 diff)
• tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h (modified) (1 diff)
• tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (2 diffs)

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -98 +98 @@
 ///////////////////////////////////////////////////
 
-#define USE_ALMOS 1
-//#define USE_GIET 
+//#define USE_ALMOS 1
+#define USE_GIET 1
 
 #ifdef USE_ALMOS

trunk/platforms/tsar_generic_xbar/top.desc

@@ -7 +7 @@
 
 vci_plen_size       = 8
-vci_addr_size       = 32
+vci_addr_size       = 40
 vci_rerror_size     = 1
 vci_clen_size       = 1

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h

@@ -204 +204 @@
                           dspin_rsp_width>*       wt_fbuf;
 
-    // for almos
-    VciSimpleRom<vci_param_int>*                   mnic;
+    VciMultiNic<vci_param_int>*                   mnic;
 
     VciDspinTargetWrapper<vci_param_int,

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -357 +357 @@
                      x_width + y_width + l_width);
 
-        /////////////////////////////////////////////
-        // Commented for almos; we don't want the nic; replaced by a rom
-        //int mac = 0xBEEF0000;
-        //mnic = new VciMultiNic<vci_param_int>(
-        //             "mnic",
-        //             IntTab(cluster_id, tgtid_mnic),
-        //             mtd,
-        //             nic_channels,
-        //             nic_rx_name,
-        //             nic_tx_name,
-        //             mac,             // mac_4 address
-        //             0xBABE );           // mac_2 address
-        mnic = new VciSimpleRom<vci_param_int>(
-                    "mnic",
-                    IntTab(cluster_id, tgtid_mnic),
-                    mtd,
-                    loader);
+        int mac = 0xBEEF0000;
+        mnic = new VciMultiNic<vci_param_int>(
+                     "mnic",
+                     IntTab(cluster_id, tgtid_mnic),
+                     mtd,
+                     nic_channels,
+                     nic_rx_name,
+                     nic_tx_name,
+                     mac,             // mac_4 address
+                     0xBABE );           // mac_2 address
 
         wt_mnic = new VciDspinTargetWrapper<vci_param_int,
@@ -726 +719 @@
         for (size_t i = 0; i < nic_channels; i++)
         {
-            //mnic->p_rx_irq[i]          (signal_irq_mnic_rx[i]);
-            //mnic->p_tx_irq[i]          (signal_irq_mnic_tx[i]);
+            mnic->p_rx_irq[i]          (signal_irq_mnic_rx[i]);
+            mnic->p_tx_irq[i]          (signal_irq_mnic_tx[i]);
         }