##// END OF EJS Templates
Minor modifications to meet Logiscope requirements
paul -
r78:c815bcdfb1c6 VHDLib206
parent child
Show More
@@ -1,6 +1,6
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 2.8.1, 2013-11-15T09:52:17. -->
3 <!-- Written by QtCreator 2.8.1, 2013-11-15T13:43:04. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -40,12 +40,13 int action_load_normal_par(ccsdsTelecomm
40 40
41 41 int result;
42 42 int flag;
43 rtems_status_code status;
43 44
44 45 flag = LFR_SUCCESSFUL;
45 46
46 47 if ( (lfrCurrentMode == LFR_MODE_NORMAL) ||
47 48 (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) ) {
48 send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
49 status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
49 50 flag = LFR_DEFAULT;
50 51 }
51 52
@@ -118,12 +119,13 int action_load_burst_par(ccsdsTelecomma
118 119
119 120 int result;
120 121 unsigned char lfrMode;
122 rtems_status_code status;
121 123
122 124 result = LFR_DEFAULT;
123 125 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
124 126
125 127 if ( lfrMode == LFR_MODE_BURST ) {
126 send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
128 status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
127 129 result = LFR_DEFAULT;
128 130 }
129 131 else {
@@ -146,12 +148,13 int action_load_sbm1_par(ccsdsTelecomman
146 148 */
147 149 int result;
148 150 unsigned char lfrMode;
151 rtems_status_code status;
149 152
150 153 result = LFR_DEFAULT;
151 154 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
152 155
153 156 if ( (lfrMode == LFR_MODE_SBM1) || (lfrMode == LFR_MODE_SBM2) ) {
154 send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
157 status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
155 158 result = LFR_DEFAULT;
156 159 }
157 160 else {
@@ -175,12 +178,13 int action_load_sbm2_par(ccsdsTelecomman
175 178
176 179 int result;
177 180 unsigned char lfrMode;
181 rtems_status_code status;
178 182
179 183 result = LFR_DEFAULT;
180 184 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
181 185
182 186 if ( (lfrMode == LFR_MODE_SBM2) || (lfrMode == LFR_MODE_SBM2) ) {
183 send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
187 status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
184 188 result = LFR_DEFAULT;
185 189 }
186 190 else {
@@ -245,6 +249,7 int set_sy_lfr_n_swf_l( ccsdsTelecommand
245 249 int result;
246 250 unsigned char msb;
247 251 unsigned char lsb;
252 rtems_status_code status;
248 253
249 254 msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_L ];
250 255 lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_L+1 ];
@@ -255,12 +260,12 int set_sy_lfr_n_swf_l( ccsdsTelecommand
255 260
256 261 if ( (tmp < 16) || (tmp > 2048) ) // the snapshot period is a multiple of 16
257 262 { // 2048 is the maximum limit due to the size of the buffers
258 send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb, time );
263 status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb, time );
259 264 result = WRONG_APP_DATA;
260 265 }
261 266 else if (tmp != 2048)
262 267 {
263 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
268 status = send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
264 269 result = FUNCT_NOT_IMPL;
265 270 }
266 271 else
@@ -286,6 +291,7 int set_sy_lfr_n_swf_p(ccsdsTelecommandP
286 291 int result;
287 292 unsigned char msb;
288 293 unsigned char lsb;
294 rtems_status_code status;
289 295
290 296 msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_P ];
291 297 lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_P+1 ];
@@ -296,7 +302,7 int set_sy_lfr_n_swf_p(ccsdsTelecommandP
296 302
297 303 if ( (tmp < 16) || (tmp > 65528) )
298 304 {
299 send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb, time );
305 status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb, time );
300 306 result = WRONG_APP_DATA;
301 307 }
302 308 else
General Comments 0
You need to be logged in to leave comments. Login now