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

option: plugin is supposed to support Nozomi devices too

Browse Source 
The Nozomi cards were early CardBus devices that used a direct PCI
interface (instead of the more usual PCI<->USB controller) and the
'nozomi' kernel driver.  They use the same command set as most other
early Option NV modems.  Nozomi was always supposed to be driven
by the option plugin, but apparently that got broken when adding
some of the driver/vendor checks.
This commit is contained in:
Dan Williams
2011-07-25 12:50:22 -05:00
parent b02dc7f50f
commit 1df8dd7361
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/mm-plugin-option.c
View File

@@ -58,7 +58,7 @@ supports_port (MMPluginBase *base,
{ {
GUdevDevice *port; GUdevDevice *port;
const char *driver, *subsys, *name; const char *driver, *subsys, *name;
guint16 vendor = 0; guint16 vendor = 0, product = 0;
/* Can't do anything with non-serial ports */ /* Can't do anything with non-serial ports */
port = mm_plugin_base_supports_task_get_port (task); port = mm_plugin_base_supports_task_get_port (task);
@@ -69,13 +69,14 @@ supports_port (MMPluginBase *base,
name = g_udev_device_get_name (port); name = g_udev_device_get_name (port);
driver = mm_plugin_base_supports_task_get_driver (task); driver = mm_plugin_base_supports_task_get_driver (task);
if (!driver || (strcmp (driver, "option1") && strcmp (driver, "option"))) if (!driver || (strcmp (driver, "option1") && strcmp (driver, "option") && strcmp (driver, "nozomi")))
return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, NULL)) if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, &product))
return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
if (vendor != 0x0af0) if ( (vendor != 0x0af0) /* Option USB devices */
&& (vendor != 0x1931 || product != 0x000c)) /* Nozomi CardBus devices */
return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
/* Check if a previous probing was already launched in this port */ /* Check if a previous probing was already launched in this port */