# HG changeset patch # User paul # Date 2013-11-15 12:43:48 # Node ID c815bcdfb1c6b9dd892314413a659c33ce231640 # Parent 4928e8d9328f4ca80eb2d75bf71589bdd1d9511a Minor modifications to meet Logiscope requirements diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user --- a/FSW-qt/fsw-qt.pro.user +++ b/FSW-qt/fsw-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/src/tc_load_dump_parameters.c b/src/tc_load_dump_parameters.c --- a/src/tc_load_dump_parameters.c +++ b/src/tc_load_dump_parameters.c @@ -40,12 +40,13 @@ int action_load_normal_par(ccsdsTelecomm int result; int flag; + rtems_status_code status; flag = LFR_SUCCESSFUL; if ( (lfrCurrentMode == LFR_MODE_NORMAL) || (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) ) { - send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); + status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); flag = LFR_DEFAULT; } @@ -118,12 +119,13 @@ int action_load_burst_par(ccsdsTelecomma int result; unsigned char lfrMode; + rtems_status_code status; result = LFR_DEFAULT; lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4; if ( lfrMode == LFR_MODE_BURST ) { - send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); + status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); result = LFR_DEFAULT; } else { @@ -146,12 +148,13 @@ int action_load_sbm1_par(ccsdsTelecomman */ int result; unsigned char lfrMode; + rtems_status_code status; result = LFR_DEFAULT; lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4; if ( (lfrMode == LFR_MODE_SBM1) || (lfrMode == LFR_MODE_SBM2) ) { - send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); + status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); result = LFR_DEFAULT; } else { @@ -175,12 +178,13 @@ int action_load_sbm2_par(ccsdsTelecomman int result; unsigned char lfrMode; + rtems_status_code status; result = LFR_DEFAULT; lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4; if ( (lfrMode == LFR_MODE_SBM2) || (lfrMode == LFR_MODE_SBM2) ) { - send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); + status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time ); result = LFR_DEFAULT; } else { @@ -245,6 +249,7 @@ int set_sy_lfr_n_swf_l( ccsdsTelecommand int result; unsigned char msb; unsigned char lsb; + rtems_status_code status; msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_L ]; lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_L+1 ]; @@ -255,12 +260,12 @@ int set_sy_lfr_n_swf_l( ccsdsTelecommand if ( (tmp < 16) || (tmp > 2048) ) // the snapshot period is a multiple of 16 { // 2048 is the maximum limit due to the size of the buffers - send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb, time ); + status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb, time ); result = WRONG_APP_DATA; } else if (tmp != 2048) { - send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time ); + status = send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time ); result = FUNCT_NOT_IMPL; } else @@ -286,6 +291,7 @@ int set_sy_lfr_n_swf_p(ccsdsTelecommandP int result; unsigned char msb; unsigned char lsb; + rtems_status_code status; msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_P ]; lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_P+1 ]; @@ -296,7 +302,7 @@ int set_sy_lfr_n_swf_p(ccsdsTelecommandP if ( (tmp < 16) || (tmp > 65528) ) { - send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb, time ); + status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb, time ); result = WRONG_APP_DATA; } else