Added proper check for Os_GetIsr (Ticket2246)

diff --git a/include/isr.h b/include/isr.h
index c030c49b1b5ae7720186f03e398e6058646b89b2..c2b8ddca2d9464debc13130b66f9d612def1d3bb 100644 (file)
--- a/include/isr.h
+++ b/include/isr.h
@@ -225,27 +225,9 @@ void Os_Isr_cm3( int16_t vector );
 void TailChaining(void *stack);\r
 #endif\r
 \r
-static inline const OsIsrVarType *Os_IsrGet( ISRType id ) {\r
-#if OS_ISR_CNT != 0\r
-       return &Os_IsrVarList[id];\r
-#else\r
-       (void)id;\r
-       return NULL;\r
-#endif\r
-}\r
-\r
-static inline ApplicationType Os_IsrGetApplicationOwner( ISRType id ) {\r
-       ApplicationType rv = INVALID_OSAPPLICATION;\r
+const OsIsrVarType *Os_IsrGet( ISRType id );\r
+ApplicationType Os_IsrGetApplicationOwner( ISRType id );\r
 \r
-#if (OS_ISR_CNT!=0)\r
-       if( id < OS_ISR_CNT ) {\r
-               rv = Os_IsrGet(id)->constPtr->appOwner;\r
-       }\r
-#else\r
-       (void)id;\r
-#endif\r
-       return rv;\r
-}\r
 \r
 static inline void Os_IsrResourceAdd( OsResourceType *rPtr, OsIsrVarType *isrPtr) {\r
        /* Save old task prio in resource and set new task prio */\r

diff --git a/system/kernel/isr.c b/system/kernel/isr.c
index 0aae94c49a0405ace4ce39f089cc19c44e80a6f9..57d30d7190f83ebceed73095ffde7676beb939cd 100644 (file)
--- a/system/kernel/isr.c
+++ b/system/kernel/isr.c
@@ -281,6 +281,32 @@ void Os_IsrGetStackInfo( OsIsrStackType *stack ) {
        stack->size = sizeof(Os_IsrStack);\r
 }\r
 \r
+const OsIsrVarType *Os_IsrGet( ISRType id ) {\r
+#if OS_ISR_MAX_CNT != 0\r
+       if( id < Os_Sys.isrCnt ) {\r
+               return &Os_IsrVarList[id];\r
+       } else  {\r
+               return NULL;\r
+       }\r
+#else\r
+       (void)id;\r
+       return NULL;\r
+#endif\r
+}\r
+\r
+ApplicationType Os_IsrGetApplicationOwner( ISRType id ) {\r
+       ApplicationType rv = INVALID_OSAPPLICATION;\r
+\r
+#if (OS_ISR_MAX_CNT!=0)\r
+       if( id < Os_Sys.isrCnt ) {\r
+               rv = Os_IsrGet(id)->constPtr->appOwner;\r
+       }\r
+#else\r
+       (void)id;\r
+#endif\r
+       return rv;\r
+}\r
+\r
 \r
 #if defined(CFG_ARM_CR4)\r
 void *Os_Isr_cr4( void *stack, int16_t virtualVector, int16_t vector ) {\r