diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2012-07-16 08:34:01 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-07-16 08:34:01 +0200 |
commit | 431b6a0fc5da7e2c339f30b4993fa78bd83cbbe9 (patch) | |
tree | 7ddbd514ec3b74f7d441dc70286d9bdd7188e848 /src | |
parent | 7ce65fe85d7a66cce1c4a507afe9968d811304c5 (diff) |
broadband-modem: remove `USE_WS46' property
3GPP modems will all try to use AT+WS46=? by default to gather supported modes.
Diffstat (limited to 'src')
-rw-r--r-- | src/mm-broadband-modem.c | 20 | ||||
-rw-r--r-- | src/mm-broadband-modem.h | 2 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index d3182699..6868d86f 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -68,7 +68,6 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModem, mm_broadband_modem, MM_TYPE_BASE_MODEM enum { PROP_0, - PROP_USE_WS46, PROP_MODEM_DBUS_SKELETON, PROP_MODEM_3GPP_DBUS_SKELETON, PROP_MODEM_3GPP_USSD_DBUS_SKELETON, @@ -101,9 +100,6 @@ enum { #define CIND_INDICATOR_IS_VALID(u) (u != CIND_INDICATOR_INVALID) struct _MMBroadbandModemPrivate { - /* Broadband modem specific implementation */ - gboolean use_ws46; - /*<--- Modem interface --->*/ /* Properties */ GObject *modem_dbus_skeleton; @@ -7097,9 +7093,6 @@ set_property (GObject *object, MMBroadbandModem *self = MM_BROADBAND_MODEM (object); switch (prop_id) { - case PROP_USE_WS46: - self->priv->use_ws46 = g_value_get_boolean (value); - break; case PROP_MODEM_DBUS_SKELETON: g_clear_object (&self->priv->modem_dbus_skeleton); self->priv->modem_dbus_skeleton = g_value_dup_object (value); @@ -7199,9 +7192,6 @@ get_property (GObject *object, MMBroadbandModem *self = MM_BROADBAND_MODEM (object); switch (prop_id) { - case PROP_USE_WS46: - g_value_set_boolean (value, self->priv->use_ws46); - break; case PROP_MODEM_DBUS_SKELETON: g_value_set_object (value, self->priv->modem_dbus_skeleton); break; @@ -7287,7 +7277,6 @@ mm_broadband_modem_init (MMBroadbandModem *self) self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), MM_TYPE_BROADBAND_MODEM, MMBroadbandModemPrivate); - self->priv->use_ws46 = FALSE; self->priv->modem_state = MM_MODEM_STATE_UNKNOWN; self->priv->modem_3gpp_registration_regex = mm_3gpp_creg_regex_get (TRUE); self->priv->modem_current_charset = MM_MODEM_CHARSET_UNKNOWN; @@ -7584,15 +7573,6 @@ mm_broadband_modem_class_init (MMBroadbandModemClass *klass) klass->setup_ports = setup_ports; - g_object_class_install_property ( - object_class, - PROP_USE_WS46, - g_param_spec_boolean (MM_BROADBAND_MODEM_USE_WS46, - "Use AT+WS46", - "Whether the modem should use AT+WS46=? when loading supported modes", - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_override_property (object_class, PROP_MODEM_DBUS_SKELETON, MM_IFACE_MODEM_DBUS_SKELETON); diff --git a/src/mm-broadband-modem.h b/src/mm-broadband-modem.h index ab885300..3b15ec91 100644 --- a/src/mm-broadband-modem.h +++ b/src/mm-broadband-modem.h @@ -30,8 +30,6 @@ #define MM_IS_BROADBAND_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM)) #define MM_BROADBAND_MODEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM, MMBroadbandModemClass)) -#define MM_BROADBAND_MODEM_USE_WS46 "broadband-modem-use-ws46" - typedef struct _MMBroadbandModem MMBroadbandModem; typedef struct _MMBroadbandModemClass MMBroadbandModemClass; typedef struct _MMBroadbandModemPrivate MMBroadbandModemPrivate; |