Fixed issue with running and gracefully terminating net_test_router application.
[keystone-rtos/netapi.git] / ti / runtime / netapi / src / netapi_init.c
index ee8462643706f05a9594d1732b747d65d58d07c7..ab77fcc0596aa6789d4f704d806ad615b941473d 100755 (executable)
@@ -607,11 +607,9 @@ int netapip_systemInit(NETAPI_HANDLE_T * handle)
        - memory mapped peripherals we use, such as QMSS, PA, etc */
     result = hplib_vmInit(&netapi_VM_VirtAddr[0], 2, &netapi_VM_MempoolAttr[0]);
 
-    /* TODO: at this point, we need to create the QM regions which need to moved out of the above 
-    netapi_VM_memory_setup() call, also need to move out the SA context stuff */
 
-    if (result == hplib_OK) netapi_Log("netapi: system init - memory set  up OK\n");
-    else {netapi_Log(">netap: system init - memory set up failed\n"); return -1;}
+    if (result == hplib_OK) netapi_Log("netapip_systemInit: - memory set  up OK\n");
+    else {netapi_Log("netapip_systemInit: - memory set up failed\n"); return -1;}
 
 
 #ifdef NETAPI_ENABLE_SECURITY
@@ -621,10 +619,10 @@ int netapip_systemInit(NETAPI_HANDLE_T * handle)
                                         SEC_CONTEXT_SZ), 128, 0);
     if (!netapi_VM_SaContextVaddr)
     {
-        netapi_Log("netapi ERROR: Failed to map SA context memory region\n");
+        netapi_Log("netapip_systemInit: Failed to map SA context memory region\n");
         return (-1);
     }
-    netapi_Log(">hplib VM_SaContext: Memory mapped/allocated at address %p.\n", netapi_VM_SaContextVaddr);
+    netapi_Log("netapip_systemInit: SA Memory mapped/allocated at address %p.\n", netapi_VM_SaContextVaddr);
 
 #else
    netapi_VM_SaContextVaddr= (char *) NULL;
@@ -642,7 +640,7 @@ int netapip_systemInit(NETAPI_HANDLE_T * handle)
                                   (void *)hplib_vmMemAlloc((TUNE_NETAPI_NUM_LOCAL_DESC *
                                                             TUNE_NETAPI_DESC_SIZE),
                                                             128, 0);
-    netapi_Log("netapi local desc region=%x global desc region=%x\n", netapi_VM_QMemLocalDescRam, netapi_VM_QMemGlobalDescRam);
+    netapi_Log("netapip_systemInit: desc region=%x global desc region=%x\n", netapi_VM_QMemLocalDescRam, netapi_VM_QMemGlobalDescRam);
 
     //get timer running
 #ifdef CORTEX_A8
@@ -676,7 +674,7 @@ int netapip_systemInit(NETAPI_HANDLE_T * handle)
                       TUNE_NETAPI_DESC_SIZE,
                       (unsigned int *) netapi_VM_QMemGlobalDescRam,
                       TUNE_NETAPI_QM_GLOBAL_REGION);
-    if(result <0) {netapi_Log("netapi; can't setup QM shared region\n"); return -1;}
+    if(result <0) {netapi_Log("netapip_systemInit: can't setup QM shared region\n"); return -1;}
 
 netapi_Log("netapip_systemInit: returned from netapip_qmSetupMemRegion\n");
 #if 0 //todo setup 2nd region