Add basic config files and update some details

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
sailfishos · Jun 6, 2013 · 23a63a7 · 23a63a7
1 parent a85bc14
commit 23a63a7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/config/dyn-modes/developer_mode.ini b/config/dyn-modes/developer_mode.ini
@@ -0,0 +1,5 @@
+[mode]
+name = developer_mode
+module = g_ether
+network = 1
+network_interface = usb0
diff --git a/config/dyn-modes/mtp_mode.ini b/config/dyn-modes/mtp_mode.ini
@@ -0,0 +1,4 @@
+[mode]
+name = mtp_mode
+module = g_ffs
+appsync = 1
diff --git a/config/run/mtp.ini b/config/run/mtp.ini
@@ -0,0 +1,4 @@
+[info]
+name = buteo.service
+mode = mtp_mode
+systemd = 1
diff --git a/src/usb_moded-modesetting.c b/src/usb_moded-modesetting.c
@@ -234,8 +234,8 @@ static void report_mass_storage_blocker(const char *mountpoint, int try)
 
 }
 
-
-/* TODO: clean up buteo-mtp hack */
+#if 0
+/* NOT NEEDED ANYMORE?  : clean up buteo-mtp hack */
 int set_mtp_mode(void)
 {
   mkdir("/dev/mtp", S_IRWXO|S_IRWXU);
@@ -244,6 +244,7 @@ int set_mtp_mode(void)
 
   return 0;
 }
+#endif
 
 #ifdef N900
 int set_ovi_suite_mode(void)

diff --git a/src/usb_moded.c b/src/usb_moded.c
@@ -310,8 +310,8 @@ void set_usb_mode(const char *mode)
 int valid_mode(const char *mode)
 {
 
-  if(!strcmp(MODE_MASS_STORAGE, mode) || !strcmp(MODE_OVI_SUITE, mode) || !strcmp(MODE_CHARGING, mode) ||
-     !strcmp(MODE_DEVELOPER,mode) || !strcmp(MODE_MTP,mode))
+  /* MODE_ASK and MODE_CHARGER are not modes that are settable seen their special status */
+  if(!strcmp(MODE_CHARGING, mode))
 	return(0);
   else
   {