wlan: qnx awareness to corestack
Removed Android dependency. Added QNX awareness macros.
CRs-fixed: 449746
Change-Id: Iadece48b848fe378dacaa73cda7f5b4503106754
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index c405e51..e2db40b 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -277,7 +277,7 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
" Received Command to Set Preferred Channels for SAP in %s", __func__);
- ret = sapSetPreferredChannel(dev,command);
+ ret = sapSetPreferredChannel(command);
}
}
exit:
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5bb5692..64adfc1 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -508,7 +508,7 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
" Received Command to Set Preferred Channels for SAP in %s", __func__);
- ret = sapSetPreferredChannel(dev, ptr);
+ ret = sapSetPreferredChannel(ptr);
}
else if(strncmp(command, "SETSUSPENDMODE", 14) == 0)
{
diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c
index 57c3e3c..61cde72 100644
--- a/CORE/MAC/src/pe/lim/limLogDump.c
+++ b/CORE/MAC/src/pe/lim/limLogDump.c
@@ -2372,7 +2372,7 @@
{
p += log_sprintf( pMac,
p,"Session does not exist usage: 363 <0> sessionid channel \n");
- printk("Session Not found!!!!\n");
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN,"Session Not found!!!!");
return p;
}
@@ -2430,7 +2430,7 @@
{
p += log_sprintf( pMac,
p,"Session does not exist usage: 367 <0> sessionid channel \n");
- printk("Session Not found!!!!\n");
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN,"Session Not found!!!!");
return p;
}
@@ -2460,7 +2460,7 @@
{
p += log_sprintf( pMac,
p,"Session does not exist usage: 363 <0> sessionid channel \n");
- printk("Session Not found!!!!\n");
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_WARN,"Session Not found!!!!");
return p;
}
psessionEntry->gLimChannelSwitch.switchCount = 0;
diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.h b/CORE/MAC/src/pe/lim/limSerDesUtils.h
index 528f095..a08d8c0 100644
--- a/CORE/MAC/src/pe/lim/limSerDesUtils.h
+++ b/CORE/MAC/src/pe/lim/limSerDesUtils.h
@@ -116,6 +116,7 @@
#elif ((defined(ANI_OS_TYPE_OSX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_WINDOWS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_AMSS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
+ (defined(ANI_OS_TYPE_QNX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_ANDROID) && defined(ANI_LITTLE_BYTE_ENDIAN)))
*ptr++ = (tANI_U8) (u16Val & 0xff);
*ptr = (tANI_U8) ((u16Val >> 8) & 0xff);
@@ -132,6 +133,7 @@
#elif ((defined(ANI_OS_TYPE_OSX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_WINDOWS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_AMSS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
+ (defined(ANI_OS_TYPE_QNX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_ANDROID) && defined(ANI_LITTLE_BYTE_ENDIAN)))
return (((tANI_U16) (*(ptr+1) << 8)) |
((tANI_U16) (*ptr)));
@@ -150,6 +152,7 @@
#elif ((defined(ANI_OS_TYPE_OSX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_WINDOWS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_AMSS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
+ (defined(ANI_OS_TYPE_QNX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_ANDROID) && defined(ANI_LITTLE_BYTE_ENDIAN)))
*ptr++ = (tANI_U8) (u32Val & 0xff);
*ptr++ = (tANI_U8) ((u32Val >> 8) & 0xff);
@@ -170,6 +173,7 @@
#elif ((defined(ANI_OS_TYPE_OSX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_WINDOWS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_AMSS) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
+ (defined(ANI_OS_TYPE_QNX) && defined(ANI_LITTLE_BYTE_ENDIAN)) || \
(defined(ANI_OS_TYPE_ANDROID) && defined(ANI_LITTLE_BYTE_ENDIAN)))
return ((*(ptr+3) << 24) |
(*(ptr+2) << 16) |
diff --git a/CORE/SAP/inc/sapApi.h b/CORE/SAP/inc/sapApi.h
index 3207089..680b36e 100644
--- a/CORE/SAP/inc/sapApi.h
+++ b/CORE/SAP/inc/sapApi.h
@@ -587,7 +587,7 @@
} tSap_SoftapStats, *tpSap_SoftapStats;
-int sapSetPreferredChannel(struct net_device *dev, tANI_U8* ptr);
+int sapSetPreferredChannel(tANI_U8* ptr);
void sapCleanupChannelList(void);
/*==========================================================================
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 52afec7..e652e0e 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -83,6 +83,9 @@
#include "sme_Api.h"
#include "sapChSelect.h"
#include "sapInternal.h"
+#ifdef ANI_OS_TYPE_QNX
+#include "stdio.h"
+#endif
/*--------------------------------------------------------------------------
Function definitions
@@ -93,7 +96,6 @@
--------------------------------------------------------------------------*/
#define SAP_DEBUG
-
/*==========================================================================
FUNCTION sapCleanupChannelList
@@ -139,13 +141,12 @@
IN
*ptr: pointer having the command followed by the arguments in string format
- *dev: not used.
RETURN VALUE
int: return 0 when success else returns error code.
============================================================================*/
-int sapSetPreferredChannel(struct net_device *dev, tANI_U8* ptr)
+int sapSetPreferredChannel(tANI_U8* ptr)
{
v_PVOID_t pvosGCtx = vos_get_global_context(VOS_MODULE_ID_SAP, NULL);
@@ -162,17 +163,17 @@
sapCleanupChannelList();
}
- param = strnchr(ptr, strlen(ptr), ' ');
+ param = strchr(ptr, ' ');
/*no argument after the command*/
- if (NULL == param)
+ if (NULL == param)
{
- return -EINVAL;
+ return -EINVAL;
}
/*no space after the command*/
- else if (SPACE_ASCII_VALUE != *param)
+ else if (SPACE_ASCII_VALUE != *param)
{
- return -EINVAL;
+ return -EINVAL;
}
param++;
diff --git a/CORE/VOSS/inc/vos_types.h b/CORE/VOSS/inc/vos_types.h
index bcea66e..3657383 100644
--- a/CORE/VOSS/inc/vos_types.h
+++ b/CORE/VOSS/inc/vos_types.h
@@ -41,12 +41,18 @@
#if !defined( __VOS_TYPES_H )
#define __VOS_TYPES_H
+/*
+* Copyright (c) 2013 Qualcomm Atheros, Inc.
+* All Rights Reserved.
+* Qualcomm Atheros Confidential and Proprietary.
+*/
+
/**=========================================================================
-
\file vos_Types.h
-
+
\brief virtual Operating System Servies (vOS)
+<<<<<<< HEAD:CORE/VOSS/inc/vos_types.h
Basic type definitions
@@ -54,6 +60,14 @@
Qualcomm Confidential and Proprietary.
+=======
+
+ Basic type definitions
+
+ Copyright 2008 (c) Qualcomm, Incorporated.
+ All Rights Reserved.
+ Qualcomm Confidential and Proprietary.
+>>>>>>> b682f18... wlan: qnx awareness to corestack:prima/CORE/VOSS/inc/vos_types.h
========================================================================*/
/* $Header$ */
@@ -113,10 +127,11 @@
#endif
-/*--------------------------------------------------------------------------
+
+/*--------------------------------------------------------------------------
Type declarations
------------------------------------------------------------------------*/
-
+
/// Module IDs. These are generic IDs that identify the various modules
/// in the software system.
typedef enum
diff --git a/CORE/WDA/inc/legacy/palTypes.h b/CORE/WDA/inc/legacy/palTypes.h
index e949c05..d116322 100644
--- a/CORE/WDA/inc/legacy/palTypes.h
+++ b/CORE/WDA/inc/legacy/palTypes.h
@@ -39,8 +39,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*
- * */
#if !defined( PALTYPES_H__ )
#define PALTYPES_H__
@@ -137,12 +135,54 @@
//
// Validate the OS Type being built...
//
-#if ( defined( ANI_OS_TYPE_WINDOWS ) && defined( ANI_OS_TYPE_LINUX ) && defined(ANI_OS_TYPE_OSX) && defined(ANI_OS_TYPE_AMSS) && \
- defined( ANI_OS_TYPE_ANDROID ) )
+
+#if defined( ANI_OS_TYPE_WINDOWS ) // WINDOWS
+
+#if ( defined( ANI_OS_TYPE_LINUX ) || defined(ANI_OS_TYPE_OSX) || defined(ANI_OS_TYPE_AMSS) || \
+ defined( ANI_OS_TYPE_ANDROID ) || defined(ANI_OS_TYPE_QNX) )
#error "more than one ANI_OS_TYPE_xxx is defined for this build"
+#endif
+
+
+#elif defined( ANI_OS_TYPE_LINUX ) // LINUX
+
+#if ( defined( ANI_OS_TYPE_WINDOWS ) || defined(ANI_OS_TYPE_OSX) || defined(ANI_OS_TYPE_AMSS) || \
+ defined( ANI_OS_TYPE_ANDROID ) || defined(ANI_OS_TYPE_QNX) )
+#error "more than one ANI_OS_TYPE_xxx is defined for this build"
+#endif
+
+
+#elif defined( ANI_OS_TYPE_OSX ) // OSX
+
+#if ( defined( ANI_OS_TYPE_WINDOWS ) || defined(ANI_OS_TYPE_LINUX) || defined(ANI_OS_TYPE_AMSS) || \
+ defined( ANI_OS_TYPE_ANDROID ) || defined(ANI_OS_TYPE_QNX) )
+#error "more than one ANI_OS_TYPE_xxx is defined for this build"
+#endif
+
+#elif defined( ANI_OS_TYPE_AMSS ) // AMSS
+
+#if ( defined( ANI_OS_TYPE_WINDOWS ) || defined(ANI_OS_TYPE_LINUX) || defined(ANI_OS_TYPE_OSX) || \
+ defined( ANI_OS_TYPE_ANDROID ) || defined(ANI_OS_TYPE_QNX) )
+#error "more than one ANI_OS_TYPE_xxx is defined for this build"
+#endif
+
+#elif defined( ANI_OS_TYPE_ANDROID ) // ANDROID
+
+#if ( defined( ANI_OS_TYPE_WINDOWS ) || defined(ANI_OS_TYPE_LINUX) || defined(ANI_OS_TYPE_OSX) || \
+ defined( ANI_OS_TYPE_AMSS ) || defined(ANI_OS_TYPE_QNX) )
+#error "more than one ANI_OS_TYPE_xxx is defined for this build"
+#endif
+
+#elif defined( ANI_OS_TYPE_QNX ) // QNX
+
+#if ( defined( ANI_OS_TYPE_WINDOWS ) || defined(ANI_OS_TYPE_LINUX) || defined(ANI_OS_TYPE_OSX) || \
+ defined( ANI_OS_TYPE_AMSS ) || defined(ANI_OS_TYPE_ANDROID) )
+#error "more than one ANI_OS_TYPE_xxx is defined for this build"
+#endif
+
#elif !( defined( ANI_OS_TYPE_WINDOWS ) || defined( ANI_OS_TYPE_LINUX ) || defined(ANI_OS_TYPE_OSX) || defined(ANI_OS_TYPE_AMSS) \
- || defined (ANI_OS_TYPE_ANDROID) )
+ || defined (ANI_OS_TYPE_ANDROID) || defined(ANI_OS_TYPE_QNX) ) // NONE
#error "NONE of the ANI_OS_TYPE_xxx are defined for this build"
#endif
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
old mode 100755
new mode 100644
index 8bb48ff..b88a90d
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -11059,37 +11059,6 @@
return ;
}
/*
- * FUNCTION: WDA_SetPowerParamsCallback
- *
- */
-void WDA_SetPowerParamsCallback(WDI_Status status, void* pUserData)
-{
- tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
-
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "<------ %s " ,__func__);
- if(NULL == pWdaParams)
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pWdaParams received NULL", __func__);
- VOS_ASSERT(0) ;
- return ;
- }
- if( pWdaParams != NULL )
- {
- if( pWdaParams->wdaWdiApiMsgParam != NULL )
- {
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- }
- if( pWdaParams->wdaMsgParam != NULL)
- {
- vos_mem_free(pWdaParams->wdaMsgParam);
- }
- vos_mem_free(pWdaParams) ;
- }
- return ;
-}
-/*
* FUNCTION: WDA_ProcessSetPreferredNetworkList
* Request to WDI to set Preferred Network List.Offload
*/
@@ -11346,6 +11315,39 @@
return CONVERT_WDI2VOS_STATUS(status) ;
}
#endif // FEATURE_WLAN_SCAN_PNO
+/*
+ * FUNCTION: WDA_SetPowerParamsCallback
+ *
+ */
+void WDA_SetPowerParamsCallback(WDI_Status status, void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s " ,__func__);
+
+ if(NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: pWdaParams received NULL", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+ if( pWdaParams != NULL )
+ {
+ if( pWdaParams->wdaWdiApiMsgParam != NULL )
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ }
+ if( pWdaParams->wdaMsgParam != NULL)
+ {
+ vos_mem_free(pWdaParams->wdaMsgParam);
+ }
+ vos_mem_free(pWdaParams);
+ }
+ return;
+}
+
#ifdef WLAN_FEATURE_PACKET_FILTERING
/*
* FUNCTION: WDA_8023MulticastListReqCallback