Browse Source

qcacld-3.0: Remove obsolete utils_api items

utils_api.h exports the following macros, variables, and functions
which are no longer used, so remove them:
- LOG_FIRST_MODULE_ID
- LOG_INDEX_FOR_MODULE
- GET_MIN_VALUE
- gPktAllocCnt
- gPktFreeCnt
- get_vos_debug_level
- sirParseNextIE
- hal_round_s32
- convertto_big_endian
- create_scan_cts_frame
- create_scan_data_null_frame
- create_init_scan_raw_frame
- create_finish_scan_raw_frame

Change-Id: If68849746e1f2507fce8f0cf1d85c6f752fde536
CRs-Fixed: 2266339
Jeff Johnson 6 years ago
parent
commit
acccf296e4
2 changed files with 0 additions and 243 deletions
  1. 0 60
      core/mac/src/include/utils_api.h
  2. 0 183
      core/mac/src/sys/legacy/src/utils/src/utils_parser.c

+ 0 - 60
core/mac/src/include/utils_api.h

@@ -37,14 +37,6 @@ typedef enum eBssSystemRole {
 	eSYSTEM_MULTI_BSS_ROLE = eSYSTEM_LAST_ROLE
 } tBssSystemRole;
 
-#define LOG_FIRST_MODULE_ID    SIR_FIRST_MODULE_ID
-#define LOG_INDEX_FOR_MODULE(modId) ((modId) - LOG_FIRST_MODULE_ID)
-#define GET_MIN_VALUE(__val1, __val2) ((__val1 < __val2) ? __val1 : __val2)
-
-extern uint32_t gPktAllocCnt, gPktFreeCnt;
-
-extern QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel);
-
 extern tSirRetStatus cfg_init(tpAniSirGlobal);
 extern void cfg_de_init(tpAniSirGlobal);
 
@@ -574,47 +566,6 @@ static inline uint8_t convert_cw(uint16_t cw)
 
 /* ------------------------------------------------------------------- */
 
-/* / Parse the next IE in a message */
-extern tSirRetStatus sirParseNextIE(tpAniSirGlobal, uint8_t *pPayload,
-				    uint16_t payloadLength, int16_t lastType,
-				    uint8_t *pType, uint8_t *pLength);
-
-/* / Check if the given channel is 11b channel */
-#define SIR_IS_CHANNEL_11B(chId)  (chId <= 14)
-
-/**
- * hal_round_s32
- *
- * FUNCTION:
- * Performs integer rounding like returns 12346 for 123456 or -12346 for -123456
- * Note that a decimal place is lost.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- * None.
- *
- * NOTE:
- *
- * @param  int32_t input
- * @return rounded number
- */
-static inline int32_t hal_round_s32(int32_t p)
-{
-	int32_t k, i, j;
-
-	i = p / 10;
-	j = p % 10;
-	if (p > 0)
-		k = i + (j > 4 ? 1 : 0);
-	else if (p < 0)
-		k = i + (j < -5 ? -1 : 0);
-	else
-		k = p;
-
-	return k;
-}
-
 /* New functions for endianness conversion */
 #ifdef ANI_LITTLE_BYTE_ENDIAN
 #define ani_cpu_to_be16(x) sir_swap_u16((x))
@@ -633,15 +584,4 @@ static inline int32_t hal_round_s32(int32_t p)
 #define ani_be16_to_cpu(x)  ani_cpu_to_be16(x)
 #define ani_be32_to_cpu(x)  ani_cpu_to_be32(x)
 
-void convertto_big_endian(void *ptr, uint16_t size);
-void create_scan_cts_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
-			   tSirMacAddr selfMac);
-void create_scan_data_null_frame(tpAniSirGlobal pMac,
-		tSirMacMgmtHdr *macMgmtHdr, uint8_t pwrMgmt, tSirMacAddr bssid,
-		tSirMacAddr selfMacAddr);
-void create_init_scan_raw_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
-				tBssSystemRole role);
-void create_finish_scan_raw_frame(tpAniSirGlobal pMac,
-		 tSirMacMgmtHdr *macMgmtHdr, tBssSystemRole role);
-
 #endif /* __UTILSAPI_H */

+ 0 - 183
core/mac/src/sys/legacy/src/utils/src/utils_parser.c

@@ -650,87 +650,6 @@ void convert_wmm_schedule(tpAniSirGlobal pMac,
 	pOld->specInterval = pNew->spec_interval;
 }
 
