# HG changeset patch
# User paul
# Date 2013-11-08 11:24:12
# Node ID 95058e78e8112fab1f68297e3cf5eac412bfc773
# Parent  583d98e44596e2177cefa4a39ac9c46a2e450234

fsw-0-20

diff --git a/header/fsw_params.h b/header/fsw_params.h
--- a/header/fsw_params.h
+++ b/header/fsw_params.h
@@ -36,7 +36,7 @@
 #define DEFAULT_SY_LFR_COMMON1 0x10 // default value 0 0 0 1 0 0 0 0
 // NORM
 #define SY_LFR_N_SWF_L 2048 // nb sample
-#define SY_LFR_N_SWF_P 300  // sec
+#define SY_LFR_N_SWF_P 296  // sec
 #define SY_LFR_N_ASM_P 3600 // sec
 #define SY_LFR_N_BP_P0 4    // sec
 #define SY_LFR_N_BP_P1 20   // sec
diff --git a/src/fsw_init.c b/src/fsw_init.c
--- a/src/fsw_init.c
+++ b/src/fsw_init.c
@@ -387,7 +387,7 @@ int create_all_tasks( void ) // create a
     {
         status = rtems_task_create(
             Task_name[TASKID_SEND], TASK_PRIORITY_SEND, RTEMS_MINIMUM_STACK_SIZE,
-            RTEMS_DEFAULT_MODES,
+            RTEMS_DEFAULT_MODES | RTEMS_NO_PREEMPT,
             RTEMS_DEFAULT_ATTRIBUTES, &Task_id[TASKID_SEND]
         );
     }
diff --git a/src/fsw_spacewire.c b/src/fsw_spacewire.c
--- a/src/fsw_spacewire.c
+++ b/src/fsw_spacewire.c
@@ -228,20 +228,9 @@ rtems_task send_task( rtems_task_argumen
             else // the incoming message is a spw_ioctl_pkt_send structure
             {
                 spw_ioctl_send = (spw_ioctl_pkt_send*) incomingData;
-                if (spw_ioctl_send->hlen == 0)
-                {
-                    status = write( fdSPW, spw_ioctl_send->data, spw_ioctl_send->dlen );
-                    if (status == -1){
-                        PRINTF2("in SEND *** (2.b) ERRNO = %d, dlen = %d\n", errno, spw_ioctl_send->dlen)
-                    }
-                }
-                else
-                {
-                    status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, spw_ioctl_send );
-                    if (status == -1){
-                        PRINTF2("in SEND *** (2.c) ERRNO = %d, dlen = %d\n", errno, spw_ioctl_send->dlen)
-                        PRINTF1("                            hlen = %d\n", spw_ioctl_send->hlen)
-                    }
+                status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, spw_ioctl_send );
+                if (status == -1){
+                    PRINTF2("in SEND *** (2.b) ERRNO = %d, RTEMS = %d\n", errno, status)
                 }
             }
         }
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
@@ -42,9 +42,9 @@ int action_load_normal_par(ccsdsTelecomm
     int flag;
 
     flag = LFR_SUCCESSFUL;
-    result = LFR_SUCCESSFUL;
 
-    if ( lfrCurrentMode == LFR_MODE_NORMAL ) {
+    if ( (lfrCurrentMode == LFR_MODE_NORMAL) ||
+         (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) ) {
         send_tm_lfr_tc_exe_not_executable( TC, queue_id );
         flag = LFR_DEFAULT;
     }
@@ -104,7 +104,7 @@ int action_load_normal_par(ccsdsTelecomm
         }
     }
 
-    return result;
+    return flag;
 }
 
 int action_load_burst_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)
diff --git a/src/wf_handler.c b/src/wf_handler.c
--- a/src/wf_handler.c
+++ b/src/wf_handler.c
@@ -1183,8 +1183,8 @@ void increment_seq_counter_source_id( un
     unsigned short segmentation_grouping_flag;
     unsigned short new_packet_sequence_control;
 
-    if ( (sid ==SID_NORM_SWF_F0) || (sid ==SID_NORM_SWF_F1) || (sid ==SID_NORM_SWF_F2)
-         || (sid ==SID_BURST_CWF_F2) )
+    if ( (sid ==SID_NORM_SWF_F0)    || (sid ==SID_NORM_SWF_F1) || (sid ==SID_NORM_SWF_F2)
+         || (sid ==SID_NORM_CWF_F3) || (sid ==SID_BURST_CWF_F2) )
     {
         sequence_cnt = &sequenceCounters_SCIENCE_NORMAL_BURST;
     }