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

plugin-base: new property to specify that only one single AT port is expected

Browse Source 
Will allow us to cancel other AT probings as soon as the first AT port is
grabbed.
This commit is contained in:
Aleksander Morgado
2012-03-07 14:23:15 +01:00
parent 690777986b
commit 9fbddcb8a9
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,7 @@ typedef struct {
mm_str_pair *product_strings; mm_str_pair *product_strings;
gchar **udev_tags; gchar **udev_tags;
gboolean at; gboolean at;
gboolean single_at;
gboolean qcdm; gboolean qcdm;
MMPortProbeAtCommand *custom_init; MMPortProbeAtCommand *custom_init;
guint64 send_delay; guint64 send_delay;
@@ -83,6 +84,7 @@ enum {
PROP_ALLOWED_PRODUCT_STRINGS, PROP_ALLOWED_PRODUCT_STRINGS,
PROP_ALLOWED_UDEV_TAGS, PROP_ALLOWED_UDEV_TAGS,
PROP_ALLOWED_AT, PROP_ALLOWED_AT,
PROP_ALLOWED_SINGLE_AT,
PROP_ALLOWED_QCDM, PROP_ALLOWED_QCDM,
PROP_CUSTOM_INIT, PROP_CUSTOM_INIT,
PROP_SEND_DELAY, PROP_SEND_DELAY,
@@ -659,6 +661,8 @@ supports_port (MMPlugin *plugin,
probe_run_flags = 0; probe_run_flags = 0;
if (priv->at) if (priv->at)
probe_run_flags |= MM_PORT_PROBE_AT; probe_run_flags |= MM_PORT_PROBE_AT;
else if (priv->single_at)
probe_run_flags |= MM_PORT_PROBE_AT;
if (need_vendor_probing) if (need_vendor_probing)
probe_run_flags |= MM_PORT_PROBE_AT_VENDOR; probe_run_flags |= MM_PORT_PROBE_AT_VENDOR;
if (need_product_probing) if (need_product_probing)
@@ -815,6 +819,10 @@ set_property (GObject *object, guint prop_id,
/* Construct only */ /* Construct only */
priv->at = g_value_get_boolean (value); priv->at = g_value_get_boolean (value);
break; break;
case PROP_ALLOWED_SINGLE_AT:
/* Construct only */
priv->single_at = g_value_get_boolean (value);
break;
case PROP_ALLOWED_QCDM: case PROP_ALLOWED_QCDM:
/* Construct only */ /* Construct only */
priv->qcdm = g_value_get_boolean (value); priv->qcdm = g_value_get_boolean (value);
@@ -864,6 +872,9 @@ get_property (GObject *object, guint prop_id,
case PROP_ALLOWED_AT: case PROP_ALLOWED_AT:
g_value_set_boolean (value, priv->at); g_value_set_boolean (value, priv->at);
break; break;
case PROP_ALLOWED_SINGLE_AT:
g_value_set_boolean (value, priv->single_at);
break;
case PROP_ALLOWED_QCDM: case PROP_ALLOWED_QCDM:
g_value_set_boolean (value, priv->qcdm); g_value_set_boolean (value, priv->qcdm);
break; break;
@@ -988,6 +999,14 @@ mm_plugin_base_class_init (MMPluginBaseClass *klass)
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
(object_class, PROP_ALLOWED_SINGLE_AT,
g_param_spec_boolean (MM_PLUGIN_BASE_ALLOWED_SINGLE_AT,
"Allowed single AT",
"Whether just a single AT port is allowed in this plugin. ",
FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ALLOWED_QCDM, (object_class, PROP_ALLOWED_QCDM,
g_param_spec_boolean (MM_PLUGIN_BASE_ALLOWED_QCDM, g_param_spec_boolean (MM_PLUGIN_BASE_ALLOWED_QCDM,

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

@@ -43,6 +43,7 @@
#define MM_PLUGIN_BASE_ALLOWED_PRODUCT_STRINGS "allowed-product-strings" #define MM_PLUGIN_BASE_ALLOWED_PRODUCT_STRINGS "allowed-product-strings"
#define MM_PLUGIN_BASE_ALLOWED_UDEV_TAGS "allowed-udev-tags" #define MM_PLUGIN_BASE_ALLOWED_UDEV_TAGS "allowed-udev-tags"
#define MM_PLUGIN_BASE_ALLOWED_AT "allowed-at" #define MM_PLUGIN_BASE_ALLOWED_AT "allowed-at"
#define MM_PLUGIN_BASE_ALLOWED_SINGLE_AT "allowed-single-at"
#define MM_PLUGIN_BASE_ALLOWED_QCDM "allowed-qcdm" #define MM_PLUGIN_BASE_ALLOWED_QCDM "allowed-qcdm"
#define MM_PLUGIN_BASE_CUSTOM_INIT "custom-init" #define MM_PLUGIN_BASE_CUSTOM_INIT "custom-init"
#define MM_PLUGIN_BASE_SEND_DELAY "send-delay" #define MM_PLUGIN_BASE_SEND_DELAY "send-delay"
@@ -74,4 +75,3 @@ gboolean mm_plugin_base_get_device_ids (MMPluginBase *self,
guint16 *product); guint16 *product);
#endif /* MM_PLUGIN_BASE_H */ #endif /* MM_PLUGIN_BASE_H */