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

broadband-modem: remove `USE_WS46' property

Browse Source 
3GPP modems will all try to use AT+WS46=? by default to gather supported modes.
This commit is contained in:
Aleksander Morgado
2012-07-16 08:34:01 +02:00
parent 7ce65fe85d
commit 431b6a0fc5
4 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/cinterion/mm-broadband-modem-cinterion.c
View File

@@ -1159,7 +1159,6 @@ mm_broadband_modem_cinterion_new (const gchar *device,
MM_BASE_MODEM_VENDOR_ID, vendor_id, MM_BASE_MODEM_VENDOR_ID, vendor_id,
MM_BASE_MODEM_PRODUCT_ID, product_id, MM_BASE_MODEM_PRODUCT_ID, product_id,
MM_IFACE_MODEM_MESSAGING_SMS_MEM3_STORAGE, MM_SMS_STORAGE_MT, MM_IFACE_MODEM_MESSAGING_SMS_MEM3_STORAGE, MM_SMS_STORAGE_MT,
MM_BROADBAND_MODEM_USE_WS46, TRUE,
NULL); NULL);
} }

1
plugins/novatel/mm-broadband-modem-novatel.c
View File

@@ -110,7 +110,6 @@ mm_broadband_modem_novatel_new (const gchar *device,
MM_BASE_MODEM_PLUGIN, plugin, MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id, MM_BASE_MODEM_VENDOR_ID, vendor_id,
MM_BASE_MODEM_PRODUCT_ID, product_id, MM_BASE_MODEM_PRODUCT_ID, product_id,
MM_BROADBAND_MODEM_USE_WS46, TRUE,
NULL); NULL);
} }

20
src/mm-broadband-modem.c
View File

@@ -68,7 +68,6 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModem, mm_broadband_modem, MM_TYPE_BASE_MODEM
enum { enum {
PROP_0, PROP_0,
PROP_USE_WS46,
PROP_MODEM_DBUS_SKELETON, PROP_MODEM_DBUS_SKELETON,
PROP_MODEM_3GPP_DBUS_SKELETON, PROP_MODEM_3GPP_DBUS_SKELETON,
PROP_MODEM_3GPP_USSD_DBUS_SKELETON, PROP_MODEM_3GPP_USSD_DBUS_SKELETON,
@@ -101,9 +100,6 @@ enum {
#define CIND_INDICATOR_IS_VALID(u) (u != CIND_INDICATOR_INVALID) #define CIND_INDICATOR_IS_VALID(u) (u != CIND_INDICATOR_INVALID)
struct _MMBroadbandModemPrivate { struct _MMBroadbandModemPrivate {
/* Broadband modem specific implementation */
gboolean use_ws46;
/*<--- Modem interface --->*/ /*<--- Modem interface --->*/
/* Properties */ /* Properties */
GObject *modem_dbus_skeleton; GObject *modem_dbus_skeleton;
@@ -7097,9 +7093,6 @@ set_property (GObject *object,
MMBroadbandModem *self = MM_BROADBAND_MODEM (object); MMBroadbandModem *self = MM_BROADBAND_MODEM (object);
switch (prop_id) { switch (prop_id) {
case PROP_USE_WS46:
self->priv->use_ws46 = g_value_get_boolean (value);
break;
case PROP_MODEM_DBUS_SKELETON: case PROP_MODEM_DBUS_SKELETON:
g_clear_object (&self->priv->modem_dbus_skeleton); g_clear_object (&self->priv->modem_dbus_skeleton);
self->priv->modem_dbus_skeleton = g_value_dup_object (value); self->priv->modem_dbus_skeleton = g_value_dup_object (value);
@@ -7199,9 +7192,6 @@ get_property (GObject *object,
MMBroadbandModem *self = MM_BROADBAND_MODEM (object); MMBroadbandModem *self = MM_BROADBAND_MODEM (object);
switch (prop_id) { switch (prop_id) {
case PROP_USE_WS46:
g_value_set_boolean (value, self->priv->use_ws46);
break;
case PROP_MODEM_DBUS_SKELETON: case PROP_MODEM_DBUS_SKELETON:
g_value_set_object (value, self->priv->modem_dbus_skeleton); g_value_set_object (value, self->priv->modem_dbus_skeleton);
break; break;
@@ -7287,7 +7277,6 @@ mm_broadband_modem_init (MMBroadbandModem *self)
self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
MM_TYPE_BROADBAND_MODEM, MM_TYPE_BROADBAND_MODEM,
MMBroadbandModemPrivate); MMBroadbandModemPrivate);
self->priv->use_ws46 = FALSE;
self->priv->modem_state = MM_MODEM_STATE_UNKNOWN; self->priv->modem_state = MM_MODEM_STATE_UNKNOWN;
self->priv->modem_3gpp_registration_regex = mm_3gpp_creg_regex_get (TRUE); self->priv->modem_3gpp_registration_regex = mm_3gpp_creg_regex_get (TRUE);
self->priv->modem_current_charset = MM_MODEM_CHARSET_UNKNOWN; 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; 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, g_object_class_override_property (object_class,
PROP_MODEM_DBUS_SKELETON, PROP_MODEM_DBUS_SKELETON,
MM_IFACE_MODEM_DBUS_SKELETON); MM_IFACE_MODEM_DBUS_SKELETON);

2
src/mm-broadband-modem.h
View File

@@ -30,8 +30,6 @@
#define MM_IS_BROADBAND_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM)) #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_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 _MMBroadbandModem MMBroadbandModem;
typedef struct _MMBroadbandModemClass MMBroadbandModemClass; typedef struct _MMBroadbandModemClass MMBroadbandModemClass;
typedef struct _MMBroadbandModemPrivate MMBroadbandModemPrivate; typedef struct _MMBroadbandModemPrivate MMBroadbandModemPrivate;