Changeset 533 for trunk/platforms/tsar_generic_iob

Timestamp:

Sep 22, 2013, 8:01:58 PM (11 years ago)

Author:

cfuguet

Message:

Modification in tsar_generic_iob platform:

• Fixing compilation error concerning the unexisting bind function in the SystemC sc_in class

Location:

trunk/platforms/tsar_generic_iob

Files:

• top.cpp (modified) (1 diff)
• tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (modified) (1 diff)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -1119 +1119 @@
     for ( size_t n=0 ; n<32 ; n++ )
     {
-        if      ( n < 8  ) clusters[0][0]->p_irq[n]->bind    (signal_unused_irq[n]);
-        else if ( n < 10 ) clusters[0][0]->p_irq[n]->bind    (signal_irq_mnic_rx[n-8]);
-        else if ( n < 12 ) clusters[0][0]->p_irq[n]->bind    (signal_irq_mnic_tx[n-10]);
-        else if ( n < 16 ) clusters[0][0]->p_irq[n]->bind    (signal_irq_cdma[n-12]);
-        else if ( n < mx ) clusters[0][0]->p_irq[n]->bind    (signal_irq_mtty[n-16]);
-        else if ( n < 31 ) clusters[0][0]->p_irq[n]->bind    (signal_unused_irq[n]);
-        else               clusters[0][0]->p_irq[n]->bind    (signal_irq_bdev);
+        if      ( n < 8  ) (*clusters[0][0]->p_irq[n])       (signal_unused_irq[n]);
+        else if ( n < 10 ) (*clusters[0][0]->p_irq[n])       (signal_irq_mnic_rx[n-8]);
+        else if ( n < 12 ) (*clusters[0][0]->p_irq[n])       (signal_irq_mnic_tx[n-10]);
+        else if ( n < 16 ) (*clusters[0][0]->p_irq[n])       (signal_irq_cdma[n-12]);
+        else if ( n < mx ) (*clusters[0][0]->p_irq[n])       (signal_irq_mtty[n-16]);
+        else if ( n < 31 ) (*clusters[0][0]->p_irq[n])       (signal_unused_irq[n]);
+        else               (*clusters[0][0]->p_irq[n])       (signal_irq_bdev);
     }
 
     // IOB0 cluster connexion to IOX network
-    clusters[0][0]->p_vci_iox_ini->bind                      (signal_vci_ini_iob0);
-    clusters[0][0]->p_vci_iox_tgt->bind                      (signal_vci_tgt_iob0);
+    (*clusters[0][0]->p_vci_iox_ini)                         (signal_vci_ini_iob0);
+    (*clusters[0][0]->p_vci_iox_tgt)                         (signal_vci_tgt_iob0);
 
     // IOB1 cluster connexion to IOX network
-    clusters[XMAX-1][YMAX-1]->p_vci_iox_ini->bind            (signal_vci_ini_iob1);
-    clusters[XMAX-1][YMAX-1]->p_vci_iox_tgt->bind            (signal_vci_tgt_iob1);
+    (*clusters[XMAX-1][YMAX-1]->p_vci_iox_ini)               (signal_vci_ini_iob1);
+    (*clusters[XMAX-1][YMAX-1]->p_vci_iox_tgt)               (signal_vci_tgt_iob1);
 
     // All clusters Clock & RESET connexions

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -717 +717 @@
         if ( cluster_id == cluster_iob0 )
             for ( size_t n=0 ; n<32 ; n++ )
-                iob->p_irq[n]->bind              (*(this->p_irq[n]));
+                (*iob->p_irq[n])                 (*(this->p_irq[n]));
 
         // initiator wrapper to RAM network