#include "Os.h" // includes Os_Cfg.h\r
#include "os_config_macros.h"\r
#include "kernel.h"\r
-#include "kernel_offset.h"\r
+//#include "isr.h"\r
+//#include "kernel_offset.h"\r
#include "alist_i.h"\r
#include "Mcu.h"\r
\r
-extern void dec_exception( void );\r
+// ############################### EXTERNAL REFERENCES #############################\r
+\r
+/* Application externals */\r
+\r
+/* Interrupt externals */\r
+\r
\r
// Set the os tick frequency\r
OsTickType OsTickFreq = 1000;\r
// ############################### DEBUG OUTPUT #############################\r
uint32 os_dbg_mask = 0;\r
\r
-\r
-\r
+// ############################### APPLICATIONS #############################\r
+GEN_APPLICATION_HEAD = {\r
+ GEN_APPLICATION(\r
+ /* id */ APPLICATION_ID_OsApplication1,\r
+ /* name */ "OsApplication1",\r
+ /* trusted */ true, /* NOT CONFIGURABLE IN TOOLS */\r
+ 0,\r
+ /* StartupHook */ NULL, /* Startup Hook */\r
+ /* ShutdownHook */ NULL, /* Shutdown Hook */\r
+ /* ErrorHook */ NULL, /* Error Hook */\r
+ /* rstrtTaskId */ 0 /* NOT CONFIGURABLE IN TOOLS */\r
+ ), \r
+};\r
// ################################# COUNTERS ###############################\r
-GEN_COUNTER_HEAD {\r
+GEN_COUNTER_HEAD = {\r
GEN_COUNTER( COUNTER_ID_OsTick,\r
"OsTick",\r
COUNTER_TYPE_HARD,\r
COUNTER_UNIT_NANO,\r
0xffff,\r
1,\r
+ 1,\r
0,\r
- 0),\r
+ APPLICATION_ID_OsApplication1, /* Application owner */\r
+ 0 /* Accessing application mask */\r
+ ),\r
};\r
\r
CounterType Os_Arc_OsTickCounter = COUNTER_ID_OsTick;\r
\r
// ################################## ALARMS ################################\r
\r
-GEN_ALARM_HEAD {\r
+GEN_ALARM_HEAD = {\r
GEN_ALARM( ALARM_ID_alarm10,\r
"alarm10",\r
COUNTER_ID_OsTick,\r
ALARM_ACTION_ACTIVATETASK,\r
TASK_ID_bTask10,\r
NULL,\r
- NULL ),\r
+ NULL,\r
+ APPLICATION_ID_OsApplication1, /* Application owner */\r
+ 0 /* Accessing application mask */\r
+ ),\r
GEN_ALARM( ALARM_ID_alarm100,\r
"alarm100",\r
COUNTER_ID_OsTick,\r
ALARM_ACTION_ACTIVATETASK,\r
TASK_ID_bTask100,\r
NULL,\r
- NULL ),\r
+ NULL,\r
+ APPLICATION_ID_OsApplication1, /* Application owner */\r
+ 0 /* Accessing application mask */\r
+ ),\r
GEN_ALARM( ALARM_ID_alarm25,\r
"alarm25",\r
COUNTER_ID_OsTick,\r
ALARM_ACTION_ACTIVATETASK,\r
TASK_ID_bTask25,\r
NULL,\r
- NULL ),\r
+ NULL,\r
+ APPLICATION_ID_OsApplication1, /* Application owner */\r
+ 0 /* Accessing application mask */\r
+ ),\r
};\r
\r
// ################################ RESOURCES ###############################\r
-GEN_RESOURCE_HEAD {\r
-};\r
\r
// ############################## STACKS (TASKS) ############################\r
DECLARE_STACK(OsIdle,OS_OSIDLE_STACK_SIZE);\r
DECLARE_STACK(bTask25,2048);\r
\r
// ################################## TASKS #################################\r
-GEN_TASK_HEAD {\r
+GEN_TASK_HEAD = {\r
GEN_ETASK( OsIdle,\r
+ "OsIdle",\r
0,\r
FULL,\r
TRUE,\r
NULL,\r
+ RES_SCHEDULER,\r
+ 0,\r
0 \r
),\r
GEN_BTASK(\r
- Startup,\r
- 2,\r
- FULL,\r
- TRUE,\r
- NULL,\r
- 0,\r
- 1\r
+ /* */Startup,\r
+ /* name */"Startup",\r
+ /* priority */2,\r
+ /* schedule */FULL,\r
+ /* autostart */TRUE,\r
+ /* resource_int_p */NULL,\r
+ /* resource mask */0,\r
+ /* activation lim. */1,\r
+ /* App owner */APPLICATION_ID_OsApplication1,\r
+ /* Accessing apps */0\r
),\r
\r
GEN_BTASK(\r
- bTask10,\r
- 1,\r
- FULL,\r
- FALSE,\r
- NULL,\r
- 0,\r
- 1\r
+ /* */bTask10,\r
+ /* name */"bTask10",\r
+ /* priority */1,\r
+ /* schedule */FULL,\r
+ /* autostart */FALSE,\r
+ /* resource_int_p */NULL,\r
+ /* resource mask */0,\r
+ /* activation lim. */1,\r
+ /* App owner */APPLICATION_ID_OsApplication1,\r
+ /* Accessing apps */0\r
),\r
\r
GEN_BTASK(\r
- bTask100,\r
- 1,\r
- FULL,\r
- FALSE,\r
- NULL,\r
- 0,\r
- 1\r
+ /* */bTask100,\r
+ /* name */"bTask100",\r
+ /* priority */1,\r
+ /* schedule */FULL,\r
+ /* autostart */FALSE,\r
+ /* resource_int_p */NULL,\r
+ /* resource mask */0,\r
+ /* activation lim. */1,\r
+ /* App owner */APPLICATION_ID_OsApplication1,\r
+ /* Accessing apps */0\r
),\r
\r
GEN_BTASK(\r
- bTask25,\r
- 1,\r
- FULL,\r
- FALSE,\r
- NULL,\r
- 0,\r
- 1\r
+ /* */bTask25,\r
+ /* name */"bTask25",\r
+ /* priority */1,\r
+ /* schedule */FULL,\r
+ /* autostart */FALSE,\r
+ /* resource_int_p */NULL,\r
+ /* resource mask */0,\r
+ /* activation lim. */1,\r
+ /* App owner */APPLICATION_ID_OsApplication1,\r
+ /* Accessing apps */0\r
),\r
- \r
};\r
\r
// ################################## HOOKS #################################\r
);\r
\r
// ################################## ISRS ##################################\r
-\r
-\r
-// ############################ SCHEDULE TABLES #############################\r
-\r
-// Table heads\r
-GEN_SCHTBL_HEAD {\r
+#if OS_ISR_CNT!=0\r
+GEN_ISR_HEAD = {\r
};\r
+#endif\r
\r
-GEN_PCB_LIST()\r
+GEN_ISR_MAP = { 0\r
+};\r
\r
-uint8_t os_interrupt_stack[OS_INTERRUPT_STACK_SIZE] __attribute__ ((aligned (0x10)));\r
+// ############################ SCHEDULE TABLES #############################\r
\r
-GEN_IRQ_VECTOR_TABLE_HEAD {};\r
-GEN_IRQ_ISR_TYPE_TABLE_HEAD {};\r
-GEN_IRQ_PRIORITY_TABLE_HEAD {};\r
\r
#include "os_config_funcs.h"\r
#ifndef OS_CFG_H_\r
#define OS_CFG_H_\r
\r
+// Application Id's\r
+#define APPLICATION_ID_OsApplication1 0\r
\r
// Alarm Id's\r
#define ALARM_ID_alarm10 0\r
#define OS_SCHTBL_CNT 0\r
#define OS_COUNTER_CNT 1\r
#define OS_EVENTS_CNT 0\r
-#define OS_ISRS_CNT 0\r
+//#define OS_ISRS_CNT 0\r
#define OS_RESOURCE_CNT 0\r
#define OS_LINKED_RESOURCE_CNT 0\r
-\r
+#define OS_APPLICATION_CNT 1\r
+#define OS_SERVICE_CNT 0 /* ARCTICSTUDIO_GENERATOR_TODO */\r
#define CFG_OS_DEBUG STD_OFF\r
\r
-#define OS_SC1 STD_ON \r
+#define OS_SC1 STD_ON /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_APPLICATIONS STD_ON\r
+#define OS_USE_MEMORY_PROT STD_OFF /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_TASK_TIMING_PROT STD_OFF /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_ISR_TIMING_PROT STD_OFF /* NOT CONFIGURABLE IN TOOLS */\r
+//#define OS_SC3 STD_ON /* NOT CONFIGURABLE IN TOOLS */ \r
#define OS_STACK_MONITORING STD_ON\r
#define OS_STATUS_EXTENDED STD_ON\r
#define OS_USE_GET_SERVICE_ID STD_ON\r
#define OS_USE_PARAMETER_ACCESS STD_ON\r
-#define OS_RES_SCHEDULER STD_ON\r
+#define OS_RES_SCHEDULER STD_ON /* NOT CONFIGURABLE IN TOOLS */\r
+\r
+#define OS_ISR_CNT 0\r
+#define OS_ISR2_CNT 0\r
+#define OS_ISR1_CNT 0\r
+\r
+/* New */\r
+#define OS_ISR_MAX_CNT 10 /* NOT CONFIGURABLE IN TOOLS */\r
+\r
\r
#endif /*OS_CFG_H_*/\r
#include "Os.h" // includes Os_Cfg.h\r
#include "os_config_macros.h"\r
#include "kernel.h"\r
-#include "kernel_offset.h"\r
+//#include "isr.h"\r
+//#include "kernel_offset.h"\r
#include "alist_i.h"\r
#include "Mcu.h"\r
\r
-extern void dec_exception( void );\r
+// ############################### EXTERNAL REFERENCES #############################\r
+\r
+/* Application externals */\r
+\r
+/* Interrupt externals */\r
+\r
\r
// Set the os tick frequency\r
OsTickType OsTickFreq = 1000;\r
// ############################### DEBUG OUTPUT #############################\r
uint32 os_dbg_mask = 0;\r
\r
-\r
-\r
+// ############################### APPLICATIONS #############################\r
+GEN_APPLICATION_HEAD = {\r
+ GEN_APPLICATION(\r
+ /* id */ APPLICATION_ID_OsApplication1,\r
+ /* name */ "OsApplication1",\r
+ /* trusted */ true, /* NOT CONFIGURABLE IN TOOLS */\r
+ 0,\r
+ /* StartupHook */ NULL, /* Startup Hook */\r
+ /* ShutdownHook */ NULL, /* Shutdown Hook */\r
+ /* ErrorHook */ NULL, /* Error Hook */\r
+ /* rstrtTaskId */ 0 /* NOT CONFIGURABLE IN TOOLS */\r
+ ),\r
+};\r
// ################################# COUNTERS ###############################\r
-GEN_COUNTER_HEAD {\r
+GEN_COUNTER_HEAD = {\r
GEN_COUNTER( COUNTER_ID_OsTick,\r
"OsTick",\r
COUNTER_TYPE_HARD,\r
0xffff,\r
1,\r
0,\r
- 0),\r
+ 0,\r
+ APPLICATION_ID_OsApplication1, /* Application owner */\r
+ 0 /* Accessing application mask */\r
+ ),\r
};\r
\r
CounterType Os_Arc_OsTickCounter = COUNTER_ID_OsTick;\r
\r
// ################################## ALARMS ################################\r
GEN_ALARM_AUTOSTART(ALARM_ID_ComAlarm, ALARM_AUTOSTART_ABSOLUTE, 5, 20, OSDEFAULTAPPMODE );\r
- \r
-\r
-GEN_ALARM_HEAD {\r
+GEN_ALARM_HEAD = {\r
GEN_ALARM( ALARM_ID_ComAlarm,\r
"ComAlarm",\r
COUNTER_ID_OsTick,\r
GEN_ALARM_AUTOSTART_NAME(ALARM_ID_ComAlarm),\r
ALARM_ACTION_ACTIVATETASK,\r
TASK_ID_ComTask,\r
- NULL,\r
- NULL ),\r
+ 0,\r
+ 0,\r
+ APPLICATION_ID_OsApplication1, /* Application owner */\r
+ 0 /* Accessing application mask */\r
+ ),\r
};\r
\r
// ################################ RESOURCES ###############################\r
-GEN_RESOURCE_HEAD {\r
-};\r
\r
// ############################## STACKS (TASKS) ############################\r
DECLARE_STACK(OsIdle,OS_OSIDLE_STACK_SIZE);\r
DECLARE_STACK(StartupTask,2048);\r
\r
// ################################## TASKS #################################\r
-GEN_TASK_HEAD {\r
+GEN_TASK_HEAD = {\r
GEN_ETASK( OsIdle,\r
+ "OsIdle"\r
0,\r
FULL,\r
TRUE,\r
NULL,\r
+ RES_SCHEDULER,\r
+ 0,\r
0 \r
),\r
GEN_BTASK(\r
ComTask,\r
+ "ComTask",\r
1,\r
FULL,\r
FALSE,\r
NULL,\r
0,\r
- 1\r
+ 1,\r
+ APPLICATION_ID_OsApplication1,\r
+ 0\r
),\r
\r
GEN_BTASK(\r
StartupTask,\r
+ "StartupTask",\r
2,\r
FULL,\r
TRUE,\r
NULL,\r
0,\r
- 1\r
+ 1,\r
+ APPLICATION_ID_OsApplication1,\r
+ 0\r
),\r
\r
};\r
);\r
\r
// ################################## ISRS ##################################\r
-\r
-\r
-// ############################ SCHEDULE TABLES #############################\r
-\r
-// Table heads\r
-GEN_SCHTBL_HEAD {\r
+#if OS_ISR_CNT!=0\r
+GEN_ISR_HEAD = {\r
};\r
+#endif\r
\r
-GEN_PCB_LIST()\r
+GEN_ISR_MAP = { 0\r
+};\r
\r
-uint8_t os_interrupt_stack[OS_INTERRUPT_STACK_SIZE] __attribute__ ((aligned (0x10)));\r
+// ############################ SCHEDULE TABLES #############################\r
\r
-GEN_IRQ_VECTOR_TABLE_HEAD {};\r
-GEN_IRQ_ISR_TYPE_TABLE_HEAD {};\r
-GEN_IRQ_PRIORITY_TABLE_HEAD {};\r
\r
#include "os_config_funcs.h"\r
#endif
\r
+\r
#ifndef OS_CFG_H_\r
#define OS_CFG_H_\r
\r
+// Application Id's\r
+#define APPLICATION_ID_OsApplication1 0\r
\r
// Alarm Id's\r
#define ALARM_ID_ComAlarm 0\r
#define OS_ISRS_CNT 0\r
#define OS_RESOURCE_CNT 0\r
#define OS_LINKED_RESOURCE_CNT 0\r
-\r
+#define OS_APPLICATION_CNT 1\r
+#define OS_SERVICE_CNT 0 /* ARCTICSTUDIO_GENERATOR_TODO */\r
#define CFG_OS_DEBUG STD_OFF\r
\r
-#define OS_SC1 STD_ON \r
+#define OS_SC1 STD_ON /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_APPLICATIONS STD_ON\r
+#define OS_USE_MEMORY_PROT STD_OFF /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_TASK_TIMING_PROT STD_OFF /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_ISR_TIMING_PROT STD_OFF /* NOT CONFIGURABLE IN TOOLS */\r
+//#define OS_SC3 STD_ON /* NOT CONFIGURABLE IN TOOLS */ \r
#define OS_STACK_MONITORING STD_ON\r
#define OS_STATUS_EXTENDED STD_ON\r
#define OS_USE_GET_SERVICE_ID STD_ON\r
#define OS_USE_PARAMETER_ACCESS STD_ON\r
-#define OS_RES_SCHEDULER STD_ON\r
+#define OS_RES_SCHEDULER STD_ON /* NOT CONFIGURABLE IN TOOLS */\r
+\r
+#define OS_ISR_CNT 0\r
+#define OS_ISR2_CNT 0\r
+#define OS_ISR1_CNT 0\r
+\r
+/* New */\r
+#define OS_ISR_MAX_CNT 10 /* NOT CONFIGURABLE IN TOOLS */\r
+\r
\r
#endif /*OS_CFG_H_*/\r
projects / arc.git / commitdiff