HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r372:fc82b08705ba

Added scrubbing Task, to increase scrubbing frequency and avoid entering...

jeandet -

r372:fc82b08705ba Next

parent child

Context file:

r372:fc82b08705ba

.hgsub +1 -1

@@ -1,4 +1,4
1	header/lfr_common_headers = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/~~SOLO_LFR~~/lfr_common_headers	1	header/lfr_common_headers = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/lfr_common_headers
2		2
3	LFR_basic-parameters = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/CHUST/LFR_basic-parameters	3	LFR_basic-parameters = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/CHUST/LFR_basic-parameters
4		4

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	~~e904b329ff977514bf36af92617afefd22fd06ab~~ header/lfr_common_headers	2	db74b38fe91cd826fa49fa4eb6f93d626637ceb9 header/lfr_common_headers

header/fsw_misc.h +1 0

             rtems_task hous_task( rtems_task_argument argument );
             rtems_task avgv_task( rtems_task_argument argument );
             rtems_task dumb_task( rtems_task_argument unused );
+            rtems_task scrubbing_task( rtems_task_argument unused );
             void init_housekeeping_parameters( void );
             void increment_seq_counter(unsigned short *packetSequenceControl);

src/fsw_init.c +18 -1

             #include <rtems.h>
             /* configuration information */
             #define CONFIGURE_INIT
             #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
             #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-            #define CONFIGURE_MAXIMUM_TASKS 21 // number of tasks concurrently active including INIT
+            #define CONFIGURE_MAXIMUM_TASKS 22 // number of tasks concurrently active including INIT
             #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
             #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
             #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
                 Task_name[TASKID_PRC1] = rtems_build_name( 'P', 'R', 'C', '1' );
                 Task_name[TASKID_AVF2] = rtems_build_name( 'A', 'V', 'F', '2' );
                 Task_name[TASKID_PRC2] = rtems_build_name( 'P', 'R', 'C', '2' );
+                Task_name[TASKID_SCRB] = rtems_build_name( 'S', 'C', 'R', 'B' );
                 // rate monotonic period names
                 name_hk_rate_monotonic = rtems_build_name( 'H', 'O', 'U', 'S' );
                         RTEMS_DEFAULT_ATTRIBUTES, &Task_id[TASKID_DUMB]
                     );
                 }
+                if (status == RTEMS_SUCCESSFUL) // SCRUBBING TASK
+                {
+                    status = rtems_task_create(
+                        Task_name[TASKID_SCRB], TASK_PRIORITY_SCRB, RTEMS_MINIMUM_STACK_SIZE,
+                        RTEMS_DEFAULT_MODES,
+                        RTEMS_DEFAULT_ATTRIBUTES, &Task_id[TASKID_SCRB]
+                    );
+                }
                 if (status == RTEMS_SUCCESSFUL) // HOUS
                 {
                     status = rtems_task_create(
                         BOOT_PRINTF("in INIT *** Error starting TASK_DUMB\n")
                     }
                 }
+                if (status == RTEMS_SUCCESSFUL)     // SCRUBBING
+                {
+                    status = rtems_task_start( Task_id[TASKID_SCRB], scrubbing_task, 1 );
+                    if (status!=RTEMS_SUCCESSFUL) {
+                        BOOT_PRINTF("in INIT *** Error starting TASK_DUMB\n")
+                    }
+                }
                 if (status == RTEMS_SUCCESSFUL)     // LOAD
                 {
                     status = rtems_task_start( Task_id[TASKID_LOAD], load_task, 1 );

src/fsw_misc.c +20 0

@@ -521,6 +521,26 rtems_task dumb_task( rtems_task_argumen
521	}	521	}
522	}	522	}
523		523
		524	rtems_task scrubbing_task( rtems_task_argument unused )
		525	{
		526	/** This RTEMS taks is to avoid entering IDLE task and also scrub memory to increase scubbing frequency.
		527	*
		528	* @param unused is the starting argument of the RTEMS task
		529	*
		530	* The scrubbing reads continuously memory when no other tasks are ready.
		531	*
		532	*/
		533
		534	BOOT_PRINTF("in SCRUBBING *** \n");
		535	volatile int i=0;
		536	volatile uint32_t* RAM=(uint32_t*)0x40000000;
		537	volatile uint32_t value;
		538	while(1){
		539	i=(i+1)%(1024*1024);
		540	value += RAM[i];
		541	}
		542	}
		543
524	//*****************************	544	//*****************************
525	// init housekeeping parameters	545	// init housekeeping parameters
526		546

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