Fixed autostart for tasks and scheduletables. NOT tested.

diff --git a/boards/mpc551xsim/config/EcuM_Lcfg.c b/boards/mpc551xsim/config/EcuM_Lcfg.c
index d10fbed6e59490facf6da54fdc25ce5aba9af4d9..e28ae7a49621a5ef4e2652b399cf99480afd2df7 100644 (file)
--- a/boards/mpc551xsim/config/EcuM_Lcfg.c
+++ b/boards/mpc551xsim/config/EcuM_Lcfg.c
@@ -117,7 +117,7 @@ void EcuM_Init( void ) {
 \r
 \r
 //     EcuM_SelectShutdownTarget(target,mode);\r
-       StartOS(0);\r
+       StartOS(OSDEFAULTAPPMODE);\r
 // Startup II\r
        //EcuM_AL_DriverInitTwo();\r
 \r

diff --git a/system/kernel/include/alarm_i.h b/system/kernel/include/alarm_i.h
index 923a3d4c9aec5ae45476af9301bca9ce2a921133..22e7848fa491e2345ffa1cf04edfe9f21ff6a7ff 100644 (file)
--- a/system/kernel/include/alarm_i.h
+++ b/system/kernel/include/alarm_i.h
@@ -78,7 +78,7 @@ typedef struct OsAlarmAutostart {
        uint32 alarmTime;
        enum OsAlarmAutostartTypeType autostartType;\r
        uint32 cycleTime;\r
-       uint32 appModeRef;\r
+       AppModeType appModeRef;\r
 } OsAlarmAutostartType;\r
 
 /* STD container : OsAlarm

diff --git a/system/kernel/include/sched_table_i.h b/system/kernel/include/sched_table_i.h
index 4c700b89ddd6a8588b5601cffec5bd749b948960..34225d6ada4484cfc084db9dbc622a925135131e 100644 (file)
--- a/system/kernel/include/sched_table_i.h
+++ b/system/kernel/include/sched_table_i.h
@@ -206,10 +206,12 @@ typedef struct OsSchTbl {
 #define os_stbl_get_action_event(x) os_stbl_get_action(x)->event\r
 */\r
 \r
-void Os_SchTblInit( void );\r
+void Os_SchTblInit( void );
+void Os_SchTblAutostart( void );\r
 void Os_SchTblCalcExpire( OsSchTblType *stbl );
 void Os_SchTblCheck(OsCounterType *c_p);
 
+
 static inline TickType Os_SchTblGetInitialOffset( OsSchTblType *sPtr ) {
        return SA_LIST_GET(&sPtr->expirePointList,0)->offset;
 }

diff --git a/system/kernel/include/sys.h b/system/kernel/include/sys.h
index 46d44255193ff822161249d3991bbaad5cc7c799..bb68321df0e6dbc7b9d156291bdf35a00c3704f4 100644 (file)
--- a/system/kernel/include/sys.h
+++ b/system/kernel/include/sys.h
@@ -39,7 +39,10 @@ typedef struct sys_s {
        uint32_t param1;\r
        uint32_t param2;\r
        uint32_t param3;\r
-       uint32_t serviceId;\r
+       uint32_t serviceId;
+
+       /* Current Application mode */
+       AppModeType appMode;\r
 \r
        uint32_t task_cnt;\r
        /* List of all pcb's,\r

diff --git a/system/kernel/init.c b/system/kernel/init.c
index fa3b95a413bab63110a00c887cbc1e63f43239f5..247d060dff520b523aeafa6551796f80c7d90926 100644 (file)
--- a/system/kernel/init.c
+++ b/system/kernel/init.c
@@ -152,21 +152,25 @@ static void os_start( void ) {
                os_sys.hooks->StartupHook();
        }
 
-       /* handle autostart */
+       /* Alarm autostart */
        for(int j=0; j < Os_CfgGetAlarmCnt(); j++ ) {
                OsAlarmType *alarmPtr;
                alarmPtr = Os_CfgGetAlarmObj(j);
                if(alarmPtr->autostartPtr != NULL ) {
                        const OsAlarmAutostartType *autoPtr = alarmPtr->autostartPtr;
 
-                       if( autoPtr->autostartType == ALARM_AUTOSTART_ABSOLUTE ) {
-                               SetAbsAlarm(j,autoPtr->alarmTime, autoPtr->cycleTime);
-                       } else {
-                               SetRelAlarm(j,autoPtr->alarmTime, autoPtr->cycleTime);
+                       if( os_sys.appMode & autoPtr->appModeRef) {
+                               if( autoPtr->autostartType == ALARM_AUTOSTART_ABSOLUTE ) {
+                                       SetAbsAlarm(j,autoPtr->alarmTime, autoPtr->cycleTime);
+                               } else {
+                                       SetRelAlarm(j,autoPtr->alarmTime, autoPtr->cycleTime);
+                               }
                        }
                }
        }
 
+       Os_SchTblAutostart();
+
        // Set up the systick interrupt
        {
                uint32_t sys_freq = McuE_GetSystemClock();
@@ -183,6 +187,7 @@ static void os_start( void ) {
                        if(     iterPcbPtr->autostart ) {
                                if( iterPcbPtr->prio > topPrio ) {
                                        tmp_pcb = iterPcbPtr;
+                                       topPrio = iterPcbPtr->prio;
                                }
                        }
                }
@@ -238,6 +243,8 @@ void StartOS(AppModeType Mode) {
                noooo();
        }
 
+       os_sys.appMode = Mode;
+
        Os_CfgValidate();
 
        os_start();

diff --git a/system/kernel/sched_table.c b/system/kernel/sched_table.c
index b58698c64d2f912ecffa8e9099315d16b7ddb05f..8b4b1383d2ef9804515d80aca4be75c907f2708f 100644 (file)
--- a/system/kernel/sched_table.c
+++ b/system/kernel/sched_table.c
@@ -565,6 +565,41 @@ void Os_SchTblInit( void ) {
                ScheduleTableConsistenyCheck(s_p);\r
        }\r
 }\r
+
+void Os_SchTblAutostart( void ) {
+
+       for(int j=0; j < Os_CfgGetSchedCnt(); j++ ) {
+               OsSchTblType *sPtr;
+               sPtr = Os_CfgGetSched(j);
+
+               if( sPtr->autostartPtr != NULL ) {
+                       const struct OsSchTblAutostart *autoPtr = sPtr->autostartPtr;
+
+                       /* Check appmode */
+                       if( os_sys.appMode & autoPtr->appMode ) {
+
+                               /* Start the schedule table */
+                               switch(autoPtr->type) {
+                               case SCHTBL_AUTOSTART_ABSOLUTE:
+                                       StartScheduleTableAbs(j,autoPtr->offset);
+                                       break;
+                               case SCHTBL_AUTOSTART_RELATIVE:
+                                       StartScheduleTableRel(j,autoPtr->offset);
+                                       break;
+#if defined(OS_SC2) || defined(OS_SC4)
+                               case SCHTBL_AUTOSTART_SYNCHRONE:
+                                       /* TODO: */
+                                       break;
+#endif
+                               default:
+                                       assert(0);              // Illegal value
+                                       break;
+                               }
+                       }
+               }
+       }
+}
+
 \r
 /**\r
  * Calculates expire value and changes state depending it's state.
@@ -584,8 +619,6 @@ void Os_SchTblCalcExpire( OsSchTblType *stbl ) {
        OsSchTblType *nextStblPtr;
        _Bool handleLast = 0;
 
-
-
        if( (stbl->expire_curr_index) == (SA_LIST_CNT(&stbl->expirePointList) - 1) ) {
                /* We are at the last expiry point */
                finalOffset = Os_SchTblGetFinalOffset(stbl);

diff --git a/system/kernel/testsystem/config/Os_Cfg.c b/system/kernel/testsystem/config/Os_Cfg.c
index ca00082361402f4f7bb761ae732aee5bde15375a..9ae174192be325411cec7ecacfe7c852fb7e7250 100644 (file)
--- a/system/kernel/testsystem/config/Os_Cfg.c
+++ b/system/kernel/testsystem/config/Os_Cfg.c
@@ -4,12 +4,12 @@
 * Created by: 
 * Configured for (MCU): MPC551x
 * 
-* Module vendor:  ArcCore
-* Module version: 2.0.4
+* Module editor vendor:  ArcCore
+* Module editor version: 2.0.7
 * 
 * 
 * Generated by Arctic Studio (http://arccore.com)
-*           on Sun Mar 28 13:53:57 CEST 2010
+*           on Tue May 04 16:38:43 CEST 2010
 */
 
        \r
@@ -31,11 +31,7 @@ OsTickType OsTickFreq = 1000;
 \r
 \r
 // ###############################    DEBUG OUTPUT     #############################\r
-uint32 os_dbg_mask =\r
-               D_TASK |\r
-               D_ALARM |
-               D_RESOURCE |
-               D_SCHTBL ;\r
+uint32 os_dbg_mask = D_RESOURCE |D_SCHTBL |D_EVENT |D_TASK |D_ALARM;\r
  \r
 \r
 \r
@@ -71,7 +67,6 @@ CounterType Os_Arc_OsTickCounter = COUNTER_ID_OsTick;
 \r
 // ##################################    ALARMS     ################################\r
 \r
-\r
 GEN_ALARM_HEAD {\r
        GEN_ALARM(      ALARM_ID_c_soft_1_inc_counter_2,\r
                                "c_soft_1_inc_cou",\r
@@ -87,7 +82,7 @@ GEN_ALARM_HEAD {
                                NULL,\r
                                ALARM_ACTION_SETEVENT,\r
                                TASK_ID_etask_sup_m,\r
-                               EVENT_MASK_1,\r
+                               EVENT_MASK_NOTIF,\r
                                NULL ),\r
        GEN_ALARM(      ALARM_ID_c_sys_1_setevent_etask_m,\r
                                "c_sys_1_setevent",\r
@@ -95,7 +90,7 @@ GEN_ALARM_HEAD {
                                NULL,\r
                                ALARM_ACTION_SETEVENT,\r
                                TASK_ID_etask_sup_m,\r
-                               EVENT_MASK_1,\r
+                               EVENT_MASK_NOTIF,\r
                                NULL ),\r
        GEN_ALARM(      ALARM_ID_c_sys_activate_btask_h,\r
                                "c_sys_activate_b",\r
@@ -109,6 +104,11 @@ GEN_ALARM_HEAD {
 \r
 // ################################    RESOURCES     ###############################\r
 GEN_RESOURCE_HEAD {\r
+       GEN_RESOURCE(\r
+               RES_SCHEDULER,\r
+               RESOURCE_TYPE_STANDARD,\r
+               0\r
+       ),\r
        GEN_RESOURCE(\r
                RES_ID_int_1,\r
                RESOURCE_TYPE_INTERNAL,\r
@@ -251,7 +251,7 @@ GEN_SCHTBL_TASK_LIST_HEAD( 0, 5 ) {
 GEN_SCHTBL_EVENT_LIST_HEAD( 0, 7 ) {\r
        \r
        { \r
-               EVENT_MASK_1, \r
+               EVENT_MASK_NOTIF, \r
                TASK_ID_etask_sup_m \r
        },\r
        \r
@@ -267,7 +267,7 @@ GEN_SCHTBL_TASK_LIST_HEAD( 0, 11 ) {
 GEN_SCHTBL_EVENT_LIST_HEAD( 0, 11 ) {\r
        \r
        { \r
-               EVENT_MASK_1, \r
+               EVENT_MASK_NOTIF, \r
                TASK_ID_etask_sup_m \r
        },\r
        \r
@@ -281,6 +281,12 @@ GEN_SCHTBL_EXPIRY_POINT_HEAD( 0 ) {
        \r
 };\r
 \r
+GEN_SCHTBL_AUTOSTART(\r
+       0,\r
+       SCHTBL_AUTOSTART_ABSOLUTE,\r
+       1, \r
+       OSDEFAULTAPPMODE\r
+);\r
 \r
 // Table data 1\r
 \r
@@ -306,7 +312,7 @@ GEN_SCHTBL_HEAD {
            COUNTER_ID_soft_1,\r
            SINGLE_SHOT,\r
                15,\r
-               NULL\r
+               GEN_SCHTBL_AUTOSTART_NAME(0)\r
        ),\r
        GEN_SCHEDULETABLE(\r
                1,\r

diff --git a/system/kernel/testsystem/config/Os_Cfg.h b/system/kernel/testsystem/config/Os_Cfg.h
index 39e3ca2c6eca728d81b55bb9d95a3641c937727a..092af50ef5d31c77acb5ecc513b7dada4eafc8b9 100644 (file)
--- a/system/kernel/testsystem/config/Os_Cfg.h
+++ b/system/kernel/testsystem/config/Os_Cfg.h
@@ -4,12 +4,12 @@
 * Created by: 
 * Configured for (MCU): MPC551x
 * 
-* Module vendor:  ArcCore
-* Module version: 2.0.4
+* Module editor vendor:  ArcCore
+* Module editor version: 2.0.7
 * 
 * 
 * Generated by Arctic Studio (http://arccore.com)
-*           on Sun Mar 28 13:53:57 CEST 2010
+*           on Tue May 04 16:38:43 CEST 2010
 */
 
 
@@ -40,13 +40,13 @@
 \r
 \r
 // Event masks\r
-#define EVENT_MASK_1   1\r
-#define EVENT_MASK_kill        32768\r
+#define EVENT_MASK_KILL        32768\r
+#define EVENT_MASK_NOTIF       1\r
 \r
 // Isr Id's\r
 \r
 // Resource Id's\r
-#define RES_ID_int_1           0\r
+#define RES_ID_int_1   0\r
 #define RES_ID_std_prio_3      1\r
 #define RES_ID_std_prio_4      2\r
 #define RES_ID_std_prio_5      3\r
@@ -85,18 +85,16 @@ void etask_sup_m( void );
 \r
 // Stack size\r
 #define OS_INTERRUPT_STACK_SIZE        2048\r
-#define OS_OSIDLE_STACK_SIZE 500\r
-\r
-\r
+#define OS_OSIDLE_STACK_SIZE 512\r
 \r
 #define OS_ALARM_CNT                   4 \r
 #define OS_TASK_CNT                            8\r
+#define OS_SCHTBL_CNT                  2\r
 #define OS_COUNTER_CNT                 3\r
 #define OS_EVENTS_CNT                  2\r
 #define OS_ISRS_CNT                            0\r
 #define OS_RESOURCE_CNT                        4\r
-#define OS_LINKED_RESOURCE_CNT 0
-#define OS_SCHTBL_CNT                          2\r
+#define OS_LINKED_RESOURCE_CNT 0\r
 \r
 #define CFG_OS_DEBUG                           STD_ON\r
 \r

diff --git a/system/kernel/testsystem/config/testsystem.arxml b/system/kernel/testsystem/config/testsystem.arxml
deleted file mode 100644 (file)
index 3d14927..0000000
--- a/system/kernel/testsystem/config/testsystem.arxml
+++ /dev/null
@@ -1,786 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<AUTOSAR xmlns="http://autosar.org/3.1.2"><TOP-LEVEL-PACKAGES>\r
-    <AR-PACKAGE UUID="822fb2e1-4171-4ec3-812a-b58265eb646e">\r
-      <SHORT-NAME>testsystem</SHORT-NAME>\r
-      <CATEGORY>EcuConfiguration</CATEGORY>\r
-      <ADMIN-DATA>\r
-        <DOC-REVISIONS>\r
-          <DOC-REVISION>\r
-            <ISSUED-BY/>\r
-          </DOC-REVISION>\r
-        </DOC-REVISIONS>\r
-      </ADMIN-DATA>\r
-      <ELEMENTS>\r
-        <ECU-CONFIGURATION UUID="adececfa-6614-4f2a-bc3b-0de7440970a7">\r
-          <SHORT-NAME>testsystem</SHORT-NAME>\r
-          <ADMIN-DATA>\r
-            <DOC-REVISIONS>\r
-              <DOC-REVISION/>\r
-            </DOC-REVISIONS>\r
-            <SDGS>\r
-              <SDG GID="Arccore::EcuOptions">\r
-                <SD GID="MCU">MPC551x</SD>\r
-                <SD GID="GENDIR">/arc/system/kernel/testsystem/config</SD>\r
-              </SDG>\r
-            </SDGS>\r
-          </ADMIN-DATA>\r
-          <MODULE-REFS>\r
-            <MODULE-REF DEST="MODULE-CONFIGURATION">/testsystem/Os</MODULE-REF>\r
-          </MODULE-REFS>\r
-        </ECU-CONFIGURATION>\r
-        <MODULE-CONFIGURATION UUID="9810a6d9-2cc9-4b23-a969-e4662fdc4a40">\r
-          <SHORT-NAME>Os</SHORT-NAME>\r
-          <ADMIN-DATA>\r
-            <SDGS>\r
-              <SDG/>\r
-              <SDG GID="Arccore::ModuleOptions">\r
-                <SD GID="GENERATE_AND_VALIDATE">true</SD>\r
-                <SD GID="ARCCORE_EDITOR_VERSION">2.0.4</SD>\r
-              </SDG>\r
-            </SDGS>\r
-          </ADMIN-DATA>\r
-          <DEFINITION-REF DEST="MODULE-DEF">/ArcCore/Os</DEFINITION-REF>\r
-          <CONTAINERS>\r
-            <CONTAINER UUID="c28c1e41-ab85-44af-8c08-8bfe14a614d8">\r
-              <SHORT-NAME>OsOS</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsOS</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsStackMonitoring</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsOS/OsStatus</DEFINITION-REF>\r
-                  <VALUE>EXTENDED</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsUseGetServiceId</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsUseParameterAccess</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsUseResScheduler</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsOS/OsTickFrequency</DEFINITION-REF>\r
-                  <VALUE>1000</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsOS/OsInterruptStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsUseDebug</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsDebugMasterPrint</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsDebugISRMasterPrint</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsDebugRamlog</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsDebugTask</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsDebugAlarm</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsDebugISRRamlog</DEFINITION-REF>\r
-                  <VALUE>true</VALUE>\r
-                </BOOLEAN-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="225d4007-aaa5-4862-9c24-1c00c1418e51">\r
-                  <SHORT-NAME>OsHooks</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsOS/OsHooks</DEFINITION-REF>\r
-                  <PARAMETER-VALUES>\r
-                    <BOOLEAN-VALUE>\r
-                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsHooks/OsErrorHook</DEFINITION-REF>\r
-                      <VALUE>true</VALUE>\r
-                    </BOOLEAN-VALUE>\r
-                    <BOOLEAN-VALUE>\r
-                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsHooks/OsPostTaskHook</DEFINITION-REF>\r
-                      <VALUE>true</VALUE>\r
-                    </BOOLEAN-VALUE>\r
-                    <BOOLEAN-VALUE>\r
-                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsHooks/OsPreTaskHook</DEFINITION-REF>\r
-                      <VALUE>true</VALUE>\r
-                    </BOOLEAN-VALUE>\r
-                    <BOOLEAN-VALUE>\r
-                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsHooks/OsProtectionHook</DEFINITION-REF>\r
-                      <VALUE>false</VALUE>\r
-                    </BOOLEAN-VALUE>\r
-                    <BOOLEAN-VALUE>\r
-                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsHooks/OsShutdownHook</DEFINITION-REF>\r
-                      <VALUE>true</VALUE>\r
-                    </BOOLEAN-VALUE>\r
-                    <BOOLEAN-VALUE>\r
-                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/OsHooks/OsStartupHook</DEFINITION-REF>\r
-                      <VALUE>true</VALUE>\r
-                    </BOOLEAN-VALUE>\r
-                  </PARAMETER-VALUES>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="18ffb863-c03b-485d-9d2f-6f3516d63901">\r
-              <SHORT-NAME>int_1</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsResource</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsResource/OsResourceProperty</DEFINITION-REF>\r
-                  <VALUE>INTERNAL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="86681234-fe16-4039-82aa-b7d47e2e38ae">\r
-              <SHORT-NAME>etask_master</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>EXTENDED</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="5f49198a-5604-45b0-b4ea-e5a711e5416f">\r
-                  <SHORT-NAME>OsTaskAutostart</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask/OsTaskAutostart</DEFINITION-REF>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="1f1560f5-2306-4238-a7a4-50d5bdc6a359">\r
-              <SHORT-NAME>etask_sup_l</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>2</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>EXTENDED</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_3</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_4</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_5</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="c5691264-811a-4714-8c56-37affb1ba27c">\r
-              <SHORT-NAME>etask_sup_m</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>4</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>EXTENDED</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_3</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_4</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_5</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="6d2cdf4d-467d-43a0-a7b6-5f23a73fbf12">\r
-              <SHORT-NAME>etask_sup_h</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>6</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>EXTENDED</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_3</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_4</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_5</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="f3adef46-f5f6-4707-af6e-a771ffec9385">\r
-              <SHORT-NAME>btask_sup_l</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>2</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>BASIC</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_3</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_4</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_5</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="8d1d4b20-17b3-4b75-947f-8f844ad34a13">\r
-              <SHORT-NAME>btask_sup_m</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>4</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>BASIC</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_3</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_4</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_5</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="7a61a623-77b7-49e9-896f-375ca12b1441">\r
-              <SHORT-NAME>btask_sup_h</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskActivation</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskPriority</DEFINITION-REF>\r
-                  <VALUE>6</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskProcessType</DEFINITION-REF>\r
-                  <VALUE>BASIC</VALUE>\r
-                </ENUMERATION-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsTask/ArcCoreOsTaskStackSize</DEFINITION-REF>\r
-                  <VALUE>2048</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskSchedule</DEFINITION-REF>\r
-                  <VALUE>FULL</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_3</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_4</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsTask/OsTaskResourceRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/std_prio_5</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="a05049bd-092b-4199-9de0-b0770a57c029">\r
-              <SHORT-NAME>std_prio_3</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsResource</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsResource/OsResourceProperty</DEFINITION-REF>\r
-                  <VALUE>STANDARD</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="a9b777b9-66df-48ee-9cc2-9d91e70d769b">\r
-              <SHORT-NAME>std_prio_4</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsResource</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsResource/OsResourceProperty</DEFINITION-REF>\r
-                  <VALUE>STANDARD</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="e0499b83-ea54-4b70-8023-a1c0912d3496">\r
-              <SHORT-NAME>std_prio_5</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsResource</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsResource/OsResourceProperty</DEFINITION-REF>\r
-                  <VALUE>STANDARD</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="535d1101-3931-4273-81af-00627d240a77">\r
-              <SHORT-NAME>1</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsEvent</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsEvent/OsEventMask</DEFINITION-REF>\r
-                  <VALUE>1</VALUE>\r
-                </INTEGER-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="19e4f863-4f93-4692-ade2-6e2451d7c194">\r
-              <SHORT-NAME>kill</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsEvent</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsEvent/OsEventMask</DEFINITION-REF>\r
-                  <VALUE>32768</VALUE>\r
-                </INTEGER-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="637fd8fb-42a3-4c05-9183-885a432a8b25">\r
-              <SHORT-NAME>0</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableDuration</DEFINITION-REF>\r
-                  <VALUE>15</VALUE>\r
-                </INTEGER-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableRepeating</DEFINITION-REF>\r
-                  <VALUE>false</VALUE>\r
-                </BOOLEAN-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableCounterRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/soft_1</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="91fe76c0-a4f8-41cd-bd0c-2a54607e170c">\r
-                  <SHORT-NAME>ExpiryPoint</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint</DEFINITION-REF>\r
-                  <PARAMETER-VALUES>\r
-                    <INTEGER-VALUE>\r
-                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTblExpPointOffset</DEFINITION-REF>\r
-                      <VALUE>5</VALUE>\r
-                    </INTEGER-VALUE>\r
-                  </PARAMETER-VALUES>\r
-                  <SUB-CONTAINERS>\r
-                    <CONTAINER UUID="29ae18ef-642a-49b0-89e8-f084c8be0184">\r
-                      <SHORT-NAME>TaskActivation1</SHORT-NAME>\r
-                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableTaskActivation</DEFINITION-REF>\r
-                      <REFERENCE-VALUES>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableTaskActivation/OsScheduleTableActivateTaskRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                      </REFERENCE-VALUES>\r
-                    </CONTAINER>\r
-                  </SUB-CONTAINERS>\r
-                </CONTAINER>\r
-                <CONTAINER UUID="1eeb83cf-6e40-4459-b43b-519938cfeacf">\r
-                  <SHORT-NAME>ExpiryPoint1</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint</DEFINITION-REF>\r
-                  <PARAMETER-VALUES>\r
-                    <INTEGER-VALUE>\r
-                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTblExpPointOffset</DEFINITION-REF>\r
-                      <VALUE>7</VALUE>\r
-                    </INTEGER-VALUE>\r
-                  </PARAMETER-VALUES>\r
-                  <SUB-CONTAINERS>\r
-                    <CONTAINER UUID="3eee4e25-4387-4890-99ec-971b1f818ff7">\r
-                      <SHORT-NAME>EventSetting1</SHORT-NAME>\r
-                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableEventSetting</DEFINITION-REF>\r
-                      <REFERENCE-VALUES>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableEventSetting/OsScheduleTableSetEventRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/1</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableEventSetting/OsScheduleTableSetEventTaskRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                      </REFERENCE-VALUES>\r
-                    </CONTAINER>\r
-                  </SUB-CONTAINERS>\r
-                </CONTAINER>\r
-                <CONTAINER UUID="ba969f84-2712-4a6a-9545-af7170e843f1">\r
-                  <SHORT-NAME>ExpiryPoint2</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint</DEFINITION-REF>\r
-                  <PARAMETER-VALUES>\r
-                    <INTEGER-VALUE>\r
-                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTblExpPointOffset</DEFINITION-REF>\r
-                      <VALUE>11</VALUE>\r
-                    </INTEGER-VALUE>\r
-                  </PARAMETER-VALUES>\r
-                  <SUB-CONTAINERS>\r
-                    <CONTAINER UUID="a86f8b0e-fe35-4b43-b574-fdfbd1f6cf4f">\r
-                      <SHORT-NAME>EventSetting1</SHORT-NAME>\r
-                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableEventSetting</DEFINITION-REF>\r
-                      <REFERENCE-VALUES>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableEventSetting/OsScheduleTableSetEventRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/1</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableEventSetting/OsScheduleTableSetEventTaskRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                      </REFERENCE-VALUES>\r
-                    </CONTAINER>\r
-                    <CONTAINER UUID="e37a1042-45ed-46f8-ae6d-83230d160aea">\r
-                      <SHORT-NAME>TaskActivation1</SHORT-NAME>\r
-                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableTaskActivation</DEFINITION-REF>\r
-                      <REFERENCE-VALUES>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableTaskActivation/OsScheduleTableActivateTaskRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                      </REFERENCE-VALUES>\r
-                    </CONTAINER>\r
-                  </SUB-CONTAINERS>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="6746f7ae-bbee-45d9-bc71-3268c81fb344">\r
-              <SHORT-NAME>OsTick</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsCounter</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterMaxAllowedValue</DEFINITION-REF>\r
-                  <VALUE>65535</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterMinCycle</DEFINITION-REF>\r
-                  <VALUE>0</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterTicksPerBase</DEFINITION-REF>\r
-                  <VALUE>0</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterType</DEFINITION-REF>\r
-                  <VALUE>OS-TICK</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="72ed3e36-bb2e-420e-a74e-094b97f07fd8">\r
-              <SHORT-NAME>soft_1</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsCounter</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterMaxAllowedValue</DEFINITION-REF>\r
-                  <VALUE>65535</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterMinCycle</DEFINITION-REF>\r
-                  <VALUE>0</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterTicksPerBase</DEFINITION-REF>\r
-                  <VALUE>0</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterType</DEFINITION-REF>\r
-                  <VALUE>SOFTWARE</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="2d133eeb-5148-444e-9b31-237b57e098b4">\r
-              <SHORT-NAME>1</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableDuration</DEFINITION-REF>\r
-                  <VALUE>5</VALUE>\r
-                </INTEGER-VALUE>\r
-                <BOOLEAN-VALUE>\r
-                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableRepeating</DEFINITION-REF>\r
-                  <VALUE>false</VALUE>\r
-                </BOOLEAN-VALUE>\r
-              </PARAMETER-VALUES>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableCounterRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/soft_1</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="460781a7-a783-492c-8e2a-589e5d6fedbb">\r
-                  <SHORT-NAME>ExpiryPoint</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint</DEFINITION-REF>\r
-                  <PARAMETER-VALUES>\r
-                    <INTEGER-VALUE>\r
-                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTblExpPointOffset</DEFINITION-REF>\r
-                      <VALUE>2</VALUE>\r
-                    </INTEGER-VALUE>\r
-                  </PARAMETER-VALUES>\r
-                  <SUB-CONTAINERS>\r
-                    <CONTAINER UUID="72ad160e-bf1e-4442-a8f0-a65a7ec8f816">\r
-                      <SHORT-NAME>TaskActivation1</SHORT-NAME>\r
-                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableTaskActivation</DEFINITION-REF>\r
-                      <REFERENCE-VALUES>\r
-                        <REFERENCE-VALUE>\r
-                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsScheduleTable/OsScheduleTableExpiryPoint/OsScheduleTableTaskActivation/OsScheduleTableActivateTaskRef</DEFINITION-REF>\r
-                          <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                        </REFERENCE-VALUE>\r
-                      </REFERENCE-VALUES>\r
-                    </CONTAINER>\r
-                  </SUB-CONTAINERS>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="dede2d6e-0f82-4652-86b6-78c1360c1592">\r
-              <SHORT-NAME>c_sys_activate_btask_h</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm</DEFINITION-REF>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmCounterRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/OsTick</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="97c6029d-cef4-4bb1-bab0-f882479de012">\r
-                  <SHORT-NAME>OsAlarmActivateTask</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmActivateTask</DEFINITION-REF>\r
-                  <REFERENCE-VALUES>\r
-                    <REFERENCE-VALUE>\r
-                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmActivateTask/OsAlarmActivateTaskRef</DEFINITION-REF>\r
-                      <VALUE-REF DEST="CONTAINER">/testsystem/Os/btask_sup_h</VALUE-REF>\r
-                    </REFERENCE-VALUE>\r
-                  </REFERENCE-VALUES>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="17540841-1b7d-4421-be1a-2f116364deba">\r
-              <SHORT-NAME>c_sys_1_setevent_etask_m</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm</DEFINITION-REF>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmCounterRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/OsTick</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="7ebab0c9-e8c1-4371-b439-a901d6122efc">\r
-                  <SHORT-NAME>OsAlarmSetEvent</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent</DEFINITION-REF>\r
-                  <REFERENCE-VALUES>\r
-                    <REFERENCE-VALUE>\r
-                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent/OsAlarmSetEventRef</DEFINITION-REF>\r
-                      <VALUE-REF DEST="CONTAINER">/testsystem/Os/1</VALUE-REF>\r
-                    </REFERENCE-VALUE>\r
-                    <REFERENCE-VALUE>\r
-                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent/OsAlarmSetEventTaskRef</DEFINITION-REF>\r
-                      <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                    </REFERENCE-VALUE>\r
-                  </REFERENCE-VALUES>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="f6022231-7387-4d18-9833-be28dce71f30">\r
-              <SHORT-NAME>c_soft_1_setevent_etask_m</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm</DEFINITION-REF>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmCounterRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/soft_1</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="f832f963-085b-45f1-a4a5-507e10cef798">\r
-                  <SHORT-NAME>OsAlarmSetEvent</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent</DEFINITION-REF>\r
-                  <REFERENCE-VALUES>\r
-                    <REFERENCE-VALUE>\r
-                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent/OsAlarmSetEventRef</DEFINITION-REF>\r
-                      <VALUE-REF DEST="CONTAINER">/testsystem/Os/1</VALUE-REF>\r
-                    </REFERENCE-VALUE>\r
-                    <REFERENCE-VALUE>\r
-                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent/OsAlarmSetEventTaskRef</DEFINITION-REF>\r
-                      <VALUE-REF DEST="CONTAINER">/testsystem/Os/etask_sup_m</VALUE-REF>\r
-                    </REFERENCE-VALUE>\r
-                  </REFERENCE-VALUES>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="85e281ff-fa24-4ade-867b-4126a3bc99e2">\r
-              <SHORT-NAME>c_soft_1_inc_counter_2</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm</DEFINITION-REF>\r
-              <REFERENCE-VALUES>\r
-                <REFERENCE-VALUE>\r
-                  <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmCounterRef</DEFINITION-REF>\r
-                  <VALUE-REF DEST="CONTAINER">/testsystem/Os/soft_1</VALUE-REF>\r
-                </REFERENCE-VALUE>\r
-              </REFERENCE-VALUES>\r
-              <SUB-CONTAINERS>\r
-                <CONTAINER UUID="b5cc2bdd-1f43-414d-bea7-d7cb4d559d3b">\r
-                  <SHORT-NAME>OsAlarmIncrementCounter</SHORT-NAME>\r
-                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmIncrementCounter</DEFINITION-REF>\r
-                  <REFERENCE-VALUES>\r
-                    <REFERENCE-VALUE>\r
-                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmIncrementCounter/OsAlarmIncrementCounterRef</DEFINITION-REF>\r
-                      <VALUE-REF DEST="CONTAINER">/testsystem/Os/soft_2</VALUE-REF>\r
-                    </REFERENCE-VALUE>\r
-                  </REFERENCE-VALUES>\r
-                </CONTAINER>\r
-              </SUB-CONTAINERS>\r
-            </CONTAINER>\r
-            <CONTAINER UUID="f510c7bd-12d7-475b-88cf-387b50e955c9">\r
-              <SHORT-NAME>soft_2</SHORT-NAME>\r
-              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsCounter</DEFINITION-REF>\r
-              <PARAMETER-VALUES>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterMaxAllowedValue</DEFINITION-REF>\r
-                  <VALUE>65535</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterMinCycle</DEFINITION-REF>\r
-                  <VALUE>0</VALUE>\r
-                </INTEGER-VALUE>\r
-                <INTEGER-VALUE>\r
-                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterTicksPerBase</DEFINITION-REF>\r
-                  <VALUE>0</VALUE>\r
-                </INTEGER-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Os/OsCounter/OsCounterType</DEFINITION-REF>\r
-                  <VALUE>SOFTWARE</VALUE>\r
-                </ENUMERATION-VALUE>\r
-              </PARAMETER-VALUES>\r
-            </CONTAINER>\r
-          </CONTAINERS>\r
-        </MODULE-CONFIGURATION>\r
-      </ELEMENTS>\r
-    </AR-PACKAGE>\r
-  </TOP-LEVEL-PACKAGES></AUTOSAR>\r

diff --git a/system/kernel/testsystem/test_03_alarm.c b/system/kernel/testsystem/test_03_alarm.c
index 102784beec87dac9cd5dc3e67f451e7ed1a4c4d9..288227c404f289ae0ccd55037f55788dfbe508f1 100644 (file)
--- a/system/kernel/testsystem/test_03_alarm.c
+++ b/system/kernel/testsystem/test_03_alarm.c
@@ -345,7 +345,7 @@ void etask_sup_l_03(void) {
                        test_nr = 100;\r
                        break;\r
                case 100:\r
-                       SetEvent(TASK_ID_etask_sup_m, EVENT_MASK_kill);\r
+                       SetEvent(TASK_ID_etask_sup_m, EVENT_MASK_KILL);\r
                        TerminateTask();\r
                        break;\r
                }\r
@@ -356,13 +356,13 @@ void etask_sup_m_03(void) {
 \r
        for(;;) {\r
 \r
-               WaitEvent(EVENT_MASK_1 | EVENT_MASK_kill );\r
+               WaitEvent(EVENT_MASK_NOTIF | EVENT_MASK_KILL );\r
                switch (test_nr) {\r
                case 12:\r
                case 13:\r
                case 14:\r
                case 15:\r
-                       ClearEvent(EVENT_MASK_1);\r
+                       ClearEvent(EVENT_MASK_NOTIF);\r
                        break;\r
                case 100:\r
                        TerminateTask();\r

diff --git a/system/kernel/testsystem/test_04_stable.c b/system/kernel/testsystem/test_04_stable.c
index 669924f7436d94f62749262af00ff0bfa6a5c287..9ca3feea23e0e5644e70865c046b2b4bf521c2fa 100644 (file)
--- a/system/kernel/testsystem/test_04_stable.c
+++ b/system/kernel/testsystem/test_04_stable.c
@@ -236,7 +236,7 @@ void etask_sup_l_04(void) {
 \r
 \r
                case 100:\r
-                       rv = SetEvent(TASK_ID_etask_sup_m, EVENT_MASK_kill);\r
+                       rv = SetEvent(TASK_ID_etask_sup_m, EVENT_MASK_KILL);\r
                        TEST_ASSERT( rv == E_OK );\r
                        TerminateTask();\r
                        break;\r
@@ -252,7 +252,7 @@ void etask_sup_m_04(void) {
        StatusType rv;\r
 \r
        for(;;) {\r
-               WaitEvent(EVENT_MASK_1 | EVENT_MASK_kill );\r
+               WaitEvent(EVENT_MASK_NOTIF | EVENT_MASK_KILL );\r
                switch(test_nr) {\r
                case 10:\r
                        switch(subTest) {\r
@@ -261,8 +261,8 @@ void etask_sup_m_04(void) {
                                printf("etask\n");\r
                                rv = GetEvent(currTask,&eventMask);\r
                                TEST_ASSERT( rv == E_OK );\r
-                               TEST_ASSERT(eventMask == EVENT_MASK_1 );\r
-                               ClearEvent(EVENT_MASK_1);\r
+                               TEST_ASSERT(eventMask == EVENT_MASK_NOTIF );\r
+                               ClearEvent(EVENT_MASK_NOTIF);\r
                                break;\r
 \r
                        default:\r

diff --git a/system/kernel/testsystem/test_master.c b/system/kernel/testsystem/test_master.c
index 89a35be1dfe44077c58ab820f86cd18694d7470b..593875cbb97041fb1bf67d51e87effd69e197b8a 100644 (file)
--- a/system/kernel/testsystem/test_master.c
+++ b/system/kernel/testsystem/test_master.c
@@ -13,6 +13,17 @@
  * for more details.
  * -------------------------------- Arctic Core ------------------------------*/
 
+/* CONFIGURATION
+ * - The "etask_master" should be the only autostarted task.
+ * - It can hold at most 3 extended task and 3 basic tasks. They must be called
+ *   etask_sup_l, etask_sup_m, etask_sup_h,
+ *   btask_sup_l, btask_sup_m, btask_sup_h
+ */
+
+
+
+
+
 #include <stdlib.h>\r
 #include "Os.h"\r
 #include "os_test.h"\r
@@ -26,17 +37,6 @@
 #include "debug.h"
 #include "arc.h"\r
 \r
-extern void etask_sup_l_basic_02( void );\r
-extern void etask_sup_m_basic_02( void );\r
-extern void etask_sup_h_basic_02( void );\r
-\r
-\r
-#define DECLARE_BASIC(_nr) \\r
-       extern void btest_sup_l_##_nr(void);\\r
-       extern void btest_sup_m_##_nr(void);\\r
-       extern void btest_sup_h_##_nr(void);\r
-\r
-// DECLARE_BASIC(02);\r
 \r
 typedef struct {\r
         uint32 nr;\r
@@ -79,33 +79,8 @@ void etask_master( void ) {
 \r
 }\r
 
-#if 0\r
-test_func_t etask_sup_matrix[][3] = {\r
-/* 01*/        { etask_sup_l_01, NULL, NULL },
-#if 0\r
-/* 02*/        { etask_sup_l_02, etask_sup_m_02, etask_sup_h_02},\r
-/* 03*/        { etask_sup_l_03, etask_sup_m_03, NULL},
-/* 04*/        { etask_sup_l_04, etask_sup_m_04, NULL},
-#endif\r
-}; // __attribute__ ((section(".data_app_2")));\r
-\r
-#define TEST_BASIC(nr) \\r
-       { btest_sup_l_##nr , btest_sup_m_##nr , btest_sup_h_## nr }\r
-
-\r
-test_func_t btask_sup_matrix[][3] = {\r
-// /* 01*/     { NULL, NULL, NULL},
-               TEST_BASIC(01),
-#if 0\r
-               TEST_BASIC(02),\r
-\r
-#endif\r
-}; // __attribute__ ((section(".data_app_2")));\r
-
-#else
 extern test_func_t etask_sup_matrix[][3];
 extern test_func_t btask_sup_matrix[][3];\r
-#endif
 \r
 //--------------------------------------------------------------------\r
 //--------------------------------------------------------------------\r