-/**
-    @brief   :    This functions converts the given buffer till given size to
-    Big endian format assuming the bus is 32 bit. The size should
-    be four byte aligned.
-    @param :    ptr to be converted, size
-    @return  :    void
- */
-
-void convertto_big_endian(void *ptr, uint16_t size)
-{
-	uint8_t *temp_ptr;
-	uint32_t *dest_ptr;
-
-	dest_ptr = (uint32_t *) ptr;
-	while (size) {
-		temp_ptr = (uint8_t *) dest_ptr;
-		*dest_ptr =
-			(temp_ptr[0] << 24) | (temp_ptr[1] << 16) | (temp_ptr[2] <<
-								     8) |
-			temp_ptr[3];
-		dest_ptr++;
-		size -= 4;
-	}
-}
-
-void create_scan_data_null_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
-				 uint8_t pwrMgmt, tSirMacAddr bssid,
-				 tSirMacAddr selfMacAddr)
-{
-
-	macMgmtHdr->fc.type = SIR_MAC_DATA_FRAME;
-	macMgmtHdr->fc.subType = SIR_MAC_DATA_NULL;
-	macMgmtHdr->fc.protVer = SIR_MAC_PROTOCOL_VERSION;
-	macMgmtHdr->fc.order = 0;
-	macMgmtHdr->fc.wep = 0;
-	macMgmtHdr->fc.moreData = 0;
-	macMgmtHdr->fc.powerMgmt = pwrMgmt;
-	macMgmtHdr->fc.retry = 0;
-	macMgmtHdr->fc.moreFrag = 0;
-	macMgmtHdr->fc.fromDS = 0;
-	macMgmtHdr->fc.toDS = 0;
-	macMgmtHdr->durationLo =
-		(uint8_t) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff);
-	macMgmtHdr->durationHi =
-		(uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >> 8);
-	macMgmtHdr->seqControl.fragNum = 0;
-	macMgmtHdr->seqControl.seqNumLo = 0;
-	macMgmtHdr->seqControl.seqNumHi = 2;
-	qdf_mem_copy((void *)&macMgmtHdr->da,
-		     (void *)bssid, sizeof(tSirMacAddr));
-	qdf_mem_copy((void *)&macMgmtHdr->sa,
-		     (void *)selfMacAddr, sizeof(tSirMacAddr));
-	qdf_mem_copy((void *)&macMgmtHdr->bssId,
-		     (void *)bssid, sizeof(tSirMacAddr));
-
-	return;
-}
-
-void create_scan_cts_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
-			   tSirMacAddr selfMac)
-{
-	macMgmtHdr->fc.type = SIR_MAC_CTRL_FRAME;
-	macMgmtHdr->fc.subType = SIR_MAC_CTRL_CTS;
-	macMgmtHdr->fc.order = 0;
-	macMgmtHdr->fc.wep = 0;
-	macMgmtHdr->fc.moreData = 0;
-	macMgmtHdr->fc.powerMgmt = 0;
-	macMgmtHdr->fc.retry = 0;
-	macMgmtHdr->fc.moreFrag = 0;
-	macMgmtHdr->fc.fromDS = 0;
-	macMgmtHdr->fc.toDS = 0;
-	macMgmtHdr->durationLo =
-		(uint8_t) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff);
-	macMgmtHdr->durationHi =
-		(uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >> 8);
-	qdf_mem_copy((void *)macMgmtHdr->da, (void *)selfMac,
-		     sizeof(tSirMacAddr));
-
-	return;
-}
-
 void convert_qos_mapset_frame(tpAniSirGlobal pMac, tSirQosMapSet *Qos,
 			      tDot11fIEQosMapSet *dot11fIE)
 {
@@ -763,106 +682,4 @@ void convert_qos_mapset_frame(tpAniSirGlobal pMac, tSirQosMapSet *Qos,
 	}
 }
 
