Changeset 742 for branches/fault_tolerance/platforms

Timestamp:

Jul 9, 2014, 5:36:08 PM (10 years ago)

Author:

cfuguet

Message:

Merge 'trunk' into 'fault_tolerance'

• Introducing last bugfixes of trunk into the fault_tolerance branch

Location:

branches/fault_tolerance/platforms/tsar_generic_iob

Files:

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

branches/fault_tolerance/platforms/tsar_generic_iob/top.cpp

@@ -47 +47 @@
 // Besides the external peripherals, each cluster contains one XICU component,
 // and one multi channels DMA component.
-// The XICU component is mainly used to handle WTI IRQs, as only 2 HWI IRQs
+// The XICU component is mainly used to handle WTI IRQs, as only 5 HWI IRQs
 // are connected to XICU in each cluster:
 // - IRQ_IN[0] : MMC

branches/fault_tolerance/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -71 +71 @@
     // interrupt signals
     sc_signal<bool>                       signal_false;
-    sc_signal<bool>                       signal_proc_it[8];
+    sc_signal<bool>                       signal_proc_it[16];
     sc_signal<bool>                       signal_irq_mdma[8];
     sc_signal<bool>                       signal_irq_memc;

branches/fault_tolerance/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -639 +639 @@
     }
 
-   SC_METHOD(init);
+    SC_METHOD(init);
+
 } // end constructor
 
 tmpl(void)::init()
 {
-    signal_ram_dspin_cmd_false.write = false;
-    signal_ram_dspin_cmd_false.read = true;
-    signal_ram_dspin_rsp_false.write = false;
-    signal_ram_dspin_rsp_false.read = true;
+   signal_ram_dspin_cmd_false.write = false;
+   signal_ram_dspin_rsp_false.read  = true;
 } // end init