Ignore:
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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fault_tolerance/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

    r724 r742  
    639639    }
    640640
    641    SC_METHOD(init);
     641    SC_METHOD(init);
     642
    642643} // end constructor
    643644
    644645tmpl(void)::init()
    645646{
    646     signal_ram_dspin_cmd_false.write = false;
    647     signal_ram_dspin_cmd_false.read = true;
    648     signal_ram_dspin_rsp_false.write = false;
    649     signal_ram_dspin_rsp_false.read = true;
     647   signal_ram_dspin_cmd_false.write = false;
     648   signal_ram_dspin_rsp_false.read  = true;
    650649} // end init
    651650
Note: See TracChangeset for help on using the changeset viewer.