HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r159:b822fb2ec6ef

Bug

paul -

r159:b822fb2ec6ef VHDLib206

parent child

Context file:

r159:b822fb2ec6ef

Collapse all files

FSW-qt/Makefile +1 -1

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.6) on: Thu Jun 19 07:41:34 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Fri Jun 20 15:19:24 2014
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-06-19T07:07:23. -->
+            <!-- Written by QtCreator 3.0.1, 2014-06-20T09:37:09. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

src/tc_load_dump_parameters.c +9 -12

                  *
                  */
-                int result;
                 int flag;
                 rtems_status_code status;
                 unsigned char sy_lfr_b_bp_p0;
                 if ( lfrCurrentMode == LFR_MODE_BURST ) {
                     status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
-                    result = LFR_DEFAULT;
+                    flag = LFR_DEFAULT;
                 }
                 sy_lfr_b_bp_p0 = TC->dataAndCRC[ DATAFIELD_POS_SY_LFR_B_BP_P0 ];
                 // SET HTE PARAMETERS
                 if (flag == LFR_SUCCESSFUL)
                 {
-                    result = set_sy_lfr_b_bp_p0( TC );
+                    flag = set_sy_lfr_b_bp_p0( TC );
-                    result = set_sy_lfr_b_bp_p1( TC );
+                    flag = set_sy_lfr_b_bp_p1( TC );
                 }
                 return flag;
                  *
                  */
-                int result;
                 int flag;
                 rtems_status_code status;
                 unsigned char sy_lfr_s1_bp_p0;
                 if ( lfrCurrentMode == LFR_MODE_SBM1 ) {
                     status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
-                    result = LFR_DEFAULT;
+                    flag = LFR_DEFAULT;
                 }
                 sy_lfr_s1_bp_p0 = TC->dataAndCRC[ DATAFIELD_POS_SY_LFR_S1_BP_P0 ];
                 // SET THE PARAMETERS
                 if (flag == LFR_SUCCESSFUL)
                 {
-                    result = set_sy_lfr_s1_bp_p0( TC );
+                    flag = set_sy_lfr_s1_bp_p0( TC );
-                    result = set_sy_lfr_s1_bp_p1( TC );
+                    flag = set_sy_lfr_s1_bp_p1( TC );
                 }
                 return flag;
                  *
                  */
-                int result;
                 int flag;
                 rtems_status_code status;
                 unsigned char sy_lfr_s2_bp_p0;
                 if ( lfrCurrentMode == LFR_MODE_SBM2 ) {
                     status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
-                    result = LFR_DEFAULT;
+                    flag = LFR_DEFAULT;
                 }
                 sy_lfr_s2_bp_p0 = TC->dataAndCRC[ DATAFIELD_POS_SY_LFR_S2_BP_P0 ];
                 // SET THE PARAMETERS
                 if (flag == LFR_SUCCESSFUL)
                 {
-                    result = set_sy_lfr_s2_bp_p0( TC );
+                    flag = set_sy_lfr_s2_bp_p0( TC );
-                    result = set_sy_lfr_s2_bp_p1( TC );
+                    flag = set_sy_lfr_s2_bp_p1( TC );
                 }
                 return flag;

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