##// END OF EJS Templates
Merge with nov2013
paul -
r62:749301bb778a merge default
parent child
Show More
@@ -45,23 +45,7 struct time_management_regs_str{
45 45 };
46 46 typedef struct time_management_regs_str time_management_regs_t;
47 47
48 struct waveform_picker_regs_str{
49 volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
50 volatile int burst_enable; // 0x04 01 *** burst f2, f1, f0 enable f3, f2, f1, f0
51 volatile int addr_data_f0; // 0x08 10 ***
52 volatile int addr_data_f1; // 0x0c 11 ***
53 volatile int addr_data_f2; // 0x10 100 ***
54 volatile int addr_data_f3; // 0x14 101 ***
55 volatile int status; // 0x18 110 ***
56 volatile int delta_snapshot; // 0x1c 111 ***
57 volatile int delta_f2_f1; // 0x20 0000 ***
58 volatile int delta_f2_f0; // 0x24 0001 ***
59 volatile int nb_burst_available;// 0x28 0010 ***
60 volatile int nb_snapshot_param; // 0x2c 0011 ***
61 };
62 typedef struct waveform_picker_regs_str waveform_picker_regs_t;
63
64 struct waveform_picker_regs_str_alt{
48 struct new_waveform_picker_regs_str{
65 49 volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
66 50 volatile int run_burst_enable; // 0x04 01 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
67 51 volatile int addr_data_f0; // 0x08
@@ -78,7 +62,7 struct waveform_picker_regs_str_alt{
78 62 volatile int snapshot_param;
79 63 volatile int start_date;
80 64 };
81 typedef struct waveform_picker_regs_str_alt waveform_picker_regs_t_alt;
65 typedef struct new_waveform_picker_regs_str new_waveform_picker_regs_t;
82 66
83 67 struct spectral_matrix_regs_str{
84 68 volatile int config;
@@ -13,7 +13,7
13 13 extern struct param_sbm1_str param_sbm1;
14 14 extern struct param_sbm2_str param_sbm2;
15 15 extern time_management_regs_t *time_management_regs;
16 extern waveform_picker_regs_t *waveform_picker_regs;
16 extern new_waveform_picker_regs_t *new_waveform_picker_regs;
17 17 extern gptimer_regs_t *gptimer_regs;
18 18 extern rtems_name misc_name[5];
19 19 extern rtems_id Task_id[20]; /* array of task ids */
@@ -7,8 +7,6
7 7 #include <math.h>
8 8
9 9 #include "fsw_params.h"
10 #include "fsw_spacewire.h"
11 #include "fsw_misc.h"
12 10
13 11 #define pi 3.1415
14 12
@@ -26,16 +24,12 extern volatile int wf_snap_f2_norm[ ];
26 24 extern volatile int wf_cont_f3[ ];
27 25 extern volatile int wf_cont_f3_bis[ ];
28 26 extern char wf_cont_f3_light[ ];
29 extern waveform_picker_regs_t *waveform_picker_regs;
30 extern waveform_picker_regs_t_alt *waveform_picker_regs_alt;
27 extern new_waveform_picker_regs_t *new_waveform_picker_regs;
31 28 extern time_management_regs_t *time_management_regs;
32 29 extern Packet_TM_LFR_HK_t housekeeping_packet;
33 30 extern Packet_TM_LFR_PARAMETER_DUMP_t parameter_dump_packet;
34 31 extern struct param_local_str param_local;
35 32
36 extern unsigned short sequenceCounters_SCIENCE_NORMAL_BURST;
37 extern unsigned short sequenceCounters_SCIENCE_SBM1_SBM2;
38
39 33 extern rtems_name misc_name[5];
40 34 extern rtems_name Task_name[20]; /* array of task ids */
41 35 extern rtems_id Task_id[20]; /* array of task ids */
@@ -71,9 +65,10 rtems_id get_pkts_queue_id( void );
71 65 void set_wfp_data_shaping();
72 66 char set_wfp_delta_snapshot();
73 67 void set_wfp_burst_enable_register( unsigned char mode);
74 void reset_wfp_burst_enable();
68 void reset_wfp_run_burst_enable();
75 69 void reset_wfp_status();
76 void reset_waveform_picker_regs();
70 void reset_new_waveform_picker_regs();
71 void reset_new_waveform_picker_regs_alt();
77 72
78 73 //*****************
79 74 // local parameters
@@ -83,6 +78,4 void set_local_nb_interrupt_f0_MAX();
83 78 void reset_local_sbm1_nb_cwf_sent();
84 79 void reset_local_sbm2_nb_cwf_sent();
85 80
86 void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid );
87
88 81 #endif // WF_HANDLER_H_INCLUDED
@@ -52,4 +52,3 struct drvmgr_bus_res grlib_drv_resource
52 52 }
53 53 };
54 54
55
@@ -36,8 +36,7 time_management_regs_t *time_management_
36 36 gptimer_regs_t *gptimer_regs = (gptimer_regs_t *) REGS_ADDR_GPTIMER;
37 37 #ifdef GSA
38 38 #else
39 waveform_picker_regs_t *waveform_picker_regs = (waveform_picker_regs_t*) REGS_ADDR_WAVEFORM_PICKER;
40 waveform_picker_regs_t_alt *waveform_picker_regs_alt = (waveform_picker_regs_t_alt*) REGS_ADDR_WAVEFORM_PICKER;
39 new_waveform_picker_regs_t *new_waveform_picker_regs = (new_waveform_picker_regs_t*) REGS_ADDR_WAVEFORM_PICKER;
41 40 #endif
42 41 spectral_matrix_regs_t *spectral_matrix_regs = (spectral_matrix_regs_t*) REGS_ADDR_SPECTRAL_MATRIX;
43 42
@@ -83,9 +82,7 struct param_local_str param_local;
83 82 // HK PACKETS
84 83 Packet_TM_LFR_HK_t housekeeping_packet;
85 84 // sequence counters are incremented by APID (PID + CAT) and destination ID
86 unsigned short sequenceCounters_SCIENCE_NORMAL_BURST;
87 unsigned short sequenceCounters_SCIENCE_SBM1_SBM2;
88 unsigned short sequenceCounters_TC_EXE[SEQ_CNT_NB_DEST_ID];
85 unsigned short sequenceCounters[SEQ_CNT_NB_PID][SEQ_CNT_NB_CAT][SEQ_CNT_NB_DEST_ID];
89 86 spw_stats spacewire_stats;
90 87 spw_stats spacewire_stats_backup;
91 88
@@ -70,7 +70,6 rtems_task Init( rtems_task_argument ign
70 70 *
71 71 */
72 72
73
74 73 rtems_status_code status;
75 74 rtems_status_code status_spw;
76 75 rtems_isr_entry old_isr_handler;
@@ -84,7 +83,9 rtems_task Init( rtems_task_argument ign
84 83 //send_console_outputs_on_apbuart_port();
85 84 set_apbuart_scaler_reload_register(REGS_ADDR_APBUART, APBUART_SCALER_RELOAD_VALUE);
86 85
87 reset_wfp_burst_enable(); // stop the waveform picker if it was running
86 // waveform picker registers initialization
87 reset_wfp_run_burst_enable();
88 reset_wfp_status();
88 89
89 90 init_parameter_dump();
90 91 init_local_mode_parameters();
@@ -197,6 +198,8 void init_local_mode_parameters( void )
197 198 */
198 199
199 200 unsigned int i;
201 unsigned int j;
202 unsigned int k;
200 203
201 204 // LOCAL PARAMETERS
202 205 set_local_sbm1_nb_cwf_max();
@@ -211,13 +214,16 void init_local_mode_parameters( void )
211 214 reset_local_sbm2_nb_cwf_sent();
212 215
213 216 // init sequence counters
214
215 for(i = 0; i<SEQ_CNT_NB_DEST_ID; i++)
217 for (i = 0; i<SEQ_CNT_NB_PID; i++)
218 {
219 for(j = 0; j<SEQ_CNT_NB_CAT; j++)
216 220 {
217 sequenceCounters_TC_EXE[i] = 0x00;
221 for(k = 0; k<SEQ_CNT_NB_DEST_ID; k++)
222 {
223 sequenceCounters[i][j][k] = 0x00;
218 224 }
219 sequenceCounters_SCIENCE_NORMAL_BURST = 0x00;
220 sequenceCounters_SCIENCE_SBM1_SBM2 = 0x00;
225 }
226 }
221 227 }
222 228
223 229 void create_names( void ) // create all names for tasks and queues
@@ -347,7 +353,7 int create_all_tasks( void ) // create a
347 353 {
348 354 status = rtems_task_create(
349 355 Task_name[TASKID_HOUS], TASK_PRIORITY_HOUS, RTEMS_MINIMUM_STACK_SIZE,
350 RTEMS_DEFAULT_MODES | RTEMS_NO_PREEMPT,
356 RTEMS_DEFAULT_MODES,
351 357 RTEMS_DEFAULT_ATTRIBUTES, &Task_id[TASKID_HOUS]
352 358 );
353 359 }
@@ -584,3 +590,4 rtems_status_code create_message_queues(
584 590
585 591 return ret;
586 592 }
593
@@ -388,7 +388,7 int stop_current_mode()
388 388 LEON_Mask_interrupt( IRQ_WAVEFORM_PICKER ); // mask waveform picker interrupt
389 389 LEON_Mask_interrupt( IRQ_SPECTRAL_MATRIX ); // mask spectral matrix interrupt
390 390 // reset registers
391 reset_wfp_burst_enable(); // reset burst and enable bits
391 reset_wfp_run_burst_enable(); // reset run, burst and enable bits, [r b2 b1 b0 e3 e2 e1 e0]
392 392 reset_wfp_status(); // reset all the status bits
393 393 // creal interruptions
394 394 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER ); // clear waveform picker interrupt
@@ -464,6 +464,7 int enter_standby_mode()
464 464 int enter_normal_mode()
465 465 {
466 466 rtems_status_code status;
467 int startDate;
467 468
468 469 status = restart_science_tasks();
469 470
@@ -479,10 +480,13 int enter_normal_mode()
479 480 #else
480 481 //****************
481 482 // waveform picker
482 reset_waveform_picker_regs();
483 reset_new_waveform_picker_regs();
483 484 set_wfp_burst_enable_register(LFR_MODE_NORMAL);
484 485 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
485 486 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
487 startDate = time_management_regs->coarse_time + 2;
488 new_waveform_picker_regs->start_date = startDate;
489 new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable | 0x80; // [1000 0000]
486 490 //****************
487 491 // spectral matrix
488 492 #endif
@@ -499,7 +503,7 int enter_burst_mode()
499 503 #ifdef GSA
500 504 LEON_Unmask_interrupt( IRQ_SM );
501 505 #else
502 reset_waveform_picker_regs();
506 reset_new_waveform_picker_regs();
503 507 set_wfp_burst_enable_register(LFR_MODE_BURST);
504 508 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
505 509 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
@@ -521,7 +525,7 int enter_sbm1_mode()
521 525 #ifdef GSA
522 526 LEON_Unmask_interrupt( IRQ_SM );
523 527 #else
524 reset_waveform_picker_regs();
528 reset_new_waveform_picker_regs();
525 529 set_wfp_burst_enable_register(LFR_MODE_SBM1);
526 530 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
527 531 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
@@ -547,7 +551,7 int enter_sbm2_mode()
547 551 #ifdef GSA
548 552 LEON_Unmask_interrupt( IRQ_SM );
549 553 #else
550 reset_waveform_picker_regs();
554 reset_new_waveform_picker_regs();
551 555 set_wfp_burst_enable_register(LFR_MODE_SBM2);
552 556 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
553 557 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
@@ -33,24 +33,27 rtems_isr waveforms_isr( rtems_vector_nu
33 33 *
34 34 */
35 35
36 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
37 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff00f; // clear new_err and full_err
38
36 39 #ifdef GSA
37 40 #else
38 41 if ( (lfrCurrentMode == LFR_MODE_NORMAL)
39 42 || (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) )
40 43 { // in modes other than STANDBY and BURST, send the CWF_F3 data
41 if ((waveform_picker_regs->status & 0x08) == 0x08){ // [1000] f3 is full
44 if ((new_waveform_picker_regs->status & 0x08) == 0x08){ // [1000] f3 is full
42 45 // (1) change the receiving buffer for the waveform picker
43 if (waveform_picker_regs->addr_data_f3 == (int) wf_cont_f3) {
44 waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3_bis);
46 if (new_waveform_picker_regs->addr_data_f3 == (int) wf_cont_f3) {
47 new_waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3_bis);
45 48 }
46 49 else {
47 waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3);
50 new_waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3);
48 51 }
49 52 // (2) send an event for the waveforms transmission
50 53 if (rtems_event_send( Task_id[TASKID_CWF3], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
51 54 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
52 55 }
53 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffff777; // reset f3 bits to 0, [1111 0111 0111 0111]
56 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff777; // reset f3 bits to 0, [1111 0111 0111 0111]
54 57 }
55 58 }
56 59 #endif
@@ -68,18 +71,18 rtems_isr waveforms_isr( rtems_vector_nu
68 71 #ifdef GSA
69 72 PRINTF("in waveform_isr *** unexpected waveform picker interruption\n")
70 73 #else
71 if ( (waveform_picker_regs->burst_enable & 0x7) == 0x0 ){ // if no channel is enable
74 if ( (new_waveform_picker_regs->run_burst_enable & 0x7) == 0x0 ){ // if no channel is enable
72 75 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
73 76 }
74 77 else {
75 if ( (waveform_picker_regs->status & 0x7) == 0x7 ){ // f2 f1 and f0 are full
76 waveform_picker_regs->burst_enable = waveform_picker_regs->burst_enable & 0x08;
78 if ( (new_waveform_picker_regs->status & 0x7) == 0x7 ){ // f2 f1 and f0 are full
79 new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable & 0x08;
77 80 if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
78 81 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
79 82 }
80 // waveform_picker_regs->status = waveform_picker_regs->status & 0x00;
81 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffff888;
82 waveform_picker_regs->burst_enable = waveform_picker_regs->burst_enable | 0x07; // [0111] enable f2 f1 f0
83 // new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0x00;
84 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff888;
85 new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable | 0x07; // [0111] enable f2 f1 f0
83 86 }
84 87 }
85 88 #endif
@@ -91,19 +94,19 rtems_isr waveforms_isr( rtems_vector_nu
91 94 #ifdef GSA
92 95 PRINTF("in waveform_isr *** unexpected waveform picker interruption\n")
93 96 #else
94 if ((waveform_picker_regs->status & 0x04) == 0x04){ // [0100] check the f2 full bit
97 if ((new_waveform_picker_regs->status & 0x04) == 0x04){ // [0100] check the f2 full bit
95 98 // (1) change the receiving buffer for the waveform picker
96 if (waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2) {
97 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2_bis);
99 if (new_waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2) {
100 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2_bis);
98 101 }
99 102 else {
100 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);
103 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);
101 104 }
102 105 // (2) send an event for the waveforms transmission
103 106 if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_BURST ) != RTEMS_SUCCESSFUL) {
104 107 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
105 108 }
106 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bits = 0
109 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bits = 0
107 110 }
108 111 #endif
109 112 break;
@@ -114,34 +117,34 rtems_isr waveforms_isr( rtems_vector_nu
114 117 #ifdef GSA
115 118 PRINTF("in waveform_isr *** unexpected waveform picker interruption\n")
116 119 #else
117 if ((waveform_picker_regs->status & 0x02) == 0x02){ // [0010] check the f1 full bit
120 if ((new_waveform_picker_regs->status & 0x02) == 0x02){ // [0010] check the f1 full bit
118 121 // (1) change the receiving buffer for the waveform picker
119 122 if ( param_local.local_sbm1_nb_cwf_sent == (param_local.local_sbm1_nb_cwf_max-1) )
120 123 {
121 waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1_norm);
124 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1_norm);
122 125 }
123 else if ( waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1_norm )
126 else if ( new_waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1_norm )
124 127 {
125 128 doubleSendCWF1 = 1;
126 waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);
129 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);
127 130 }
128 else if ( waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1 ) {
129 waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1_bis);
131 else if ( new_waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1 ) {
132 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1_bis);
130 133 }
131 134 else {
132 waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);
135 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);
133 136 }
134 137 // (2) send an event for the waveforms transmission
135 138 if (rtems_event_send( Task_id[TASKID_CWF1], RTEMS_EVENT_MODE_SBM1 ) != RTEMS_SUCCESSFUL) {
136 139 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
137 140 }
138 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffddd; // [1111 1101 1101 1101] f1 bit = 0
141 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffddd; // [1111 1101 1101 1101] f1 bit = 0
139 142 }
140 if ( ( (waveform_picker_regs->status & 0x05) == 0x05 ) ) { // [0101] check the f2 and f0 full bit
143 if ( ( (new_waveform_picker_regs->status & 0x05) == 0x05 ) ) { // [0101] check the f2 and f0 full bit
141 144 if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
142 145 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
143 146 }
144 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffaaa; // [1111 1010 1010 1010] f2 and f0 bits = 0
147 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffaaa; // [1111 1010 1010 1010] f2 and f0 bits = 0
145 148 reset_local_sbm1_nb_cwf_sent();
146 149 }
147 150
@@ -154,37 +157,37 rtems_isr waveforms_isr( rtems_vector_nu
154 157 #ifdef GSA
155 158 PRINTF("in waveform_isr *** unexpected waveform picker interruption\n")
156 159 #else
157 if ((waveform_picker_regs->status & 0x04) == 0x04){ // [0100] check the f2 full bit
160 if ((new_waveform_picker_regs->status & 0x04) == 0x04){ // [0100] check the f2 full bit
158 161 // (1) change the receiving buffer for the waveform picker
159 162 if ( param_local.local_sbm2_nb_cwf_sent == (param_local.local_sbm2_nb_cwf_max-1) )
160 163 {
161 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2_norm);
164 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2_norm);
162 165 }
163 else if ( waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2_norm ) {
164 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);
166 else if ( new_waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2_norm ) {
167 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);
165 168 doubleSendCWF2 = 1;
166 169 if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_SBM2_WFRM ) != RTEMS_SUCCESSFUL) {
167 170 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
168 171 }
169 172 reset_local_sbm2_nb_cwf_sent();
170 173 }
171 else if ( waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2 ) {
172 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2_bis);
174 else if ( new_waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2 ) {
175 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2_bis);
173 176 }
174 177 else {
175 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);
178 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);
176 179 }
177 180 // (2) send an event for the waveforms transmission
178 181 if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_SBM2 ) != RTEMS_SUCCESSFUL) {
179 182 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
180 183 }
181 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bit = 0
184 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bit = 0
182 185 }
183 if ( ( (waveform_picker_regs->status & 0x03) == 0x03 ) ) { // [0011] f3 f2 f1 f0, f1 and f0 are full
186 if ( ( (new_waveform_picker_regs->status & 0x03) == 0x03 ) ) { // [0011] f3 f2 f1 f0, f1 and f0 are full
184 187 if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_SBM2 ) != RTEMS_SUCCESSFUL) {
185 188 rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
186 189 }
187 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffccc; // [1111 1100 1100 1100] f1, f0 bits = 0
190 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffccc; // [1111 1100 1100 1100] f1, f0 bits = 0
188 191 }
189 192 #endif
190 193 break;
@@ -262,7 +265,7 rtems_task wfrm_task(rtems_task_argument
262 265 send_waveform_SWF(wf_snap_f1, SID_NORM_SWF_F1, headerSWF_F1, queue_id);
263 266 send_waveform_SWF(wf_snap_f2, SID_NORM_SWF_F2, headerSWF_F2, queue_id);
264 267 #ifdef GSA
265 waveform_picker_regs->status = waveform_picker_regs->status & 0xf888; // [1111 1000 1000 1000] f2, f1, f0 bits =0
268 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xf888; // [1111 1000 1000 1000] f2, f1, f0 bits =0
266 269 #endif
267 270 }
268 271 else if (event_out == RTEMS_EVENT_MODE_SBM1)
@@ -271,7 +274,7 rtems_task wfrm_task(rtems_task_argument
271 274 send_waveform_SWF(wf_snap_f1_norm, SID_NORM_SWF_F1, headerSWF_F1, queue_id);
272 275 send_waveform_SWF(wf_snap_f2, SID_NORM_SWF_F2, headerSWF_F2, queue_id);
273 276 #ifdef GSA
274 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffaaa; // [1111 1010 1010 1010] f2, f0 bits = 0
277 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffaaa; // [1111 1010 1010 1010] f2, f0 bits = 0
275 278 #endif
276 279 }
277 280 else if (event_out == RTEMS_EVENT_MODE_SBM2)
@@ -279,7 +282,7 rtems_task wfrm_task(rtems_task_argument
279 282 send_waveform_SWF(wf_snap_f0, SID_NORM_SWF_F0, headerSWF_F0, queue_id);
280 283 send_waveform_SWF(wf_snap_f1, SID_NORM_SWF_F1, headerSWF_F1, queue_id);
281 284 #ifdef GSA
282 waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffccc; // [1111 1100 1100 1100] f1, f0 bits = 0
285 new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffffccc; // [1111 1100 1100 1100] f1, f0 bits = 0
283 286 #endif
284 287 }
285 288 else if (event_out == RTEMS_EVENT_MODE_SBM2_WFRM)
@@ -329,7 +332,7 rtems_task cwf3_task(rtems_task_argument
329 332 PRINTF("send CWF F3 \n")
330 333 #ifdef GSA
331 334 #else
332 if (waveform_picker_regs->addr_data_f3 == (int) wf_cont_f3) {
335 if (new_waveform_picker_regs->addr_data_f3 == (int) wf_cont_f3) {
333 336 send_waveform_CWF3_light( wf_cont_f3_bis, headerCWF_F3_light, queue_id );
334 337 }
335 338 else {
@@ -371,7 +374,7 rtems_task cwf2_task(rtems_task_argument
371 374 // F2
372 375 #ifdef GSA
373 376 #else
374 if (waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2) {
377 if (new_waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2) {
375 378 send_waveform_CWF( wf_snap_f2_bis, SID_BURST_CWF_F2, headerCWF_F2_BURST, queue_id );
376 379 }
377 380 else {
@@ -389,7 +392,7 rtems_task cwf2_task(rtems_task_argument
389 392 doubleSendCWF2 = 0;
390 393 send_waveform_CWF( wf_snap_f2_norm, SID_SBM2_CWF_F2, headerCWF_F2_SBM2, queue_id );
391 394 }
392 else if (waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2) {
395 else if (new_waveform_picker_regs->addr_data_f2 == (int) wf_snap_f2) {
393 396 send_waveform_CWF( wf_snap_f2_bis, SID_SBM2_CWF_F2, headerCWF_F2_SBM2, queue_id );
394 397 }
395 398 else {
@@ -438,7 +441,7 rtems_task cwf1_task(rtems_task_argument
438 441 doubleSendCWF1 = 0;
439 442 send_waveform_CWF( wf_snap_f1_norm, SID_SBM1_CWF_F1, headerCWF_F1, queue_id );
440 443 }
441 else if (waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1) {
444 else if (new_waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1) {
442 445 send_waveform_CWF( wf_snap_f1_bis, SID_SBM1_CWF_F1, headerCWF_F1, queue_id );
443 446 }
444 447 else {
@@ -533,14 +536,14 int init_header_snapshot_wf_table( unsig
533 536 headerSWF[ i ].serviceSubType = TM_SUBTYPE_LFR_SCIENCE; // service subtype
534 537 headerSWF[ i ].destinationID = TM_DESTINATION_ID_GROUND;
535 538 // AUXILIARY DATA HEADER
539 headerSWF[ i ].sid = sid;
540 headerSWF[ i ].hkBIA = DEFAULT_HKBIA;
536 541 headerSWF[ i ].time[0] = 0x00;
537 542 headerSWF[ i ].time[0] = 0x00;
538 543 headerSWF[ i ].time[0] = 0x00;
539 544 headerSWF[ i ].time[0] = 0x00;
540 545 headerSWF[ i ].time[0] = 0x00;
541 546 headerSWF[ i ].time[0] = 0x00;
542 headerSWF[ i ].sid = sid;
543 headerSWF[ i ].hkBIA = DEFAULT_HKBIA;
544 547 }
545 548 return LFR_SUCCESSFUL;
546 549 }
@@ -732,8 +735,6 int send_waveform_SWF( volatile int *wav
732 735 else {
733 736 spw_ioctl_send_SWF.dlen = 340 * NB_BYTES_SWF_BLK;
734 737 }
735 // SET PACKET SEQUENCE COUNTER
736 increment_seq_counter_source_id( headerSWF[ i ].packetSequenceControl, sid );
737 738 // SET PACKET TIME
738 739 headerSWF[ i ].acquisitionTime[0] = (unsigned char) (time_management_regs->coarse_time>>24);
739 740 headerSWF[ i ].acquisitionTime[1] = (unsigned char) (time_management_regs->coarse_time>>16);
@@ -797,8 +798,6 int send_waveform_CWF(volatile int *wave
797 798 else {
798 799 spw_ioctl_send_CWF.dlen = 340 * NB_BYTES_SWF_BLK;
799 800 }
800 // SET PACKET SEQUENCE COUNTER
801 increment_seq_counter_source_id( headerCWF[ i ].packetSequenceControl, sid );
802 801 // SET PACKET TIME
803 802 coarseTime = time_management_regs->coarse_time;
804 803 fineTime = time_management_regs->fine_time;
@@ -891,8 +890,6 int send_waveform_CWF3_light(volatile in
891 890 else {
892 891 spw_ioctl_send_CWF.dlen = 340 * NB_BYTES_CWF3_LIGHT_BLK;
893 892 }
894 // SET PACKET SEQUENCE COUNTER
895 increment_seq_counter_source_id( headerCWF[ i ].packetSequenceControl, SID_NORM_CWF_F3 );
896 893 // SET PACKET TIME
897 894 coarseTime = time_management_regs->coarse_time;
898 895 fineTime = time_management_regs->fine_time;
@@ -941,7 +938,7 void set_wfp_data_shaping()
941 938
942 939 #ifdef GSA
943 940 #else
944 waveform_picker_regs->data_shaping =
941 new_waveform_picker_regs->data_shaping =
945 942 ( (data_shaping & 0x10) >> 4 ) // BW
946 943 + ( (data_shaping & 0x08) >> 2 ) // SP0
947 944 + ( (data_shaping & 0x04) ) // SP1
@@ -982,7 +979,7 char set_wfp_delta_snapshot()
982 979 aux = delta_snapshot ;
983 980 ret = LFR_SUCCESSFUL;
984 981 }
985 waveform_picker_regs->delta_snapshot = aux - 1; // max 2 bytes
982 new_waveform_picker_regs->delta_snapshot = aux - 1; // max 2 bytes
986 983 #endif
987 984
988 985 return ret;
@@ -1004,29 +1001,30 void set_wfp_burst_enable_register( unsi
1004 1001 // the burst bits shall be set first, before the enable bits
1005 1002 switch(mode) {
1006 1003 case(LFR_MODE_NORMAL):
1007 waveform_picker_regs->burst_enable = 0x00; // [0000 0000] no burst enable
1008 waveform_picker_regs->burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
1004 new_waveform_picker_regs->run_burst_enable = 0x00; // [0000 0000] no burst enable
1005 // new_waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
1006 new_waveform_picker_regs->run_burst_enable = 0x07; // [0000 0111] enable f2 f1 f0
1009 1007 break;
1010 1008 case(LFR_MODE_BURST):
1011 waveform_picker_regs->burst_enable = 0x40; // [0100 0000] f2 burst enabled
1012 waveform_picker_regs->burst_enable = waveform_picker_regs->burst_enable | 0x04; // [0100] enable f2
1009 new_waveform_picker_regs->run_burst_enable = 0x40; // [0100 0000] f2 burst enabled
1010 new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable | 0x04; // [0100] enable f2
1013 1011 break;
1014 1012 case(LFR_MODE_SBM1):
1015 waveform_picker_regs->burst_enable = 0x20; // [0010 0000] f1 burst enabled
1016 waveform_picker_regs->burst_enable = waveform_picker_regs->burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
1013 new_waveform_picker_regs->run_burst_enable = 0x20; // [0010 0000] f1 burst enabled
1014 new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
1017 1015 break;
1018 1016 case(LFR_MODE_SBM2):
1019 waveform_picker_regs->burst_enable = 0x40; // [0100 0000] f2 burst enabled
1020 waveform_picker_regs->burst_enable = waveform_picker_regs->burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
1017 new_waveform_picker_regs->run_burst_enable = 0x40; // [0100 0000] f2 burst enabled
1018 new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
1021 1019 break;
1022 1020 default:
1023 waveform_picker_regs->burst_enable = 0x00; // [0000 0000] no burst enabled, no waveform enabled
1021 new_waveform_picker_regs->run_burst_enable = 0x00; // [0000 0000] no burst enabled, no waveform enabled
1024 1022 break;
1025 1023 }
1026 1024 #endif
1027 1025 }
1028 1026
1029 void reset_wfp_burst_enable()
1027 void reset_wfp_run_burst_enable()
1030 1028 {
1031 1029 /** This function resets the waveform picker burst_enable register.
1032 1030 *
@@ -1036,7 +1034,7 void reset_wfp_burst_enable()
1036 1034
1037 1035 #ifdef GSA
1038 1036 #else
1039 waveform_picker_regs->burst_enable = 0x00; // burst f2, f1, f0 enable f3, f2, f1, f0
1037 new_waveform_picker_regs->run_burst_enable = 0x00; // burst f2, f1, f0 enable f3, f2, f1, f0
1040 1038 #endif
1041 1039 }
1042 1040
@@ -1050,47 +1048,48 void reset_wfp_status()
1050 1048
1051 1049 #ifdef GSA
1052 1050 #else
1053 waveform_picker_regs->status = 0x00; // burst f2, f1, f0 enable f3, f2, f1, f0
1051 new_waveform_picker_regs->status = 0x00; // burst f2, f1, f0 enable f3, f2, f1, f0
1054 1052 #endif
1055 1053 }
1056 1054
1057 void reset_waveform_picker_regs()
1055 void reset_new_waveform_picker_regs()
1058 1056 {
1059 /** This function resets the waveform picker module registers.
1060 *
1061 * The registers affected by this function are located at the following offset addresses:
1062 * - 0x00 data_shaping
1063 * - 0x04 burst_enable
1064 * - 0x08 addr_data_f0
1065 * - 0x0C addr_data_f1
1066 * - 0x10 addr_data_f2
1067 * - 0x14 addr_data_f3
1068 * - 0x18 status
1069 * - 0x1C delta_snapshot
1070 * - 0x20 delta_f2_f1
1071 * - 0x24 delta_f2_f0
1072 * - 0x28 nb_burst
1073 * - 0x2C nb_snapshot
1074 *
1075 */
1057 new_waveform_picker_regs->data_shaping = 0x01; // 0x00 *** R1 R0 SP1 SP0 BW
1058 new_waveform_picker_regs->run_burst_enable = 0x00; // 0x04 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
1059 new_waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0); // 0x08
1060 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1); // 0x0c
1061 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2); // 0x10
1062 new_waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3); // 0x14
1063 new_waveform_picker_regs->status = 0x00; // 0x18
1064 // new_waveform_picker_regs->delta_snapshot = 0x12800; // 0x1c 296 * 256 = 75776
1065 new_waveform_picker_regs->delta_snapshot = 0x1000; // 0x1c 16 * 256 = 4096
1066 new_waveform_picker_regs->delta_f0 = 0x3f5; // 0x20 *** 1013
1067 new_waveform_picker_regs->delta_f0_2 = 0x7; // 0x24 *** 7
1068 new_waveform_picker_regs->delta_f1 = 0x3c0; // 0x28 *** 960
1069 // new_waveform_picker_regs->delta_f2 = 0x12200; // 0x2c *** 74240
1070 new_waveform_picker_regs->delta_f2 = 0xc00; // 0x2c *** 12 * 256 = 2048
1071 new_waveform_picker_regs->nb_data_by_buffer = 0x1802; // 0x30 *** 2048 * 3 + 2
1072 new_waveform_picker_regs->snapshot_param = 0x7ff; // 0x34 *** 2048 -1
1073 new_waveform_picker_regs->start_date = 0x00; // 0x38
1074 }
1076 1075
1077 #ifdef GSA
1078 #else
1079 reset_wfp_burst_enable();
1080 reset_wfp_status();
1081 // set buffer addresses
1082 waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0); //
1083 waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1); //
1084 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2); //
1085 waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3); //
1086 // set other parameters
1087 set_wfp_data_shaping();
1088 set_wfp_delta_snapshot(); // time in seconds between two snapshots
1089 waveform_picker_regs->delta_f2_f1 = 0xffff; // 0x16800 => 92160 (max 4 bytes)
1090 waveform_picker_regs->delta_f2_f0 = 0x17c00; // 97 280 (max 5 bytes)
1091 waveform_picker_regs->nb_burst_available = 0x180; // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
1092 waveform_picker_regs->nb_snapshot_param = 0x7ff; // max 3 octets, 2048 - 1
1093 #endif
1076 void reset_new_waveform_picker_regs_alt()
1077 {
1078 new_waveform_picker_regs->data_shaping = 0x01; // 0x00 *** R1 R0 SP1 SP0 BW
1079 new_waveform_picker_regs->run_burst_enable = 0x00; // 0x04 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
1080 new_waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0); // 0x08
1081 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1); // 0x0c
1082 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2); // 0x10
1083 new_waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3); // 0x14
1084 new_waveform_picker_regs->status = 0x00; // 0x18
1085 new_waveform_picker_regs->delta_snapshot = 0x1000; // 0x1c 16 * 256 = 4096
1086 new_waveform_picker_regs->delta_f0 = 0x19; // 0x20 *** 1013
1087 new_waveform_picker_regs->delta_f0_2 = 0x7; // 0x24 *** 7
1088 new_waveform_picker_regs->delta_f1 = 0x19; // 0x28 *** 960
1089 new_waveform_picker_regs->delta_f2 = 0x400; // 0x2c *** 4 * 256 = 1024
1090 new_waveform_picker_regs->nb_data_by_buffer = 0x32; // 0x30 *** 16 * 3 + 2
1091 new_waveform_picker_regs->snapshot_param = 0xf; // 0x34 *** 16 -1
1092 new_waveform_picker_regs->start_date = 0x00; // 0x38
1094 1093 }
1095 1094
1096 1095 //*****************
@@ -1176,44 +1175,3 rtems_id get_pkts_queue_id( void )
1176 1175 }
1177 1176 return queue_id;
1178 1177 }
1179
1180 void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid )
1181 {
1182 unsigned short *sequence_cnt;
1183 unsigned short segmentation_grouping_flag;
1184 unsigned short new_packet_sequence_control;
1185
1186 if ( (sid ==SID_NORM_SWF_F0) || (sid ==SID_NORM_SWF_F1) || (sid ==SID_NORM_SWF_F2)
1187 || (sid ==SID_NORM_CWF_F3) || (sid ==SID_BURST_CWF_F2) )
1188 {
1189 sequence_cnt = &sequenceCounters_SCIENCE_NORMAL_BURST;
1190 }
1191 else if ( (sid ==SID_SBM1_CWF_F1) || (sid ==SID_SBM2_CWF_F2) )
1192 {
1193 sequence_cnt = &sequenceCounters_SCIENCE_SBM1_SBM2;
1194 }
1195 else
1196 {
1197 sequence_cnt = &sequenceCounters_TC_EXE[ UNKNOWN ];
1198 PRINTF1("in increment_seq_counter_source_id *** ERR apid_destid %d not known\n", sid)
1199 }
1200
1201 segmentation_grouping_flag = (packet_sequence_control[ 0 ] & 0xc0) << 8;
1202 *sequence_cnt = (*sequence_cnt) & 0x3fff;
1203
1204 new_packet_sequence_control = segmentation_grouping_flag | *sequence_cnt ;
1205
1206 packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
1207 packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );
1208
1209 // increment the seuqence counter for the next packet
1210 if ( *sequence_cnt < SEQ_CNT_MAX)
1211 {
1212 *sequence_cnt = *sequence_cnt + 1;
1213 }
1214 else
1215 {
1216 *sequence_cnt = 0;
1217 }
1218
1219 }
General Comments 0
You need to be logged in to leave comments. Login now