From 07ff8e5a8469e0a3bb0c1fcf58ef319694829972 Mon Sep 17 00:00:00 2001
From: Philippe De Swert <philippe.deswert@jollamobile.com>
Date: Mon, 27 May 2013 13:44:20 +0300
Subject: [PATCH] Remove android specific stuff, as this will be handled
 through the configs

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
---
 configure.ac                |  8 --------
 src/Makefile.am             |  9 +--------
 src/usb_moded-dyn-config.h  |  4 ++++
 src/usb_moded-modesetting.c |  4 ----
 src/usb_moded-modules.h     | 10 +---------
 src/usb_moded.c             | 16 ++++++++++++----
 6 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/configure.ac b/configure.ac
index b4d5de2..b519933 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,14 +102,6 @@ AC_ARG_ENABLE([upstart], AS_HELP_STRING([--enable-upstart], [Enable upstart inte
    esac],[upstart=false])
 AM_CONDITIONAL([UPSTART], [test x$upstart = xtrue])
 
-AC_ARG_ENABLE([android], AS_HELP_STRING([--enable-android], [Enable Android "module" interface @<:@default=false@:>@]),
-  [case "${enableval}" in
-   yes) android=true ; CFLAGS="-DANDROID $CFLAGS" ;;
-   no)  android=false ;;
-   *) AC_MSG_ERROR([bad value ${enableval} for --enable-android]) ;;
-   esac],[android=false])
-AM_CONDITIONAL([ANDROID], [test x$android = xtrue])
-
 #TODO: Figure out how to check for this depending on the gconf flag
 # gconf-2.0 >= 2.16.0
 PKG_CHECK_MODULES([USB_MODED], [
diff --git a/src/Makefile.am b/src/Makefile.am
index d1bfee5..581ddee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,15 +31,8 @@ usb_moded_SOURCES = \
  	usb_moded-mac.c \
 	usb_moded-mac.h \
 	usb_moded-dyn-config.c \
-	usb_moded-dyn-config.h
-
-if !ANDROID
-usb_moded_SOURCES += \
+	usb_moded-dyn-config.h \
 	usb_moded-modules.c 
-else
-usb_moded_SOURCES += \
-	usb_moded-modules-android.c 
-endif
 
 if GCONF
 usb_moded_SOURCES += \
diff --git a/src/usb_moded-dyn-config.h b/src/usb_moded-dyn-config.h
index a69f4f5..e9c63df 100644
--- a/src/usb_moded-dyn-config.h
+++ b/src/usb_moded-dyn-config.h
@@ -31,6 +31,10 @@
 #define MODE_NEEDS_APPSYNC_KEY		"appsync"
 #define MODE_NETWORK_KEY		"network"
 #define MODE_NETWORK_INTERFACE_KEY	"network_interface"
+#define MODE_SYSFS_PATH			"sysfs_path"
+#define MODE_SYSFS_VALUE		"sysfs_value"
+#define MODE_SOFTCONNECT		"softconnect"
+#define MODE_SOFTCONNECT_PATH		"softconnect_path"
 
 /**
  * Struct keeping all the data needed for the definition of a dynamic mode
diff --git a/src/usb_moded-modesetting.c b/src/usb_moded-modesetting.c
index eae5b90..5ebcaea 100644
--- a/src/usb_moded-modesetting.c
+++ b/src/usb_moded-modesetting.c
@@ -245,7 +245,6 @@ int set_mtp_mode(void)
   return 0;
 }
 
-#ifndef ANDROID
 #ifdef N900
 int set_ovi_suite_mode(void)
 {
@@ -278,7 +277,6 @@ int set_ovi_suite_mode(void)
   return(0);
 }
 #endif /* N900 */
-#endif /* ANDROID */
 
 int set_dynamic_mode(struct mode_list_elem *data)
 {
@@ -402,7 +400,6 @@ int usb_moded_mode_cleanup(const char *module)
                 }
 
         }
-#ifndef ANDROID
 #ifdef N900
         if(!strcmp(module, MODULE_NETWORK))
         {
@@ -417,7 +414,6 @@ int usb_moded_mode_cleanup(const char *module)
 		system("killall -SIGTERM acm");
         }
 #endif /* N900 */
-#endif /* ANDROID */
 	if(!strcmp(module, MODULE_MTP))
 	{
 		/* stop service before umounting ;) */
diff --git a/src/usb_moded-modules.h b/src/usb_moded-modules.h
index f3ddbe3..3f37357 100644
--- a/src/usb_moded-modules.h
+++ b/src/usb_moded-modules.h
@@ -18,7 +18,6 @@
   02110-1301 USA
 */
 
-#ifndef ANDROID
 /* module name definitions */
 #define MODULE_NETWORK          "g_nokia" 
 #ifdef NOKIA
@@ -33,14 +32,7 @@
 #define MODULE_NONE             "none"
 #define MODULE_DEVELOPER	"g_ether"
 #define MODULE_MTP		"g_ffs"
-#else
-#define MODULE_MASS_STORAGE     "mass_storage"
-#define MODULE_FILE_STORAGE	"mass_storage"
-#define MODULE_DEVELOPER	"rndis"
-#define MODULE_MTP		"mtp"
-#define MODULE_NONE             "none"
-#define MODULE_CHARGING		"mass_storage"
-#endif
+#define MODULE_NONE		"none"
 
 /* load module */
 int usb_moded_load_module(const char *module);
diff --git a/src/usb_moded.c b/src/usb_moded.c
index e732b82..b05bf40 100644
--- a/src/usb_moded.c
+++ b/src/usb_moded.c
@@ -259,8 +259,18 @@ void set_usb_mode(const char *mode)
 	ret = usb_moded_load_module(MODULE_CHARGING);
 	goto end;
   }
-<<<<<<< HEAD
-else if(!strcmp(mode, MODE_DEVELOPER))
+  if(!strcmp(mode, MODE_MASS_STORAGE))
+  {
+
+       check_module_state(MODULE_MASS_STORAGE);
+       /* now proceed to set the mode correctly */
+       set_usb_module(MODULE_MASS_STORAGE);
+       ret = usb_moded_load_module(MODULE_MASS_STORAGE);
+       if(!ret)
+               ret = set_mass_storage_mode();
+       goto end;
+  }
+  else if(!strcmp(mode, MODE_DEVELOPER))
   {
 	check_module_state(MODULE_DEVELOPER);
 	set_usb_module(MODULE_DEVELOPER);
@@ -268,7 +278,6 @@ else if(!strcmp(mode, MODE_DEVELOPER))
 	net = usb_network_up();	
 	goto end;
   }
-#ifndef ANDROID
 #ifdef N900 
   else if(!strcmp(mode, MODE_OVI_SUITE))
   {
@@ -280,7 +289,6 @@ else if(!strcmp(mode, MODE_DEVELOPER))
 	goto end;
   } 
 #endif /* N900 */
-#endif /* ANDROID */
   else if(!strcmp(mode, MODE_MTP))
   {
 	check_module_state(MODULE_MTP);