-/**
-    @brief    :    This functions creates a DATA_NULL/CTS2SELF frame in Big endian format
-    @param    :    Global MAC structure, pointer to return the created packet, role which is Station/AP
-    @return    :    void
- */
-
-void create_init_scan_raw_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
-				tBssSystemRole role)
-{
-#if 0
-	tpStaStruct pSta = (tpStaStruct) pMac->hal.halMac.staTable;
-
-	if (role == eSYSTEM_STA_ROLE) {
-		macMgmtHdr->fc.type = SIR_MAC_DATA_FRAME;
-		macMgmtHdr->fc.subType = SIR_MAC_DATA_NULL;
-		macMgmtHdr->fc.protVer = SIR_MAC_PROTOCOL_VERSION;
-		macMgmtHdr->fc.order = 0;
-		macMgmtHdr->fc.wep = 0;
-		macMgmtHdr->fc.moreData = 0;
-		macMgmtHdr->fc.powerMgmt = 1;   /* Needed for station */
-		macMgmtHdr->fc.retry = 0;
-		macMgmtHdr->fc.moreFrag = 0;
-		macMgmtHdr->fc.fromDS = 0;
-		macMgmtHdr->fc.toDS = 1;
-		macMgmtHdr->durationLo =
-			(uint8_t) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff);
-		macMgmtHdr->durationHi =
-			(uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >>
-				   8);
-		macMgmtHdr->seqControl.fragNum = 0;
-		macMgmtHdr->seqControl.seqNumLo = 0;
-		macMgmtHdr->seqControl.seqNumHi = 2;
-		qdf_mem_copy((void *)&macMgmtHdr->da, (void *)pSta[0].bssId, 6);
-		qdf_mem_copy(&macMgmtHdr->sa, pSta[0].staAddr, 6);
-		qdf_mem_copy((void *)&macMgmtHdr->bssId, (void *)pSta[0].bssId,
-			     6);
-	} else if (role == eSYSTEM_AP_ROLE || role == eSYSTEM_STA_IN_IBSS_ROLE) {
-		macMgmtHdr->fc.type = SIR_MAC_CTRL_FRAME;
-		macMgmtHdr->fc.subType = SIR_MAC_CTRL_CTS;
-		macMgmtHdr->fc.order = 0;
-		macMgmtHdr->fc.wep = 0;
-		macMgmtHdr->fc.moreData = 0;
-		macMgmtHdr->fc.powerMgmt = 0;   /* Needed for station */
-		macMgmtHdr->fc.retry = 0;
-		macMgmtHdr->fc.moreFrag = 0;
-		macMgmtHdr->fc.fromDS = 0;
-		macMgmtHdr->fc.toDS = 0;
-		macMgmtHdr->durationLo =
-			(uint8_t) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff);
-		macMgmtHdr->durationHi =
-			(uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >>
-				   8);
-		qdf_mem_copy((void *)macMgmtHdr->da, (void *)pSta[0].staAddr,
-			     6);
-	}
-	return;
-#endif
-}
-
-/**
-    @brief    :    This functions creates a DATA_NULL frame in Big endian format
-    @param    :    Global MAC structure, pointer to return the created packet, role which is Station/AP
-    @return    :    void
- */
-
-void create_finish_scan_raw_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
-				  tBssSystemRole role)
-{
-#if 0
-	tpStaStruct pSta = (tpStaStruct) pMac->hal.halMac.staTable;
-
-	if (role == eSYSTEM_STA_ROLE) {
-		macMgmtHdr->fc.type = SIR_MAC_DATA_FRAME;
-		macMgmtHdr->fc.subType = SIR_MAC_DATA_NULL;
-		macMgmtHdr->fc.protVer = SIR_MAC_PROTOCOL_VERSION;
-		macMgmtHdr->fc.order = 0;
-		macMgmtHdr->fc.wep = 0;
-		macMgmtHdr->fc.moreData = 0;
-		macMgmtHdr->fc.powerMgmt = 0;   /* Needed for station */
-		macMgmtHdr->fc.retry = 0;
-		macMgmtHdr->fc.moreFrag = 0;
-		macMgmtHdr->fc.fromDS = 0;
-		macMgmtHdr->fc.toDS = 1;
-		macMgmtHdr->durationLo =
-			(uint8_t) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff);
-		macMgmtHdr->durationHi =
-			(uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >>
-				   8);
-		macMgmtHdr->seqControl.fragNum = 0;
-		macMgmtHdr->seqControl.seqNumLo = 0;
-		macMgmtHdr->seqControl.seqNumHi = 2;
-		qdf_mem_copy((void *)macMgmtHdr->da, (void *)pSta[0].bssId, 6);
-		qdf_mem_copy(macMgmtHdr->sa, pSta[0].staAddr, 6);
-		qdf_mem_copy((void *)macMgmtHdr->bssId, (void *)pSta[0].bssId,
-			     6);
-
-	}
-
-	return;
-#endif
-}
-
 /* utils_parser.c ends here. */