HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r133:0209817182bd

sequence_cnt field set for BP and ASM packets

paul -

r133:0209817182bd VHDLib206

parent child

Context file:

r133:0209817182bd

Collapse all files

FSW-qt/Makefile +1 -1

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue May 13 15:18:10 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Thu May 15 08:30:40 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-05-13T15:58:32. -->
+            <!-- Written by QtCreator 3.0.1, 2014-05-15T06:56:44. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_params.h 0 -1

                 unsigned int local_sbm1_nb_cwf_max;
                 unsigned int local_sbm2_nb_cwf_sent;
                 unsigned int local_sbm2_nb_cwf_max;
-                unsigned int local_nb_interrupt_f0_MAX;
             };
             #endif // FSW_PARAMS_H_INCLUDED

header/fsw_params_nb_bytes.h +3 0

             #ifndef TM_BYTE_POSITIONS_H
             #define TM_BYTE_POSITIONS_H
+            // SEQUENCE_CNT
+            #define PACKET_POS_SEQUENCE_CNT             6   // 4 + 2
             // TC_LFR_LOAD_COMMON_PAR
             // TC_LFR_LOAD_NORMAL_PAR

header/fsw_params_processing.h +1 -1

             #define NB_BINS_PER_SM          128
             #define NB_VALUES_PER_SM        25
-            #define TOTAL_SIZE_SM           3200    // 25 * 128
+            #define TOTAL_SIZE_SM           3200    // 25 * 128 = 0xC80
             #define TOTAL_SIZE_NORM_BP1_F0   99     // 11 * 9 = 99
             #define TOTAL_SIZE_NORM_BP1_F1  117     // 13 * 9 = 117
             #define TOTAL_SIZE_NORM_BP1_F2  108     // 12 * 9 = 108

header/processing/fsw_processing.h +4 -4

                 unsigned int status;
             } ring_node_asm;
-            typedef struct bp_packet
+            typedef struct
             {
                 Header_TM_LFR_SCIENCE_BP_t header;
                 unsigned char data[ 30 * 22 ];   // MAX size is 22 * 30 [TM_LFR_SCIENCE_BURST_BP2_F1]
             } bp_packet;
-            typedef struct bp_packet_with_spare
+            typedef struct
             {
                 Header_TM_LFR_SCIENCE_BP_with_spare_t header;
                 unsigned char data[ 9 * 13 ];   // only for TM_LFR_SCIENCE_NORMAL_BP1_F0 and F1
             } bp_packet_with_spare;
-            typedef struct asm_msg
+            typedef struct
             {
                 ring_node_asm *norm;
                 ring_node_asm *burst_sbm;
                                             unsigned int packetLength, unsigned char blkNr );
             void BP_send( char *data,
                           rtems_id queue_id ,
-                           unsigned int nbBytesToSend );
+                          unsigned int nbBytesToSend , unsigned int sid );
             //******************
             // general functions

header/wf_handler.h 0 -2

             //*****************
             // local parameters
-            void set_local_nb_interrupt_f0_MAX( void );
             void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid );
             #endif // WF_HANDLER_H_INCLUDED

src/fsw_init.c 0 -1

                 unsigned int i;
                 // LOCAL PARAMETERS
-                set_local_nb_interrupt_f0_MAX();
                 BOOT_PRINTF1("local_sbm1_nb_cwf_max %d \n", param_local.local_sbm1_nb_cwf_max)
                 BOOT_PRINTF1("local_sbm2_nb_cwf_max %d \n", param_local.local_sbm2_nb_cwf_max)

src/fsw_misc.c 0 -2

                         PRINTF1("ERR *** in get_v_e1_e2_f3 *** trying to read out of the buffer, counter = %d\n", offset_in_samples)
                         offset_in_samples = NB_SAMPLES_PER_SNAPSHOT -1;
                     }
-                    PRINTF1("f3 data @ %x *** ", waveform_picker_regs->addr_data_f3 )
-                    PRINTF2("deltaT = %d, offset_in_samples = %d\n", deltaT, offset_in_samples )
                     offset_in_bytes = TIME_OFFSET_IN_BYTES + offset_in_samples * NB_WORDS_SWF_BLK * 4;
                     v[0]  = bufferPtr[ offset_in_bytes + 0];
                     v[1]  = bufferPtr[ offset_in_bytes + 1];

