HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Compare - HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE@tip > HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW@Next

Compare Commits `r371:88d90c878c97...r372:fc82b08705ba`

Target:

Source:

Actions:

Compare was calculated based on this common ancestor commit: 18e20227b986

Time	Author	Commit	Description
Thu, 29 Jun 2017 16:40:08	jeandet	`r371:88d90c878c97`	Added automatic map file production on build.
Wed, 05 Jul 2017 18:07:52	jeandet	`r372:fc82b08705ba`	Added scrubbing Task, to increase scrubbing frequency and avoid entering idle task.
2 commits hidden, click expand to show them.

Collapse all files

.hgsub +1 -1

-             header/lfr_common_headers = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/lfr_common_headers
+             header/lfr_common_headers = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/lfr_common_headers
              LFR_basic-parameters = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/CHUST/LFR_basic-parameters

.hgsubstate +1 -1

		@@ -1,2 +1,2
1	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);

sparc/sparc-rtems.cmake +1 -1

                  set(CMAKE_C_FLAGS_RELEASE "-O3")
              endif()
-             set(CMAKE_C_LINK_EXECUTABLE  "<CMAKE_LINKER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+             set(CMAKE_C_LINK_EXECUTABLE  "<CMAKE_LINKER> <FLAGS> -Xlinker -Map=<TARGET>.map <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
              include_directories("${rtems_dir}/sparc-rtems/leon3/lib/include")

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

                  }
              }
+             rtems_task scrubbing_task( rtems_task_argument unused )
+             {
+                 /** This RTEMS taks is to avoid entering IDLE task and also scrub memory to increase scubbing frequency.
+                  *
+                  * @param unused is the starting argument of the RTEMS task
+                  *
+                  * The scrubbing reads continuously memory when no other tasks are ready.
+                  *
+                  */
+                 BOOT_PRINTF("in SCRUBBING *** \n");
+                 volatile int i=0;
+                 volatile uint32_t* RAM=(uint32_t*)0x40000000;
+                 volatile uint32_t value;
+                 while(1){
+                     i=(i+1)%(1024*1024);
+                     value += RAM[i];
+                 }
+             }
              //*****************************
              // init housekeeping parameters

	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

Compare Commits r371:88d90c878c97...r372:fc82b08705ba

Compare Commits `r371:88d90c878c97...r372:fc82b08705ba`