Remove CONFIG_MACH_MAHIMAHI #ifdefs. Include most by default for Android,

but change to CUSTOMER_HW2 for dhd_custom_gpio.c.

Change-Id: I4637f5b1dddfbb7ed65ff9eea460901115609745

4 files changed, 22 insertions, 63 deletions

diff --git a/src/dhd/linux/Makefile b/src/dhd/linux/Makefile
index 3f1a820..7fb0a9a 100644
--- a/src/dhd/linux/Makefile
+++ b/src/dhd/linux/Makefile
@@ -263,7 +263,6 @@ DFLAGS += -Dlinux
 DFLAGS += -DOEM_ANDROID
 DFLAGS += -DBCMDBG
 DFLAGS += -DDHD_USE_STATIC_BUF
-DFLAGS += -DCONFIG_MACH_MAHIMAHI
 DFLAGS += -DCUSTOM_OOB_GPIO_NUM=299
 DFLAGS += -DOOB_INTR_ONLY
 DFLAGS += -DMMC_SDIO_ABORT
diff --git a/src/dhd/sys/dhd_custom_gpio.c b/src/dhd/sys/dhd_custom_gpio.c
index ba60d91..9a60818 100644
--- a/src/dhd/sys/dhd_custom_gpio.c
+++ b/src/dhd/sys/dhd_custom_gpio.c
@@ -41,7 +41,7 @@
 extern  void bcm_wlan_power_off(int);
 extern  void bcm_wlan_power_on(int);
 #endif /* CUSTOMER_HW */
-#if  defined(CONFIG_MACH_MAHIMAHI)
+#if  defined(CUSTOMER_HW2)
 int wifi_set_carddetect(int on);
 int wifi_set_power(int on, unsigned long msec);
 int wifi_get_irq_number(unsigned long *irq_flags_ptr);
@@ -79,10 +79,10 @@ int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr)
 {
 	int  host_oob_irq = 0;
 
-#ifdef CONFIG_MACH_MAHIMAHI
+#ifdef CUSTOMER_HW2
 	host_oob_irq = wifi_get_irq_number(irq_flags_ptr);
 
-#else /* for NOT  CONFIG_MACH_MAHIMAHI */
+#else /* for NOT  CUSTOMER_HW2 */
 #if defined(CUSTOM_OOB_GPIO_NUM)
 	if (dhd_oob_gpio_num < 0) {
 		dhd_oob_gpio_num = CUSTOM_OOB_GPIO_NUM;
@@ -105,7 +105,7 @@ int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr)
 	host_oob_irq = gpio_to_irq(dhd_oob_gpio_num);
 	gpio_direction_input(dhd_oob_gpio_num);
 #endif /* CUSTOMER_HW */
-#endif /* CONFIG_MACH_MAHIMAHI */
+#endif /* CUSTOMER_HW2 */
 
 	return (host_oob_irq);
 }
@@ -122,7 +122,7 @@ dhd_customer_gpio_wlan_ctrl(int onoff)
 #ifdef CUSTOMER_HW
 			bcm_wlan_power_off(2);
 #endif /* CUSTOMER_HW */
-#ifdef CONFIG_MACH_MAHIMAHI
+#ifdef CUSTOMER_HW2
 			wifi_set_power(0, 0);
 #endif
 			WL_ERROR(("=========== WLAN placed in RESET ========\n"));
@@ -134,7 +134,7 @@ dhd_customer_gpio_wlan_ctrl(int onoff)
 #ifdef CUSTOMER_HW
 			bcm_wlan_power_on(2);
 #endif /* CUSTOMER_HW */
-#ifdef CONFIG_MACH_MAHIMAHI
+#ifdef CUSTOMER_HW2
 			wifi_set_power(1, 0);
 #endif
 			WL_ERROR(("=========== WLAN going back to live  ========\n"));
@@ -172,7 +172,7 @@ dhd_custom_get_mac_address(unsigned char *buf)
 		return -EINVAL;
 
 	/* Customer access to MAC address stored outside of DHD driver */
-#if defined(CONFIG_MACH_MAHIMAHI) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
+#if defined(CUSTOMER_HW2) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
 	ret = wifi_get_mac_addr(buf);
 #endif
 
