1. Makefile fix to recompile library on any source change
authorJustin Sobota <jsobota@ti.com>
Fri, 10 May 2013 21:55:28 +0000 (17:55 -0400)
committerJustin Sobota <jsobota@ti.com>
Fri, 10 May 2013 21:55:28 +0000 (17:55 -0400)
2. Fixed bug in policy code which could result in strncmp of a invalid
pointer
3. Minor bug fix in Linux client test
4. updated setupenv batch file

makefile_armv7
setupenv.bat
src/rm_policy.c
test/k2h/armv7/linux/rm_client_test.c

index 1f48aaf4ca19978a2d3c3f351e8b3ae0ef1eda9f..50594d85c42c2be89c8976e23f381b0d977c2bde 100644 (file)
@@ -68,7 +68,7 @@ tests:
 # Make rule to create $(ARMV7LIBDIR)/librm.a library
 .libraries: $(ARMV7LIBDIR)/librm.a
 
-$(ARMV7LIBDIR)/librm.a:
+$(ARMV7LIBDIR)/librm.a::
        @$(MAKE) -f ./build/armv7/librm_aearmv7.mk $@
 
 # Rule to clean $(ARMV7LIBDIR)/librm.a library
index 267431b369f6aaa22ba920be1cddab3083370090..0d8c2d97b53cbcd78f089747612c1edbecacb43c 100644 (file)
@@ -19,7 +19,7 @@ set PARTNO=keystone2
 :partno_Defined\r
 \r
 IF DEFINED PDK_INSTALL_PATH GOTO pdk_defined\r
-set PDK_INSTALL_PATH=C:\ti\pdk_keystone2_1_00_00_09\packages\r
+set PDK_INSTALL_PATH=C:\ti\pdk_keystone2_1_00_00_10\packages\r
 :pdk_defined\r
 \r
 @REM ---------------------------------\r
@@ -39,7 +39,7 @@ REM RM LLD depends upon the following packages:-
 REM     - None\r
 \r
 @REM Specify the XDC Tool Path\r
-set XDC_INSTALL_PATH=C:/ti/xdctools_3_24_05_48\r
+set XDC_INSTALL_PATH=C:/ti/xdctools_3_25_00_48\r
 set XDCPATH=../../..;%XDC_INSTALL_PATH%/packages\r
 \r
 @REM Configure the XDCPATH\r
index cebbaca7348040aedfb5b92572f7c15d428e633b..0a6a71145de45eb50a35c1c6e88a4dfe88081439 100644 (file)
@@ -809,18 +809,17 @@ int32_t rmPolicyGetResourceOffset(void *policyDtb, char *resourceName)
         while ((nodeOffset >= RM_DTB_UTIL_STARTING_NODE_OFFSET) && 
                (depth >= RM_DTB_UTIL_STARTING_DEPTH)) {
             nodeOffset = fdt_next_node(policyDtb, nodeOffset, &depth);
-            nodeName = fdt_get_name(policyDtb, nodeOffset, NULL);
-
-            if (strncmp(nodeName, resourceName, RM_NAME_MAX_CHARS) == 0)
-            {
-                break;
+            if (depth < RM_DTB_UTIL_STARTING_DEPTH) {
+                /* Resource name not found */
+                nodeOffset = RM_SERVICE_DENIED_RES_DOES_NOT_EXIST;
+            } 
+            else {
+                nodeName = fdt_get_name(policyDtb, nodeOffset, NULL);
+                if (strncmp(nodeName, resourceName, RM_NAME_MAX_CHARS) == 0) {
+                    break;
+                }
             }
         }
-
-        if (depth < RM_DTB_UTIL_STARTING_DEPTH) {
-            /* Resource name not found */
-            nodeOffset = RM_SERVICE_DENIED_RES_DOES_NOT_EXIST;
-        }
     }
     else {
         nodeOffset = RM_ERROR_INSTANCE_HAS_NO_POLICY;
index 3df10de22719799ff17a5cd7b2304732552af8d1..2a92134614e9ec8aa708b107fe84a7e63d867cf4 100644 (file)
@@ -352,7 +352,7 @@ void transportReceive (void)
         return;
     }
     
-    if (length < sizeof(rm_pkt)) {
+    if (length < sizeof(*rm_pkt)) {
         error_msg("invalid RM message length %d\n", length);
         return;
     }