Remove windows_network mode as it is the same as developer mode

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
sailfishos · Apr 3, 2013 · 953455a · 953455a
1 parent 326bae3
commit 953455a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/src/usb_moded-modes.h b/src/usb_moded-modes.h
@@ -26,7 +26,6 @@
 #define MODE_CHARGING           "charging_only"
 #define MODE_UNDEFINED		"undefined"
 #define MODE_ASK		"ask"
-#define MODE_WINDOWS_NET	"windows_network"
 #define MODE_DEVELOPER		"developer_mode"
 #define MODE_MTP		"mtp_mode"
 

diff --git a/src/usb_moded-modules.c b/src/usb_moded-modules.c
@@ -245,7 +245,7 @@ return result;
   if(module_state_check("g_nokia"))
 	return(MODULE_NETWORK);
   else if(module_state_check("g_ether"))
-	return(MODULE_WINDOWS_NET); 
+	return(MODULE_DEVELOPER); 
   else if(module_state_check("g_ncm"))
 	return("g_ncm");
   else if(module_state_check("g_ffs"))

diff --git a/src/usb_moded-modules.h b/src/usb_moded-modules.h
@@ -31,13 +31,11 @@
 #define MODULE_CHARGING		"g_mass_storage luns=1 stall=0 removable=1"
 #define MODULE_CHARGE_FALLBACK	"g_file_storage luns=1 stall=0 removable=1"
 #define MODULE_NONE             "none"
-#define MODULE_WINDOWS_NET	"g_ether"
 #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_WINDOWS_NET	"rndis"
 #define MODULE_DEVELOPER	"rndis"
 #define MODULE_MTP		"mtp"
 #define MODULE_NONE             "none"

diff --git a/src/usb_moded.c b/src/usb_moded.c
@@ -276,15 +276,6 @@ else if(!strcmp(mode, MODE_DEVELOPER))
   } 
 #endif /* N900 */
 #endif /* ANDROID */
-
-  else if(!strcmp(mode, MODE_WINDOWS_NET))
-  {	
-	check_module_state(MODULE_WINDOWS_NET);
-	set_usb_module(MODULE_WINDOWS_NET);
-	ret = usb_moded_load_module(MODULE_WINDOWS_NET);
-	net = usb_network_up();	
-	goto end;
-  }
   else if(!strcmp(mode, MODE_MTP))
   {
 	check_module_state(MODULE_MTP);
@@ -342,8 +333,8 @@ else if(!strcmp(mode, MODE_DEVELOPER))
 int valid_mode(const char *mode)
 {
 
-  if(!strcmp(MODE_MASS_STORAGE, mode) || !strcmp(MODE_OVI_SUITE, mode) || !strcmp(MODE_CHARGING, mode) 
-     || !strcmp(MODE_WINDOWS_NET, mode) || !strcmp(MODE_DEVELOPER,mode) || !strcmp(MODE_MTP,mode))
+  if(!strcmp(MODE_MASS_STORAGE, mode) || !strcmp(MODE_OVI_SUITE, mode) || !strcmp(MODE_CHARGING, mode) ||
+     !strcmp(MODE_DEVELOPER,mode) || !strcmp(MODE_MTP,mode))
 	return(0);
   else
 #ifdef DYN_MODE
@@ -377,9 +368,9 @@ char *get_mode_list(void)
   char *modelist;
 
 #ifdef N900
-  asprintf(&modelist, "%s, %s, %s, %s, %s, %s", MODE_MASS_STORAGE, MODE_OVI_SUITE, MODE_CHARGING, MODE_WINDOWS_NET, MODE_DEVELOPER, MODE_MTP);
+  asprintf(&modelist, "%s, %s, %s, %s, %s", MODE_MASS_STORAGE, MODE_OVI_SUITE, MODE_CHARGING, MODE_DEVELOPER, MODE_MTP);
 #else
-  asprintf(&modelist, "%s, %s, %s, %s, %s", MODE_MASS_STORAGE, MODE_CHARGING, MODE_WINDOWS_NET, MODE_DEVELOPER, MODE_MTP);
+  asprintf(&modelist, "%s, %s, %s, %s", MODE_MASS_STORAGE, MODE_CHARGING, MODE_DEVELOPER, MODE_MTP);
 #endif /* N900 */
 #ifdef DYN_MODE
   {