diff --git a/src/dhd/sys/dhd_linux.c b/src/dhd/sys/dhd_linux.c
index cd835ce..0b44591 100644
--- a/src/dhd/sys/dhd_linux.c
+++ b/src/dhd/sys/dhd_linux.c
@@ -95,7 +95,7 @@ static histo_t vi_d1, vi_d2, vi_d3, vi_d4;
 #include <wlfc_proto.h>
 #include <dhd_wlfc.h>
 #endif
-#if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
@@ -155,7 +155,7 @@ int wifi_set_reset(int on, unsigned long msec)
 	return 0;
 }
 
-#if defined(CONFIG_MACH_MAHIMAHI) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
 int wifi_get_mac_addr(unsigned char *buf)
 {
 	DHD_ERROR(("%s\n", __FUNCTION__));
@@ -166,7 +166,7 @@ int wifi_get_mac_addr(unsigned char *buf)
 	}
 	return -EOPNOTSUPP;
 }
-#endif /* defined (CONFIG_MACH_MAHIMAHI) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) */
+#endif 
 
 static int wifi_probe(struct platform_device *pdev)
 {
@@ -230,7 +230,7 @@ void wifi_del_dev(void)
 	DHD_TRACE(("## Unregister platform_driver_register\n"));
 	platform_driver_unregister(&wifi_device);
 }
-#endif /* defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC) */
+#endif 
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP)
 #include <linux/suspend.h>
@@ -451,11 +451,7 @@ extern int dhd_dongle_memsize;
 module_param(dhd_dongle_memsize, int, 0);
 #endif /* DHDTHREAD */
 /* Control fw roaming */
-#ifdef CONFIG_MACH_MAHIMAHI
 uint dhd_roam_disable = 0;
-#else
-uint dhd_roam_disable = 1;
-#endif
 
 /* Control radio state */
 uint dhd_radio_up = 1;
@@ -630,9 +626,7 @@ static int dhd_set_suspend(int value, dhd_pub_t *dhd)
 	/* wl_pkt_filter_enable_t	enable_parm; */
 	char iovbuf[32];
 	int bcn_li_dtim = 3;
-#ifdef CONFIG_MACH_MAHIMAHI
 	uint roamvar = 1;
-#endif /* CONFIG_MACH_MAHIMAHI */
 
 	DHD_TRACE(("%s: enter, value = %d in_suspend=%d\n",
 		__FUNCTION__, value, dhd->in_suspend));
@@ -658,12 +652,10 @@ static int dhd_set_suspend(int value, dhd_pub_t *dhd)
 					4, iovbuf, sizeof(iovbuf));
 				dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, iovbuf, sizeof(iovbuf), TRUE, 0);
 
-#ifdef CONFIG_MACH_MAHIMAHI
 				/* Disable firmware roaming during suspend */
 				bcm_mkiovar("roam_off", (char *)&roamvar, 4,
 					iovbuf, sizeof(iovbuf));
 				dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, iovbuf, sizeof(iovbuf), TRUE, 0);
-#endif /* CONFIG_MACH_MAHIMAHI */
 			} else {
 
 				/* Kernel resumed  */
@@ -681,12 +673,10 @@ static int dhd_set_suspend(int value, dhd_pub_t *dhd)
 					4, iovbuf, sizeof(iovbuf));
 
 				dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, iovbuf, sizeof(iovbuf), TRUE, 0);
-#ifdef CONFIG_MACH_MAHIMAHI
 				roamvar = dhd_roam_disable;
 				bcm_mkiovar("roam_off", (char *)&roamvar, 4, iovbuf,
 					sizeof(iovbuf));
 				dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, iovbuf, sizeof(iovbuf), TRUE, 0);
-#endif /* CONFIG_MACH_MAHIMAHI */
 			}
 	}
 
@@ -2576,7 +2566,7 @@ dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
 	 */
 	memcpy(netdev_priv(net), &dhd, sizeof(dhd));
 
-#if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 	g_bus = bus;
 #endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) && 1
