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

plugin-base: method to get device IDs doesn't need to be public

Browse Source 
Given the new pre-probing filters, the IDs are no longer retrieved by the
plugins.
This commit is contained in:
Aleksander Morgado
2012-07-10 10:44:14 +02:00
parent aaa487094e
commit 7e9d3e4b68
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mm-plugin-base.c
View File

@@ -90,8 +90,8 @@ enum {
/*****************************************************************************/ /*****************************************************************************/
gboolean static gboolean
mm_plugin_base_get_device_ids (MMPluginBase *self, get_device_ids (MMPluginBase *self,
const char *subsys, const char *subsys,
const char *name, const char *name,
guint16 *vendor, guint16 *vendor,
@@ -318,7 +318,7 @@ apply_pre_probing_filters (MMPluginBase *self,
return TRUE; return TRUE;
} }
mm_plugin_base_get_device_ids (self, subsys, name, &vendor, &product); get_device_ids (self, subsys, name, &vendor, &product);
/* The plugin may specify that only some vendor IDs are supported. If that /* The plugin may specify that only some vendor IDs are supported. If that
* is the case, filter by vendor ID. */ * is the case, filter by vendor ID. */
@@ -798,7 +798,7 @@ create_modem (MMPlugin *self,
/* Vendor and Product IDs are really optional, we'll just warn if they /* Vendor and Product IDs are really optional, we'll just warn if they
* cannot get loaded */ * cannot get loaded */
if (!mm_plugin_base_get_device_ids (MM_PLUGIN_BASE (self), subsys, name, &vendor, &product)) if (!get_device_ids (MM_PLUGIN_BASE (self), subsys, name, &vendor, &product))
mm_warn ("Could not get modem vendor/product ID"); mm_warn ("Could not get modem vendor/product ID");
/* Let the plugin create the modem from the port probe results */ /* Let the plugin create the modem from the port probe results */

5
src/mm-plugin-base.h
View File

@@ -75,10 +75,5 @@ struct _MMPluginBaseClass {
GType mm_plugin_base_get_type (void); GType mm_plugin_base_get_type (void);
gboolean mm_plugin_base_get_device_ids (MMPluginBase *self,
const char *subsys,
const char *name,
guint16 *vendor,
guint16 *product);
#endif /* MM_PLUGIN_BASE_H */ #endif /* MM_PLUGIN_BASE_H */