src/processing/avf0_prc0.c +12 -8

                         // 3) send the BP1 set
                         set_time( packet_sbm_bp1_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                         set_time( packet_sbm_bp1_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                        BP_send( (char *) &packet_sbm_bp1_f0.header, queue_id,
+                        BP_send( (char *) &packet_sbm_bp1_f0, queue_id,
-                                  PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F0 + PACKET_LENGTH_DELTA);
+                                  PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F0 + PACKET_LENGTH_DELTA,
+                                 SID_SBM1_BP1_F0);
                         // 4) compute the BP2 set if needed
                         if ( incomingMsg->event & RTEMS_EVENT_BURST_SBM_BP2_F0 )
                         {
                             // 2) send the BP2 set
                             set_time( packet_sbm_bp2_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                             set_time( packet_sbm_bp2_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                            BP_send( (char *) &packet_sbm_bp2_f0.header, queue_id,
+                            BP_send( (char *) &packet_sbm_bp2_f0, queue_id,
-                                      PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F0 + PACKET_LENGTH_DELTA);
+                                      PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F0 + PACKET_LENGTH_DELTA,
+                                     SID_SBM1_BP2_F0);
                         }
                     }
                         // 3) send the BP1 set
                         set_time( packet_norm_bp1_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                         set_time( packet_norm_bp1_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                        BP_send( (char *) &packet_norm_bp1_f0.header, queue_id,
+                        BP_send( (char *) &packet_norm_bp1_f0, queue_id,
-                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0 + PACKET_LENGTH_DELTA);
+                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0 + PACKET_LENGTH_DELTA,
+                                 SID_NORM_BP1_F0 );
                         if (incomingMsg->event & RTEMS_EVENT_NORM_BP2_F0)
                         {
                             // 1) compute the BP2 set using the same ASM as the one used for BP1
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                             set_time( packet_norm_bp2_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                            BP_send( (char *) &packet_norm_bp2_f0.header, queue_id,
+                            BP_send( (char *) &packet_norm_bp2_f0, queue_id,
-                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F0 + PACKET_LENGTH_DELTA);
+                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F0 + PACKET_LENGTH_DELTA,
+                                     SID_NORM_BP2_F0);
                         }
                     }

src/processing/avf1_prc1.c +12 -8

                         // 3) send the BP1 set
                         set_time( packet_sbm_bp1.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                         set_time( packet_sbm_bp1.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                        BP_send( (char *) &packet_sbm_bp1.header, queue_id_send,
+                        BP_send( (char *) &packet_sbm_bp1, queue_id_send,
-                                  PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F1 + PACKET_LENGTH_DELTA);
+                                 PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F1 + PACKET_LENGTH_DELTA,
+                                 SID_SBM2_BP1_F1 );
                         // 4) compute the BP2 set if needed
                         if ( incomingMsg->event & RTEMS_EVENT_BURST_SBM_BP2_F1 )
                         {
                             // 2) send the BP2 set
                             set_time( packet_sbm_bp2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                             set_time( packet_sbm_bp2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                            BP_send( (char *) &packet_sbm_bp2.header, queue_id_send,
+                            BP_send( (char *) &packet_sbm_bp2, queue_id_send,
-                                      PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F1 + PACKET_LENGTH_DELTA);
+                                     PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F1 + PACKET_LENGTH_DELTA,
+                                     SID_SBM2_BP2_F1 );
                         }
                     }
                         // 3) send the BP1 set
                         set_time( packet_norm_bp1.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                         set_time( packet_norm_bp1.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                        BP_send( (char *) &packet_norm_bp1.header, queue_id_send,
+                        BP_send( (char *) &packet_norm_bp1, queue_id_send,
-                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F1 + PACKET_LENGTH_DELTA);
+                                 PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F1 + PACKET_LENGTH_DELTA,
+                                 SID_NORM_BP1_F1 );
                         if (incomingMsg->event & RTEMS_EVENT_NORM_BP2_F1)
                         {
                             // 1) compute the BP2 set
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                             set_time( packet_norm_bp2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                            BP_send( (char *) &packet_norm_bp2.header, queue_id_send,
+                            BP_send( (char *) &packet_norm_bp2, queue_id_send,
-                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F1 + PACKET_LENGTH_DELTA);
+                                     PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F1 + PACKET_LENGTH_DELTA,
+                                     SID_NORM_BP2_F1 );
                         }
                     }

src/processing/avf2_prc2.c +6 -4

                         // 3) send the BP1 set
                         set_time( packet_norm_bp1_f2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                         set_time( packet_norm_bp1_f2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                        BP_send( (char *) &packet_norm_bp1_f2.header, queue_id,
+                        BP_send( (char *) &packet_norm_bp1_f2, queue_id,
-                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F2 + PACKET_LENGTH_DELTA);
+                                 PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F2 + PACKET_LENGTH_DELTA,
+                                 SID_NORM_BP1_F2 );
                         if (incomingMsg->event & RTEMS_EVENT_NORM_BP2_F2)
                         {
                             // 1) compute the BP2 set using the same ASM as the one used for BP1
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2_f2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
                             set_time( packet_norm_bp2_f2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
-                            BP_send( (char *) &packet_norm_bp2_f2.header, queue_id,
+                            BP_send( (char *) &packet_norm_bp2_f2, queue_id,
-                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F2 + PACKET_LENGTH_DELTA);
+                                     PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F2 + PACKET_LENGTH_DELTA,
+                                     SID_NORM_BP2_F2 );
                         }
                     }

src/processing/fsw_processing.c +4 -1

                     spw_ioctl_send->options = 0;
                     // (2) BUILD THE HEADER
+                    increment_seq_counter_source_id( header->packetSequenceControl, sid );
                     header->packetLength[0] = (unsigned char) (length>>8);
                     header->packetLength[1] = (unsigned char) (length);
                     header->sid = (unsigned char) sid;   // SID
                 header->pa_lfr_bp_blk_nr[1] = blkNr;  // BLK_NR LSB
             }
-            void BP_send(char *data, rtems_id queue_id, unsigned int nbBytesToSend )
+            void BP_send(char *data, rtems_id queue_id, unsigned int nbBytesToSend, unsigned int sid )
             {
                 rtems_status_code status;
+                // SET THE SEQUENCE_CNT PARAMETER
+                increment_seq_counter_source_id( (unsigned char*) &data[ PACKET_POS_SEQUENCE_CNT ], sid );
                 // SEND PACKET
                 status =  rtems_message_queue_send( queue_id, data, nbBytesToSend);
                 if (status != RTEMS_SUCCESSFUL)

src/tc_handler.c 0 -1

                 timer_start( (gptimer_regs_t*) REGS_ADDR_GPTIMER, TIMER_SM_SIMULATOR );
                 LEON_Clear_interrupt( IRQ_SM_SIMULATOR );
                 LEON_Unmask_interrupt( IRQ_SM_SIMULATOR );
-                set_local_nb_interrupt_f0_MAX();
             }
             void set_irq_on_new_ready_matrix( unsigned char value )

src/wf_handler.c +34 -13

@@ -1225,32 +1225,49 void set_wfp_delta_f2()
1225		1225
1226	//*****************	1226	//*****************
1227	// local parameters	1227	// local parameters
1228	void set_local_nb_interrupt_f0_MAX( void )	1228
		1229	void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid )
1229	{	1230	{
1230	/** This function sets the value of the nb_interrupt_f0_MAX local parameter.	1231	/** This function increments the parameter "sequence_cnt" depending on the sid passed in argument.
1231	*	1232	*
1232	* This parameter is used for the SM validation only.\n	1233	* @param packet_sequence_control is a pointer toward the parameter sequence_cnt to update.
1233	* The software waits param_local.local_nb_interrupt_f0_MAX interruptions from the spectral matrices	1234	* @param sid is the source identifier of the packet being updated.
1234	* module before launching a basic processing.	1235	*
		1236	* REQ-LFR-SRS-5240 / SSS-CP-FS-590
		1237	* The sequence counters shall wrap around from 2^14 to zero.
		1238	* The sequence counter shall start at zero at startup.
		1239	*
		1240	* REQ-LFR-SRS-5239 / SSS-CP-FS-580
		1241	* All TM_LFR_SCIENCE_ packets are sent to ground, i.e. destination id = 0
1235	*	1242	*
1236	*/	1243	*/
1237		1244
1238	param_local.local_nb_interrupt_f0_MAX = ( (parameter_dump_packet.sy_lfr_n_asm_p[0]) * 256
1239	+ parameter_dump_packet.sy_lfr_n_asm_p[1] ) * 100;
1240	}
1241
1242	void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid )
1243	{
1244	unsigned short *sequence_cnt;	1245	unsigned short *sequence_cnt;
1245	unsigned short segmentation_grouping_flag;	1246	unsigned short segmentation_grouping_flag;
1246	unsigned short new_packet_sequence_control;	1247	unsigned short new_packet_sequence_control;
		1248	rtems_mode initial_mode_set;
		1249	rtems_mode current_mode_set;
		1250	rtems_status_code status;
		1251
		1252	//******************************************
		1253	// CHANGE THE MODE OF THE CALLING RTEMS TASK
		1254	status = rtems_task_mode( RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &initial_mode_set );
1247		1255
1248	if ( (sid ==SID_NORM_SWF_F0) \|\| (sid ==SID_NORM_SWF_F1) \|\| (sid ==SID_NORM_SWF_F2)	1256	if ( (sid == SID_NORM_SWF_F0) \|\| (sid == SID_NORM_SWF_F1) \|\| (sid == SID_NORM_SWF_F2)
1249	\|\| (sid ==SID_NORM_CWF_F3) \|\| (~~sid~~==~~SID_NORM_CWF_LONG_F3~~) \|\| (sid ==~~SID_BURST_CWF_F2~~) )	1257	\|\| (sid == SID_NORM_CWF_F3) \|\| (sid == SID_NORM_CWF_LONG_F3)
		1258	\|\| (sid == SID_BURST_CWF_F2)
		1259	\|\| (sid == SID_NORM_ASM_F0) \|\| (sid == SID_NORM_ASM_F1) \|\| (sid == SID_NORM_ASM_F2)
		1260	\|\| (sid == SID_NORM_BP1_F0) \|\| (sid == SID_NORM_BP1_F1) \|\| (sid == SID_NORM_BP1_F2)
		1261	\|\| (sid == SID_NORM_BP2_F0) \|\| (sid == SID_NORM_BP2_F1) \|\| (sid == SID_NORM_BP2_F2)
		1262	\|\| (sid == SID_BURST_BP1_F0) \|\| (sid == SID_BURST_BP2_F0)
		1263	\|\| (sid == SID_BURST_BP1_F1) \|\| (sid == SID_BURST_BP2_F1) )
1250	{	1264	{
1251	sequence_cnt = (unsigned short *) &sequenceCounters_SCIENCE_NORMAL_BURST;	1265	sequence_cnt = (unsigned short *) &sequenceCounters_SCIENCE_NORMAL_BURST;
1252	}	1266	}
1253	else if ( (sid ==SID_SBM1_CWF_F1) \|\| (sid ==SID_SBM2_CWF_F2) )	1267	else if ( (sid ==SID_SBM1_CWF_F1) \|\| (sid ==SID_SBM2_CWF_F2)
		1268	\|\| (sid == SID_SBM1_BP1_F0) \|\| (sid == SID_SBM1_BP2_F0)
		1269	\|\| (sid == SID_SBM2_BP1_F0) \|\| (sid == SID_SBM2_BP2_F0)
		1270	\|\| (sid == SID_SBM2_BP1_F1) \|\| (sid == SID_SBM2_BP2_F1) )
1254	{	1271	{
1255	sequence_cnt = (unsigned short *) &sequenceCounters_SCIENCE_SBM1_SBM2;	1272	sequence_cnt = (unsigned short *) &sequenceCounters_SCIENCE_SBM1_SBM2;
1256	}	1273	}
@@ -1279,4 +1296,8 void increment_seq_counter_source_id( un
1279	packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);	1296	packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
1280	packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );	1297	packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );
1281	}	1298	}
		1299
		1300	//***********************************
		1301	// RESET THE MODE OF THE CALLING TASK
		1302	status = rtems_task_mode( initial_mode_set, RTEMS_PREEMPT_MASK, &current_mode_set );
1282	}	1303	}

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