@@ -3019,7 +3009,7 @@ void dhd_detach(dhd_pub_t *dhdp)
 
 
 	if (dhd->dhd_state & DHD_ATTACH_STATE_WAKELOCKS_INIT) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && 1 && defined(CONFIG_PM_SLEEP)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP)
 		unregister_pm_notifier(&dhd_sleep_pm_notifier);
 #endif 
 	/* && defined(CONFIG_PM_SLEEP) */
@@ -3051,7 +3041,7 @@ dhd_module_cleanup(void)
 	DHD_TRACE(("%s: Enter\n", __FUNCTION__));
 
 	dhd_bus_unregister();
-#if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 	wifi_del_dev();
 #endif
 	/* Call customer gpio to turn off power with WL_REG_ON signal */
@@ -3085,7 +3075,7 @@ dhd_module_init(void)
 	/* Call customer gpio to turn on power with WL_REG_ON signal */
 	dhd_customer_gpio_wlan_ctrl(WLAN_POWER_ON);
 
-#if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 	sema_init(&wifi_control_sem, 0);
 
 	/* Added fail_0, fail_1 to do the right clean-up for failure case */
@@ -3101,7 +3091,7 @@ dhd_module_init(void)
 		DHD_ERROR(("%s: platform_driver_register timeout\n", __FUNCTION__));
 		goto fail_1;
 	}
-#endif /* #if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC) */
+#endif 
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
 		sema_init(&dhd_registration_sem, 0);
@@ -3134,10 +3124,10 @@ fail_2:
 	dhd_bus_unregister();
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
 fail_1:
-#if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 	wifi_del_dev();
 fail_0:
-#endif /* defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC) */
+#endif 
 
 	/* Call customer gpio to turn off power with WL_REG_ON signal */
 	dhd_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
