Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Echo android extra values *before* enabling the android gadget
Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
  • Loading branch information
philippedeswert committed Jul 19, 2013
1 parent e7605f7 commit a66625b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions src/usb_moded-dyn-config.c
Expand Up @@ -83,15 +83,17 @@ static struct mode_list_elem *read_mode_file(const gchar *filename)
list_item->network = g_key_file_get_integer(settingsfile, MODE_ENTRY, MODE_NETWORK_KEY, NULL);
list_item->network_interface = g_key_file_get_string(settingsfile, MODE_ENTRY, MODE_NETWORK_INTERFACE_KEY, NULL);
list_item->sysfs_path = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SYSFS_PATH, NULL);
log_debug("Dynamic mode sysfs path = %s\n", list_item->sysfs_path);
//log_debug("Dynamic mode sysfs path = %s\n", list_item->sysfs_path);
list_item->sysfs_value = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SYSFS_VALUE, NULL);
log_debug("Dynamic mode sysfs value = %s\n", list_item->sysfs_value);
//log_debug("Dynamic mode sysfs value = %s\n", list_item->sysfs_value);
list_item->sysfs_reset_value = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SYSFS_RESET_VALUE, NULL);
list_item->softconnect = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SOFTCONNECT, NULL);
list_item->softconnect_disconnect = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SOFTCONNECT_DISCONNECT, NULL);
list_item->softconnect_path = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SOFTCONNECT_PATH, NULL);
list_item->android_extra_sysfs_path = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_ANDROID_EXTRA_SYSFS_PATH, NULL);
//log_debug("Android extra mode sysfs path = %s\n", list_item->android_extra_sysfs_path);
list_item->android_extra_sysfs_value = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_ANDROID_EXTRA_SYSFS_VALUE, NULL);
//log_debug("Android extra value = %s\n", list_item->android_extra_sysfs_value);
g_key_file_free(settingsfile);
if(list_item->mode_name == NULL || list_item->mode_module == NULL)
{
Expand Down
8 changes: 4 additions & 4 deletions src/usb_moded-modesetting.c
Expand Up @@ -369,14 +369,14 @@ int set_dynamic_mode(void)
write_to_file(data->sysfs_path, data->sysfs_value);
log_debug("writing to file %s, value %s\n", data->sysfs_path, data->sysfs_value);
}
if(data->softconnect)
{
write_to_file(data->softconnect_path, data->softconnect);
}
if(data->android_extra_sysfs_value && data->android_extra_sysfs_path)
{
write_to_file(data->android_extra_sysfs_path, data->android_extra_sysfs_value);
}
if(data->softconnect)
{
write_to_file(data->softconnect_path, data->softconnect);
}

/* functionality should be enabled, so we can enable the network now */
if(data->network)
Expand Down

0 comments on commit a66625b

Please sign in to comment.