User Mode application clean up for cpsw

4 files changed, 23 insertions, 1 deletions

diff --git a/example/emacExample/src/cpsw_singlecore.c b/example/emacExample/src/cpsw_singlecore.c
index f53c9e7..47cb4aa 100644
--- a/example/emacExample/src/cpsw_singlecore.c
+++ b/example/emacExample/src/cpsw_singlecore.c
@@ -112,8 +112,10 @@ int cpswSimTest = 1;
 int cpswLpbkMode = CPSW_LOOPBACK_INTERNAL;
 #else
 int cpswSimTest = 0;
+#ifndef __LINUX_USER_SPACE
 int cpswLpbkMode = CPSW_LOOPBACK_INTERNAL;
 #endif
+#endif
 
 void mdebugHaltPdsp (int pdspNum);
 volatile int mdebugWait = 1;
diff --git a/example/emacExample/src/pa_mgmt.c b/example/emacExample/src/pa_mgmt.c
index aa119e5..9622855 100644
--- a/example/emacExample/src/pa_mgmt.c
+++ b/example/emacExample/src/pa_mgmt.c
@@ -204,9 +204,11 @@ int32_t Add_MACAddress (void)
     cmdReplyInfo.queue      =   Qmss_getQIDFromHandle(gPaCfgCmdRespQHnd);
     cmdReplyInfo.flowId     =   (uint8_t)Cppi_getFlowId(gRxFlowHnd);
     
+#ifndef __LINUX_USER_SPACE      
     /* Use Source MAC as destination MAC if non-loopback */
     if(cpswLpbkMode == CPSW_LOOPBACK_NONE)
         memcpy(ethInfo.dst, srcMac, sizeof(srcMac));
+#endif
         
     ethInfo.inport  =  pa_EMAC_PORT_NOT_SPECIFIED;                  /* Input EMAC port */
     retVal  =   Pa_addMac  (gPAInstHnd,
diff --git a/example/multicoreExample/src/cppi_qmss_mgmt.c b/example/multicoreExample/src/cppi_qmss_mgmt.c
index 7d6c1a3..cd79eae 100644
--- a/example/multicoreExample/src/cppi_qmss_mgmt.c
+++ b/example/multicoreExample/src/cppi_qmss_mgmt.c
@@ -1036,7 +1036,8 @@ int32_t SendPacket (void)
                     dataBufferSize

                  );

     Cppi_setPacketLen (Cppi_DescType_HOST, (Cppi_Desc *)pCppiDesc, dataBufferSize);

-    

+

+#ifndef __LINUX_USER_SPACE    

     if (cpswLpbkMode != CPSW_LOOPBACK_NONE)

     {

         /* Force the packet to specific EMAC port if loopback is enabled */

@@ -1055,6 +1056,21 @@ int32_t SendPacket (void)
     {

         Cppi_setPSFlags(Cppi_DescType_HOST, (Cppi_Desc *)pCppiDesc, 0);

     }

+#else

+    {

+        /* Force the packet to specific EMAC port if loopback is enabled */

+  #ifndef NSS_GEN2

+        Cppi_setPSFlags(Cppi_DescType_HOST, (Cppi_Desc *)pCppiDesc, psFlags);

+  #else

+        tag.srcTagHi  = 0;

+        tag.srcTagLo  = 0;

+        tag.destTagHi = 0;

+        tag.destTagLo = psFlags;

+        Cppi_setTag(Cppi_DescType_HOST, (Cppi_Desc *)pCppiDesc, (Cppi_DescTag *)&tag); 

+  #endif

+

+    }

+#endif

     

     /* Clear PS Data */

     Cppi_setPSLen (Cppi_DescType_HOST, (Cppi_Desc *)pCppiDesc, 0);

diff --git a/example/multicoreExample/src/local_variables.c b/example/multicoreExample/src/local_variables.c
index 0759f50..9ccfc58 100755..100644
--- a/example/multicoreExample/src/local_variables.c
+++ b/example/multicoreExample/src/local_variables.c
@@ -138,8 +138,10 @@ Int cpswSimTest = 1;
 Int cpswLpbkMode = CPSW_LOOPBACK_INTERNAL;

 #else

 Int cpswSimTest = 0;

+#ifndef __LINUX_USER_SPACE

 Int cpswLpbkMode = CPSW_LOOPBACK_INTERNAL;

 #endif

+#endif

 

 /* Default test configuration for the silicon

  *