9 files changed, 29 insertions, 30 deletions
diff --git a/wl1271/CUDK/configurationutility/Android.mk b/wl1271/CUDK/configurationutility/Android.mk
index c33652fe..5d9c5417 100644
--- a/wl1271/CUDK/configurationutility/Android.mk
+++ b/wl1271/CUDK/configurationutility/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 STATIC_LIB ?= y
 DEBUG ?= y
-BUILD_SUPPL ?= y
+BUILD_SUPPL ?= n
 WPA_ENTERPRISE ?= y
 CONFIG_WPS ?= y
 
@@ -12,13 +12,18 @@ CUDK_ROOT ?= $(WILINK_ROOT)/CUDK
 CU_ROOT = $(CUDK_ROOT)/configurationutility
 
 ifeq ($(DEBUG),y)
- DEBUGFLAGS = -O2 -g -DDEBUG -DTI_DBG -fno-builtin   # "-O" is needed to expand inlines
-# DEBUGFLAGS+= -DDEBUG_MESSAGES
+  DEBUGFLAGS = -O2 -g -DDEBUG -DTI_DBG -fno-builtin   
 else
- DEBUGFLAGS = -O2
+  DEBUGFLAGS = -O2
 endif
 
-DEBUGFLAGS+= -DHOST_COMPILE
+ifeq ($(DEBUG),y)
+  DEBUGFLAGS = -O2 -g -DDEBUG -DTI_DBG -fno-builtin   # "-O" is needed to expand inlines
+#  DEBUGFLAGS+= -DDEBUG_MESSAGES
+else
+  DEBUGFLAGS = -O2
+endif
+DEBUGFLAGS += -DHOST_COMPILE
 
 
 DK_DEFINES =
@@ -57,26 +62,27 @@ LOCAL_C_INCLUDES = \
 	$(LOCAL_PATH)/$(WILINK_ROOT)/TWD/FW_Transfer/Export_Inc \
 	external/wpa_supplicant 
 
-LOCAL_SRC_FILES:= \
+LOCAL_SRC_FILES = \
 	src/console.c \
 	src/cu_common.c \
 	src/cu_cmd.c \
 	src/ticon.c \
 	src/wpa_core.c
 
-LOCAL_CFLAGS+= -Wall -Wstrict-prototypes $(DEBUGFLAGS) -D__LINUX__ $(DK_DEFINES) -D__BYTE_ORDER_LITTLE_ENDIAN -DDRV_NAME='"tiwlan"'
+LOCAL_CFLAGS += -Wall -Wstrict-prototypes $(DEBUGFLAGS) -D__LINUX__ $(DK_DEFINES) -D__BYTE_ORDER_LITTLE_ENDIAN -DDRV_NAME='"tiwlan"'
 
 LOCAL_CFLAGS += $(ARMFLAGS)
 
 LOCAL_LDLIBS += -lpthread
 
-LOCAL_STATIC_LIBRARIES := \
+LOCAL_STATIC_LIBRARIES = \
 	libtiOsLib
 
-LOCAL_SHARED_LIBRARIES := \
-        libwpa_client
+ifeq ($(BUILD_SUPPL), y)
+LOCAL_SHARED_LIBRARIES = \
+	libwpa_client
+endif
 
-LOCAL_MODULE:= tiwlan_cu
+LOCAL_MODULE:= wlan_cu
 
 include $(BUILD_EXECUTABLE)
