colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Probe HSO modems, don't trust (often incorrect) HAL modem properties.

Browse Source
This commit is contained in:
Tambet Ingo
2009-02-26 11:28:00 +02:00
parent d8fa8d7d1b
commit a7f9033611
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/mm-plugin-hso.c
View File

@@ -35,7 +35,7 @@ list_supported_udis (MMPlugin *plugin, LibHalContext *hal_ctx)
int num_devices; int num_devices;
int i; int i;
devices = libhal_find_device_by_capability (hal_ctx, "modem", &num_devices, NULL); devices = libhal_find_device_by_capability (hal_ctx, "serial", &num_devices, NULL);
if (devices) { if (devices) {
GPtrArray *array; GPtrArray *array;
@@ -83,18 +83,26 @@ supports_udi (MMPlugin *plugin, LibHalContext *hal_ctx, const char *udi)
driver_name = get_driver_name (hal_ctx, udi); driver_name = get_driver_name (hal_ctx, udi);
if (driver_name && !strcmp (driver_name, "hso")) { if (driver_name && !strcmp (driver_name, "hso")) {
char **capabilities; char *sysfs_path;
char **iter;
capabilities = libhal_device_get_property_strlist (hal_ctx, udi, "modem.command_sets", NULL); sysfs_path = libhal_device_get_property_string (hal_ctx, udi, "linux.sysfs_path", NULL);
for (iter = capabilities; iter && *iter && !supported; iter++) { if (sysfs_path) {
if (!strcmp (*iter, "GSM-07.07") || !strcmp (*iter, "GSM-07.05")) { char *hso_type_path;
supported = TRUE; gchar *contents = NULL;
break; gsize length;
hso_type_path = g_build_filename (sysfs_path, "hsotype", NULL);
libhal_free_string (sysfs_path);
if (g_file_get_contents (hso_type_path, &contents, &length, NULL)) {
if (g_str_has_prefix (contents, "Control"))
supported = TRUE;
g_free (contents);
} }
}
libhal_free_string_array (capabilities); g_free (hso_type_path);
}
} }
libhal_free_string (driver_name); libhal_free_string (driver_name);