Merged in from default

[arc.git] / system / kernel / resource.c

diff --git a/system/kernel/resource.c b/system/kernel/resource.c
index 7e109db38b573dc1786dc095a29ba72c6aa0fc2d..4785edcdf9f65d883a687a1ccbde3779abfee0bc 100644 (file)
--- a/system/kernel/resource.c
+++ b/system/kernel/resource.c
@@ -102,8 +102,8 @@ TODO:
  *\r
  */\r
 \r
-#define valid_standard_id() (rPtr->nr < Os_CfgGetResourceCnt()) //&& !(rPtr->type == RESOURCE_TYPE_INTERNAL) )\r
-#define valid_internal_id() (rPtr->nr < Os_CfgGetResourceCnt()) //&& (rPtr->type == RESOURCE_TYPE_INTERNAL) )\r
+#define valid_standard_id() (rPtr->nr < OS_RESOURCE_CNT) //&& !(rPtr->type == RESOURCE_TYPE_INTERNAL) )\r
+#define valid_internal_id() (rPtr->nr < OS_RESOURCE_CNT) //&& (rPtr->type == RESOURCE_TYPE_INTERNAL) )\r
 \r
 \r
 void Os_ResourceAlloc( OsResourceType *rPtr, OsPcbType *pcbPtr) {\r
@@ -318,11 +318,11 @@ void Os_ResourceInit( void ) {
         *\r
         * Note that this applies both internal and standard resources.\r
         * */\r
-       for( int i=0; i < Os_CfgGetResourceCnt(); i++) {\r
+       for( int i=0; i < OS_RESOURCE_CNT; i++) {\r
                rsrc_p = Os_CfgGetResource(i);\r
                topPrio = 0;\r
 \r
-               for( int pi = 0; pi < Os_CfgGetTaskCnt(); pi++) {\r
+               for( int pi = 0; pi < OS_TASK_CNT; pi++) {\r
 \r
                        pcb_p = os_get_pcb(pi);\r
 \r