Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka

[arc.git] / include / os_config_funcs.h

diff --git a/include/os_config_funcs.h b/include/os_config_funcs.h
index 10680126946d268b92a5c288247974fe03754286..516d1f40cdea1f578d359dd1a0b2819328b32756 100644 (file)
--- a/include/os_config_funcs.h
+++ b/include/os_config_funcs.h
@@ -15,9 +15,12 @@
 /*\r
  * This file only be use with the Os_Cfg.c file and os_config_macros.h\r
  */\r
-#include "kernel.h"\r
+#include "internal.h"\r
 #include "Os_Cfg.h"\r
 \r
+#error os_config_funcs.h is deprecated\r
+\r
+#if 0\r
 /** @req OS327 */\r
 #if (OS_SC3 == STD_ON) || (OS_SC4 == STD_ON)\r
 #if (OS_STATUS_STANDARD == STD_ON )\r
@@ -28,111 +31,24 @@
 \r
 // COUNTER, RESOURCE, TSAK, must be at least 1\r
 \r
-#define OS_VALIDATE(_a,_b)   if((_a)!=(_b) ) { \\r
-                                                               assert(#_a  #_b); \\r
-                                                         }\r
-\r
-\r
-\r
-\r
-void Os_CfgValidate(void ) {\r
-       OS_VALIDATE(OS_COUNTER_CNT,ARRAY_SIZE(counter_list));\r
-#if (RESOURCE_CNT!=0)\r
-       OS_VALIDATE(OS_RESOURCE_CNT,ARRAY_SIZE(resource_list));\r
-#endif\r
-       OS_VALIDATE(OS_TASK_CNT ,ARRAY_SIZE(rom_pcb_list));\r
-#if (RESOURCE_CNT!=0)\r
-       OS_VALIDATE(OS_ALARM_CNT,ARRAY_SIZE(alarm_list));\r
-#endif\r
-#if (OS_SCHTBL_CNT!=0)\r
-       OS_VALIDATE(OS_SCHTBL_CNT, ARRAY_SIZE(sched_list));\r
+#if (OS_ALARM_CNT!=0)\r
 #endif\r
-}\r
 \r
 OsErrorType os_error;\r
 \r
 //-------------------------------------------------------------------\r
 \r
-\r
-/*\r
- * Accessor functions for os_config.c\r
- */\r
-\r
-#if 0\r
-#if SERVICE_CNT!=0\r
-trusted_func_t oil_trusted_func_list[SERVICE_CNT];\r
-#endif\r
-#endif\r
-\r
 /*-----------------------------------------------------------------*/\r
-#if (  OS_SC3 == STD_ON) || (  OS_SC4==STD_ON)\r
-int Os_CfgGetApplCnt(void) {\r
-       return APPLICATION_CNT;\r
-}\r
-\r
-OsRomApplicationType *Os_CfgGetApplObj( ApplicationType application_id ) {\r
-       return &rom_app_list[application_id];\r
-}\r
-#endif\r
-\r
-/*-----------------------------------------------------------------*/\r
-\r
-OsResourceType *Os_CfgGetResource( ResourceType resource ) {\r
-#if OS_RESOURCE_CNT!=0\r
-       return &resource_list[resource];\r
-#else\r
-       return NULL;\r
-#endif\r
-}\r
+       (void)resource;\r
 \r
 /*-----------------------------------------------------------------*/\r
 \r
-OsCounterType *Os_CfgGetCounter(CounterType count_id) {\r
-       return &counter_list[count_id];\r
-}\r
-\r
 /*-----------------------------------------------------------------*/\r
 \r
-OsSchTblType *Os_CfgGetSched( ScheduleTableType sched_id ) {\r
-#if (OS_SCHTBL_CNT!=0)\r
-       if(sched_id < OS_SCHTBL_CNT) {\r
-               return &sched_list[sched_id];\r
-       } else {\r
-               return NULL;\r
-       }\r
-#else\r
-       return NULL;\r
-#endif\r
-}\r
+       (void)sched_id;\r
 \r
 /*-----------------------------------------------------------------*/\r
 \r
-OsAlarmType *Os_CfgGetAlarmObj( AlarmType alarm_id ) {\r
-#if (OS_ALARM_CNT!=0)\r
-       if( alarm_id < OS_ALARM_CNT) {\r
-         return &alarm_list[alarm_id];\r
-       } else {\r
-               return NULL;\r
-       }\r
-#else\r
-       return NULL;\r
-#endif\r
-}\r
-\r
-StatusType Os_CfgGetAlarmBase(AlarmType alarm_id, AlarmBaseRefType info) {\r
-\r
-       StatusType rv = E_OK;\r
-\r
-       if( alarm_id >= OS_ALARM_CNT ) {\r
-               rv = E_OS_ID;\r
-       } else {\r
-#if (OS_ALARM_CNT!=0)\r
-               *info = alarm_list[alarm_id].counter->alarm_base;\r
-#endif\r
-       }\r
-       return rv;\r
-}\r
-\r
 \r
 /*-----------------------------------------------------------------*/\r
 \r
@@ -152,20 +68,12 @@ uint32 Os_CfgGetMessageCnt(void ) {
 \r
 /*-----------------------------------------------------------------*/\r
 \r
-#if (  OS_SC3 == STD_ON) || (  OS_SC4 == STD_ON)\r
+#if (OS_USE_APPLICATIONS == STD_ON)\r
 uint32 Os_CfgGetServiceCnt( void ) {\r
-       return SERVICE_CNT;\r
+       return OS_SERVICE_CNT;\r
 }\r
 #endif\r
-\r
-\r
-/*-----------------------------------------------------------------*/\r
-\r
-void Os_CfgGetInterruptStackInfo( OsStackType *stack ) {\r
-       stack->top = os_interrupt_stack;\r
-       stack->size = sizeof(os_interrupt_stack);\r
-}\r
-\r
+#endif\r
 \r
 \r
 \r