-
diff --git a/wl1271/CUDK/configurationutility/inc/cu_cmd.h b/wl1271/CUDK/configurationutility/inc/cu_cmd.h
index f076f88b..67cde770 100644
--- a/wl1271/CUDK/configurationutility/inc/cu_cmd.h
+++ b/wl1271/CUDK/configurationutility/inc/cu_cmd.h
@@ -137,7 +137,6 @@ VOID CuCmd_RoamingLowSnrThreshold(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 VOID CuCmd_RoamingLowQualityForBackgroungScanCondition(THandle hCuCmd, ConParm_t parm[], U16 nParms); 
 VOID CuCmd_RoamingNormalQualityForBackgroungScanCondition(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 VOID CuCmd_RoamingGetConfParams(THandle hCuCmd, ConParm_t parm[], U16 nParms);
-
 VOID CuCmd_CurrBssUserDefinedTrigger(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 
 VOID CuCmd_AddTspec(THandle hCuCmd, ConParm_t parm[], U16 nParms);
@@ -189,7 +188,6 @@ VOID CuCmd_FwDebug(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 VOID CuCmd_SetRateMngDebug(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 VOID CuCmd_GetRateMngDebug(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 
-
 VOID CuCmd_ShowAbout(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 VOID CuCmd_Quit(THandle hCuCmd, ConParm_t parm[], U16 nParms);
 
diff --git a/wl1271/CUDK/configurationutility/inc/cu_common.h b/wl1271/CUDK/configurationutility/inc/cu_common.h
index 7a049916..94ac7f1c 100644
--- a/wl1271/CUDK/configurationutility/inc/cu_common.h
+++ b/wl1271/CUDK/configurationutility/inc/cu_common.h
@@ -45,8 +45,7 @@ typedef struct
     U8 snrBeacon;     /* The current average SNR in db - For Beacon Packets*/
     S8 rssi;      /* The current average RSSI  - For Data Packets*/
     S8 rssiBeacon;
-}TCuCommon_RoamingStatisticsTable;
-
+} TCuCommon_RoamingStatisticsTable;
 
 /* functions */
 /*************/
diff --git a/wl1271/CUDK/configurationutility/inc/wpa_core.h b/wl1271/CUDK/configurationutility/inc/wpa_core.h
index 7aad03dc..c936f8f6 100644
--- a/wl1271/CUDK/configurationutility/inc/wpa_core.h
+++ b/wl1271/CUDK/configurationutility/inc/wpa_core.h
@@ -66,7 +66,6 @@ S32 WpaCore_SetCertificate(THandle hWpaCore, PU8 Filepath);
 S32 WpaCore_SetXCC(THandle hWpaCore, U16 XCCConfig);
 
 
-
 #ifdef CONFIG_WPS
 S32 WpaCore_StartWpsPIN(THandle hWpaCore);
 S32 WpaCore_StartWpsPBC(THandle hWpaCore);
diff --git a/wl1271/CUDK/configurationutility/src/console.c b/wl1271/CUDK/configurationutility/src/console.c
index b7ec5815..ef645daa 100644
--- a/wl1271/CUDK/configurationutility/src/console.c
+++ b/wl1271/CUDK/configurationutility/src/console.c
@@ -218,7 +218,6 @@ static VOID Console_allocRoot(Console_t* pConsole)
         os_error_printf(CU_MSG_ERROR, (PS8)( "ERROR - Console_allocRoot(): cant allocate root\n") );
         return;
     }
-
     os_strcpy((PS8)pConsole->p_mon_root->name, (PS8)("\\") );
     pConsole->p_mon_root->sel = Dir;
     pConsole->p_cur_dir = pConsole->p_mon_root;
diff --git a/wl1271/CUDK/configurationutility/src/cu_cmd.c b/wl1271/CUDK/configurationutility/src/cu_cmd.c
index 80ff5e19..85f32061 100644
--- a/wl1271/CUDK/configurationutility/src/cu_cmd.c
+++ b/wl1271/CUDK/configurationutility/src/cu_cmd.c
@@ -3661,8 +3661,6 @@ VOID CuCmd_ConfigBtCoe(THandle hCuCmd, ConParm_t parm[], U16 nParms)
     }
 }
 
-
-
 VOID CuCmd_GetBtCoeStatus(THandle hCuCmd, ConParm_t parm[], U16 nParms)
 {
     CuCmd_t* pCuCmd = (CuCmd_t*)hCuCmd;
diff --git a/wl1271/CUDK/configurationutility/src/cu_common.c b/wl1271/CUDK/configurationutility/src/cu_common.c
index febc0afd..5357126a 100644
--- a/wl1271/CUDK/configurationutility/src/cu_common.c
+++ b/wl1271/CUDK/configurationutility/src/cu_common.c
@@ -57,6 +57,7 @@ typedef enum
     DRIVER_STATUS_RUNNING           = 1
 } PARAM_OUT_Driver_Status_e;
 
+
 /* local variables */
 /*******************/
 
diff --git a/wl1271/CUDK/configurationutility/src/ticon.c b/wl1271/CUDK/configurationutility/src/ticon.c
index fe03d4ba..9e0ce265 100644
--- a/wl1271/CUDK/configurationutility/src/ticon.c
+++ b/wl1271/CUDK/configurationutility/src/ticon.c
@@ -54,8 +54,11 @@
 #endif
 
 #define TIWLAN_DRV_NAME "tiwlan0"
-#define SUPPL_IF_FILE "/var/run/tiwlan0"
-
+#ifdef ANDROID
+#define SUPPL_IF_FILE "/data/misc/wifi/sockets/" TIWLAN_DRV_NAME
+#else
+#define SUPPL_IF_FILE "/var/run/" TIWLAN_DRV_NAME
+#endif
 extern int consoleRunScript( char *script_file, THandle hConsole);
     
 /* local types */
@@ -1190,5 +1193,3 @@ void g_tester_send_event(U8 event_index)
 void ProcessLoggerMessage(PU8 data, U32 len)
 {
 }
-
-
diff --git a/wl1271/CUDK/configurationutility/src/wpa_core.c b/wl1271/CUDK/configurationutility/src/wpa_core.c
index 9c3089be..9506c75f 100644
--- a/wl1271/CUDK/configurationutility/src/wpa_core.c
+++ b/wl1271/CUDK/configurationutility/src/wpa_core.c
@@ -35,18 +35,16 @@
 #include <unistd.h>
 #endif
 
-/* Linux only file */
-#include <netinet/if_ether.h>
-
+#include <string.h>
 #include "cu_osapi.h"
 #include "TWDriver.h"
+#include "common.h"
 #include "config_ssid.h"
 #include "driver.h"
 #include "ipc_wpa.h"
 #include "wpa_core.h"
 #include "oserr.h"
 
-
 /* defines */
 /***********/
 #ifdef CONFIG_WPS
@@ -119,7 +117,7 @@ static VOID WpaCore_InitWpaParams(TWpaCore* pWpaCore)
 	  pWpaCore->WpaSupplParams.pair_wise = WPA_CIPHER_NONE;
 	  pWpaCore->WpaSupplParams.group = WPA_CIPHER_NONE; 
       pWpaCore->WpaSupplParams.anyWpaMode = 0;
-      #ifdef CONFIG_WPS
+#ifdef CONFIG_WPS
 	pWpaCore->WpaSupplParams.pWscPin = NULL;
 	pWpaCore->WpaSupplParams.WscMode = WSC_MODE_OFF;
 #endif
@@ -141,7 +139,7 @@ THandle WpaCore_Create(PS32 pRes, PS8 pSupplIfFile)
 		return NULL;
 	}
 
-	pWpaCore->hIpcWpa = IpcWpa_Create(pRes, pSupplIfFile);
+    pWpaCore->hIpcWpa = IpcWpa_Create(pRes, pSupplIfFile);
 	if(pWpaCore->hIpcWpa == NULL)
 	{	
 		WpaCore_Destroy(pWpaCore);