Added script for converting dtbs to C const array. Bug fixes and updates

[keystone-rtos/rm-lld.git] / test / rm_test.c

diff --git a/test/rm_test.c b/test/rm_test.c
index 6ac8ce1fe8f970a1238689ca8f2d97cd38335179..bb7ec7d4561f88394600a180c61f30a4b509c88c 100644 (file)
--- a/test/rm_test.c
+++ b/test/rm_test.c
@@ -85,6 +85,12 @@ Char rmServerName[RM_NAME_MAX_CHARS] = "RM_Server";
 Char rmClientDelegateName[RM_NAME_MAX_CHARS] = "RM_Client_Delegate";
 Char rmClientName[RM_NAME_MAX_CHARS] = "RM_Client";
 
+/* ======== RM DTB Files ======== */
+extern const char rmGrl[];
+extern const char rmGlobalPolicy[];
+extern const char rmStaticPolicy[];
+extern const char rmLinuxDtb[];
+
 /* ======== RM IPC MessageQ Names ======== */
 Char serverFromCdQueueName[30] = "RM_Server_From_CD_Queue";
 Char cdFromServerQueueName[30] = "RM_CD_From_Server_Queue";
@@ -1404,21 +1410,8 @@ Void startupRmTsk(UArg arg0, UArg arg1)
 Int main(Int argc, Char* argv[])
 {
     Rm_InitCfg         rmInitCfg;
-    Task_Params        taskParams;
-    FILE              *globalResourceFp;
-    FILE              *linuxDtbFp;
-    FILE              *globalPolicyFp;
-    FILE              *staticPolicyFp;
-    Int                globalResourceFileSize;
-    Int                linuxDtbFileSize;
-    Int                globalPolicyFileSize;
-    Int                staticPolicyFileSize;
-    void              *globalResourceList = NULL;
-    void              *linuxDtb = NULL;
-    void              *globalPolicy = NULL;
-    void              *staticPolicy = NULL;
+    Task_Params        taskParams; 
     Int                status;
-    Int                readSize;
     Rm_ServiceReqInfo  requestInfo;    
     int32_t            result;
 
@@ -1435,66 +1428,30 @@ Int main(Int argc, Char* argv[])
      */
     if (MultiProc_self()== 0) {
         initSyncObj();
-        
-        globalResourceFp = fopen("C:\\ti\\pdk_tci6614_1_0_0_11\\packages\\ti\\drv\\rm\\test\\dts_files\\global-resources.dtb", "rb");
-        linuxDtbFp = fopen("C:\\ti\\pdk_tci6614_1_0_0_11\\packages\\ti\\drv\\rm\\test\\dts_files\\linux-evm.dtb", "rb");
-        globalPolicyFp = fopen("C:\\ti\\pdk_tci6614_1_0_0_11\\packages\\ti\\drv\\rm\\test\\dts_files\\server-policy.dtb", "rb");
-
-        fseek(globalResourceFp, 0, SEEK_END);
-        globalResourceFileSize = ftell(globalResourceFp);
-        rewind(globalResourceFp);
-
-        fseek(linuxDtbFp, 0, SEEK_END);
-        linuxDtbFileSize = ftell(linuxDtbFp);
-        rewind(linuxDtbFp);
-
-        fseek(globalPolicyFp, 0, SEEK_END);
-        globalPolicyFileSize = ftell(globalPolicyFp);
-        rewind(globalPolicyFp);      
-
-        globalResourceList = Osal_rmMalloc(globalResourceFileSize);
-        linuxDtb = Osal_rmMalloc(linuxDtbFileSize);
-        globalPolicy = Osal_rmMalloc(globalPolicyFileSize);
-
-        readSize = fread(globalResourceList, 1, globalResourceFileSize, globalResourceFp);
-        System_printf("Read Size compared to file size: %d : %d\n", readSize, globalResourceFileSize);
-        readSize = fread(linuxDtb, 1, linuxDtbFileSize, linuxDtbFp);
-        System_printf("Read Size compared to file size: %d : %d\n", readSize, linuxDtbFileSize);        
-        readSize = fread(globalPolicy, 1, globalPolicyFileSize, globalPolicyFp);
-        System_printf("Read Size compared to file size: %d : %d\n", readSize, globalPolicyFileSize);
 
         /* Create the Server instance */
         rmInitCfg.instName = &rmServerName[0];
         rmInitCfg.instType = Rm_instType_SERVER;
-        rmInitCfg.instCfg.serverCfg.globalResourceList = globalResourceList;
-        rmInitCfg.instCfg.serverCfg.linuxDtb = linuxDtb;
-        rmInitCfg.instCfg.serverCfg.globalPolicy = globalPolicy;
+        rmInitCfg.instCfg.serverCfg.globalResourceList = (void *)rmGrl;
+        rmInitCfg.instCfg.serverCfg.linuxDtb = (void *)rmLinuxDtb;
+        rmInitCfg.instCfg.serverCfg.globalPolicy = (void *)rmGlobalPolicy;
         rmServerHandle = Rm_init(&rmInitCfg, &result);
         System_printf("Core %d: RM Server instance created. Result = %d\n", MultiProc_self(), result);
 
         Rm_printResourceStatus(rmServerHandle);
     }
     else if (MultiProc_self()== 1) {
-        staticPolicyFp = fopen("C:\\ti\\pdk_tci6614_1_0_0_11\\packages\\ti\\drv\\rm\\test\\dts_files\\static-policy.dtb", "rb");
-
-        fseek(staticPolicyFp, 0, SEEK_END);
-        staticPolicyFileSize = ftell(staticPolicyFp);
-        rewind(staticPolicyFp); 
-        staticPolicy = Osal_rmMalloc(staticPolicyFileSize);  
-        readSize = fread(staticPolicy, 1, staticPolicyFileSize, staticPolicyFp);
-        System_printf("Read Size compared to file size: %d : %d\n", readSize, staticPolicyFileSize);
-
         /* Create the RM Client Delegate instance */
         rmInitCfg.instName = &rmClientDelegateName[0];
         rmInitCfg.instType = Rm_instType_CLIENT_DELEGATE;
-        rmInitCfg.instCfg.cdCfg.staticPolicy = staticPolicy;
+        rmInitCfg.instCfg.cdCfg.staticPolicy = (void *)rmStaticPolicy;
         rmClientDelegateHandle = Rm_init(&rmInitCfg, &result);
         System_printf("Core %d: RM Client Delegate instance created. Result = %d\n", MultiProc_self(), result);
 
         /* Create the RM Client instance */
         rmInitCfg.instName = &rmClientName[0];
         rmInitCfg.instType = Rm_instType_CLIENT;      
-        rmInitCfg.instCfg.clientCfg.staticPolicy = staticPolicy;
+        rmInitCfg.instCfg.clientCfg.staticPolicy = (void *)rmStaticPolicy;
         rmClientHandle = Rm_init(&rmInitCfg, &result);
         System_printf("Core %d: RM Client instance created. Result = %d\n", MultiProc_self(), result);