HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r78:c815bcdfb1c6

Minor modifications to meet Logiscope requirements

paul -

r78:c815bcdfb1c6 VHDLib206

parent child

Context file:

r78:c815bcdfb1c6

Collapse all files

FSW-qt/fsw-qt.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-15T09:52:17. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-15T13:43:04. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

src/tc_load_dump_parameters.c +13 -7

                 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;
                 }
                 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 {
                  */
                 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 {
                 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 {
                 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 ];
                 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
                 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 ];
                 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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages