summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongmei Gou2016-03-23 12:12:35 -0500
committerTinku Mannan2016-03-23 12:49:01 -0500
commite7ed8c5abc4b93b99a5f45699eef8f3b8ca51d1e (patch)
tree0a5cec96d579004e4af1405efb5f7dfe95789602
parentfc14159765777305a234e732b6170d025394250a (diff)
downloadnwal-lld-e7ed8c5abc4b93b99a5f45699eef8f3b8ca51d1e.tar.gz
nwal-lld-e7ed8c5abc4b93b99a5f45699eef8f3b8ca51d1e.tar.xz
nwal-lld-e7ed8c5abc4b93b99a5f45699eef8f3b8ca51d1e.zip
Update Osal_cache_op_measure to take pointer to a double longDEV.NWAL.02.01.00.10A
* This update is to match with the hplib Signed-off-by: Hongmei Gou <h-gou@ti.com>
-rwxr-xr-xti/drv/nwal/src/nwal_sec.c4
-rw-r--r--ti/drv/nwal/test/common/c66/bios/fw_osal.c2
-rwxr-xr-xti/drv/nwal/test/unitTest/armv7/linux/fw_test.h2
-rwxr-xr-xti/drv/nwal/test/unitTest/c66/bios/fw_test.h2
-rwxr-xr-xti/drv/nwal/test/unitTest/fw_test.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/ti/drv/nwal/src/nwal_sec.c b/ti/drv/nwal/src/nwal_sec.c
index ce33443..14f0e51 100755
--- a/ti/drv/nwal/src/nwal_sec.c
+++ b/ti/drv/nwal/src/nwal_sec.c
@@ -2331,7 +2331,7 @@ unsigned int nwal_sendDM_prof4_sum = 0;
2331unsigned int nwal_sendDM_prof5_sum = 0; 2331unsigned int nwal_sendDM_prof5_sum = 0;
2332unsigned int nwal_sendDM_sum = 0; 2332unsigned int nwal_sendDM_sum = 0;
2333unsigned int nwal_sendDM_count_sum =0; 2333unsigned int nwal_sendDM_count_sum =0;
2334extern unsigned int Osal_cache_op_measure(unsigned int * p_n); 2334extern unsigned int Osal_cache_op_measure(unsigned long long * p_n);
2335#endif 2335#endif
2336 2336
2337/******************************************************************** 2337/********************************************************************
@@ -2348,7 +2348,7 @@ nwal_RetValue nwal_sendDM(nwal_Inst nwalInst,
2348 nwalTxDmPSCmdInfo_t txDmPSCmdInfo; 2348 nwalTxDmPSCmdInfo_t txDmPSCmdInfo;
2349#ifdef NWAL_LIB_ENABLE_PROFILE 2349#ifdef NWAL_LIB_ENABLE_PROFILE
2350 unsigned int countBegin,countStart,countEnd,cacheBegin,cacheEnd; 2350 unsigned int countBegin,countStart,countEnd,cacheBegin,cacheEnd;
2351 unsigned int numCacheOps=0; 2351 unsigned long long numCacheOps=0;
2352#endif 2352#endif
2353 2353
2354#ifdef NWAL_LIB_ENABLE_PROFILE 2354#ifdef NWAL_LIB_ENABLE_PROFILE
diff --git a/ti/drv/nwal/test/common/c66/bios/fw_osal.c b/ti/drv/nwal/test/common/c66/bios/fw_osal.c
index 3a1a5a7..5961287 100644
--- a/ti/drv/nwal/test/common/c66/bios/fw_osal.c
+++ b/ti/drv/nwal/test/common/c66/bios/fw_osal.c
@@ -98,7 +98,7 @@ uint32_t globalCritkey;
98unsigned int sumCacheCycles=0; 98unsigned int sumCacheCycles=0;
99unsigned int numCacheOps=0; 99unsigned int numCacheOps=0;
100void Osal_cache_op_measure_reset(void) { sumCacheCycles=0; numCacheOps=0;} 100void Osal_cache_op_measure_reset(void) { sumCacheCycles=0; numCacheOps=0;}
101unsigned int Osal_cache_op_measure(unsigned int * p_n) { *p_n = numCacheOps; return sumCacheCycles;} 101unsigned int Osal_cache_op_measure(unsigned long long * p_n) { *p_n = numCacheOps; return sumCacheCycles;}
102 102
103/***************************************************************************** 103/*****************************************************************************
104 * FUNCTION PURPOSE: Cache Invalidation Routine 104 * FUNCTION PURPOSE: Cache Invalidation Routine
diff --git a/ti/drv/nwal/test/unitTest/armv7/linux/fw_test.h b/ti/drv/nwal/test/unitTest/armv7/linux/fw_test.h
index 5612ba6..63beeaf 100755
--- a/ti/drv/nwal/test/unitTest/armv7/linux/fw_test.h
+++ b/ti/drv/nwal/test/unitTest/armv7/linux/fw_test.h
@@ -336,7 +336,7 @@ nwal_Bool_t testNwSwUpdateMacAddr(uint8_t macAddress[6]);
336 336
337void Osal_invalidateCache (void *blockPtr, uint32_t size); 337void Osal_invalidateCache (void *blockPtr, uint32_t size);
338void Osal_writeBackCache (void *blockPtr, uint32_t size); 338void Osal_writeBackCache (void *blockPtr, uint32_t size);
339unsigned int Osal_cache_op_measure(unsigned int * p_n); 339unsigned int Osal_cache_op_measure(unsigned long long * p_n);
340void Osal_cache_op_measure_reset(void); 340void Osal_cache_op_measure_reset(void);
341extern void Osal_nwalCsEnter (uint32_t *key); 341extern void Osal_nwalCsEnter (uint32_t *key);
342extern void Osal_nwalCsExit (uint32_t key); 342extern void Osal_nwalCsExit (uint32_t key);
diff --git a/ti/drv/nwal/test/unitTest/c66/bios/fw_test.h b/ti/drv/nwal/test/unitTest/c66/bios/fw_test.h
index 0187403..d460cd3 100755
--- a/ti/drv/nwal/test/unitTest/c66/bios/fw_test.h
+++ b/ti/drv/nwal/test/unitTest/c66/bios/fw_test.h
@@ -292,7 +292,7 @@ nwal_Bool_t testNwSwUpdateMacAddr(uint8_t macAddress[6]);
292 292
293void Osal_invalidateCache (void *blockPtr, uint32_t size); 293void Osal_invalidateCache (void *blockPtr, uint32_t size);
294void Osal_writeBackCache (void *blockPtr, uint32_t size); 294void Osal_writeBackCache (void *blockPtr, uint32_t size);
295unsigned int Osal_cache_op_measure(unsigned int * p_n); 295unsigned int Osal_cache_op_measure(unsigned long long * p_n);
296void Osal_cache_op_measure_reset(void); 296void Osal_cache_op_measure_reset(void);
297extern void Osal_nwalCsEnter (uint32_t *key); 297extern void Osal_nwalCsEnter (uint32_t *key);
298extern void Osal_nwalCsExit (uint32_t key); 298extern void Osal_nwalCsExit (uint32_t key);
diff --git a/ti/drv/nwal/test/unitTest/fw_test.c b/ti/drv/nwal/test/unitTest/fw_test.c
index 1013037..9ae4831 100755
--- a/ti/drv/nwal/test/unitTest/fw_test.c
+++ b/ti/drv/nwal/test/unitTest/fw_test.c
@@ -996,7 +996,7 @@ void testNwalDispCacheCycles (unsigned int numPkts)
996{ 996{
997#ifdef NWAL_ENABLE_PROFILE 997#ifdef NWAL_ENABLE_PROFILE
998 unsigned int sumCacheCycles=0; 998 unsigned int sumCacheCycles=0;
999 unsigned int numCacheOps=0; 999 unsigned long long numCacheOps=0;
1000 sumCacheCycles =Osal_cache_op_measure(&numCacheOps); 1000 sumCacheCycles =Osal_cache_op_measure(&numCacheOps);
1001 1001
1002 if(numCacheOps && numPkts) 1002 if(numCacheOps && numPkts)
@@ -1013,7 +1013,7 @@ void testNwalDispPollProfile ()
1013{ 1013{
1014#ifdef NWAL_ENABLE_PROFILE 1014#ifdef NWAL_ENABLE_PROFILE
1015 unsigned int sumCacheCycles=0; 1015 unsigned int sumCacheCycles=0;
1016 unsigned int numCacheOps=0; 1016 unsigned long long numCacheOps=0;
1017 unsigned int pollCyclesWoCache; 1017 unsigned int pollCyclesWoCache;
1018 sumCacheCycles =Osal_cache_op_measure(&numCacheOps); 1018 sumCacheCycles =Osal_cache_op_measure(&numCacheOps);
1019 pollCyclesWoCache = ((fw_nwal_pollPkt_sum-fw_nwal_PollPktCB_sum) - sumCacheCycles); 1019 pollCyclesWoCache = ((fw_nwal_pollPkt_sum-fw_nwal_PollPktCB_sum) - sumCacheCycles);