@@ -3410,7 +3400,7 @@ dhd_os_sdtxunlock(dhd_pub_t *pub)
 #ifdef DHD_USE_STATIC_BUF
 void * dhd_os_prealloc(int section, unsigned long size)
 {
-#if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 	void *alloc_ptr = NULL;
 	if (wifi_control_data && wifi_control_data->mem_prealloc)
 	{
@@ -3427,7 +3417,7 @@ void * dhd_os_prealloc(int section, unsigned long size)
 	return 0;
 #else
 return MALLOC(0, size);
-#endif /* #if defined(CONFIG_MACH_MAHIMAHI) && defined(CONFIG_WIFI_CONTROL_FUNC) */
+#endif 
 }
 #endif /* DHD_USE_STATIC_BUF */
 #if defined(CONFIG_WIRELESS_EXT)
@@ -3589,7 +3579,7 @@ dhd_sendup_event(dhd_pub_t *dhdp, wl_event_msg_t *event, void *data)
 
 void dhd_wait_for_event(dhd_pub_t *dhd, bool *lockvar)
 {
-#if 1 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
 	struct dhd_info *dhdinfo =  dhd->info;
 	dhd_os_sdunlock(dhd);
 	wait_event_interruptible_timeout(dhdinfo->ctrl_wait, (*lockvar == FALSE), HZ * 2);
@@ -3600,7 +3590,7 @@ void dhd_wait_for_event(dhd_pub_t *dhd, bool *lockvar)
 
 void dhd_wait_event_wakeup(dhd_pub_t *dhd)
 {
-#if 1 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
 	struct dhd_info *dhdinfo =  dhd->info;
 	if (waitqueue_active(&dhdinfo->ctrl_wait))
 		wake_up_interruptible(&dhdinfo->ctrl_wait);
diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
index 2493e98..fe007f8 100644
--- a/src/wl/sys/wl_iw.c
+++ b/src/wl/sys/wl_iw.c
@@ -763,7 +763,6 @@ exit:
 	return error;
 }
 
-#ifdef CONFIG_MACH_MAHIMAHI
 static int
 wl_iw_set_power_mode(
 	struct net_device *dev,
@@ -825,7 +824,6 @@ wl_iw_set_power_mode(
 
 	return error;
 }
-#endif 
 
 
 bool btcoex_is_sco_active(struct net_device *dev)
@@ -960,7 +958,6 @@ static int set_btc_esco_params(struct net_device *dev, bool trump_sco)
 #endif 
 
 
-#ifdef CONFIG_MACH_MAHIMAHI
 static int
 wl_iw_get_power_mode(
 	struct net_device *dev,
@@ -989,7 +986,6 @@ wl_iw_get_power_mode(
 	wrqu->data.length = p - extra + 1;
 	return error;
 }
-#endif 
 
 static int
 wl_iw_set_btcoex_dhcp(
@@ -1001,10 +997,6 @@ wl_iw_set_btcoex_dhcp(
 {
 	int error = 0;
 	char *p = extra;
-#ifndef CONFIG_MACH_MAHIMAHI
-	static int  pm = PM_FAST;
-	int  pm_local = PM_OFF;
-#endif
 	char powermode_val = 0;
 	char buf_reg66va_dhcp_on[8] = { 66, 00, 00, 00, 0x10, 0x27, 0x00, 0x00 };
 	char buf_reg41va_dhcp_on[8] = { 41, 00, 00, 00, 0x33, 0x00, 0x00, 0x00 };
@@ -1021,11 +1013,7 @@ wl_iw_set_btcoex_dhcp(
 #endif 
 
 	
-#ifdef  CONFIG_MACH_MAHIMAHI
 	strncpy((char *)&powermode_val, extra + strlen("BTCOEXMODE") +1, 1);
-#else
-	strncpy((char *)&powermode_val, extra + strlen("POWERMODE") +1, 1);
-#endif
 
 	if (strnicmp((char *)&powermode_val, "1", strlen("1")) == 0) {
 
@@ -1033,9 +1021,6 @@ wl_iw_set_btcoex_dhcp(
 
 		
 		if ((saved_status == FALSE) &&
-#ifndef CONFIG_MACH_MAHIMAHI
-			(!dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm))) &&
-#endif
 			(!dev_wlc_intvar_get_reg(dev, "btc_params", 66,  &saved_reg66)) &&
 			(!dev_wlc_intvar_get_reg(dev, "btc_params", 41,  &saved_reg41)) &&
 			(!dev_wlc_intvar_get_reg(dev, "btc_params", 68,  &saved_reg68)))   {
@@ -1044,9 +1029,6 @@ wl_iw_set_btcoex_dhcp(
 					saved_reg66, saved_reg41, saved_reg68));
 
 				
-#ifndef CONFIG_MACH_MAHIMAHI
-				dev_wlc_ioctl(dev, WLC_SET_PM, &pm_local, sizeof(pm_local));
-#endif
 
 				
 #ifdef COEX_DHCP
@@ -1078,17 +1060,10 @@ wl_iw_set_btcoex_dhcp(
 			WL_ERROR(("%s was called w/o DHCP OFF. Continue\n", __FUNCTION__));
 		}
 	}
-#ifdef  CONFIG_MACH_MAHIMAHI
 	else if (strnicmp((char *)&powermode_val, "2", strlen("2")) == 0) {
-#else
-	else if (strnicmp((char *)&powermode_val, "0", strlen("0")) == 0) {
-#endif
 
 
 		
-#ifndef CONFIG_MACH_MAHIMAHI
-		dev_wlc_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
-#endif
 
 #ifdef COEX_DHCP
 		
@@ -7393,17 +7368,12 @@ wl_iw_set_priv(
 	    else if (strnicmp(extra, CSCAN_COMMAND, strlen(CSCAN_COMMAND)) == 0)
 			ret = wl_iw_set_cscan(dev, info, (union iwreq_data *)dwrq, extra);
 #endif 
-#ifdef CONFIG_MACH_MAHIMAHI
 	    else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
 			ret = wl_iw_set_power_mode(dev, info, (union iwreq_data *)dwrq, extra);
 	    else if (strnicmp(extra, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0)
 			ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
 	    else if (strnicmp(extra, "GETPOWER", strlen("GETPOWER")) == 0)
 			ret = wl_iw_get_power_mode(dev, info, (union iwreq_data *)dwrq, extra);
-#else
-	    else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
-			ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
-#endif
 #ifdef SOFTAP
 	    else if (strnicmp(extra, "ASCII_CMD", strlen("ASCII_CMD")) == 0) {