From da5177cecdd04b13be79945e797ea9a8227c1fba Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 29 May 2013 10:46:27 -0500 Subject: [PATCH] mobile: move and rename old MM modem state enum --- src/modem-manager/nm-modem-cdma.c | 4 ++-- src/modem-manager/nm-modem-cdma.h | 3 ++- src/modem-manager/nm-modem-gsm.c | 4 ++-- src/modem-manager/nm-modem-gsm.h | 3 ++- src/modem-manager/nm-modem-manager.c | 4 ++-- src/modem-manager/nm-modem-old-types.h | 15 +++++++++++++++ src/modem-manager/nm-modem-old.c | 8 ++++---- src/modem-manager/nm-modem-old.h | 15 --------------- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c index efd18da5d7..2d35fcbd48 100644 --- a/src/modem-manager/nm-modem-cdma.c +++ b/src/modem-manager/nm-modem-cdma.c @@ -64,7 +64,7 @@ NMModem * nm_modem_cdma_new (const char *path, const char *data_device, guint32 ip_method, - NMModemState state) + MMOldModemState state) { g_return_val_if_fail (path != NULL, NULL); g_return_val_if_fail (data_device != NULL, NULL); @@ -75,7 +75,7 @@ nm_modem_cdma_new (const char *path, NM_MODEM_CONTROL_PORT, NULL, NM_MODEM_DATA_PORT, data_device, NM_MODEM_IP_METHOD, ip_method, - NM_MODEM_CONNECTED, (state == NM_MODEM_STATE_CONNECTED), + NM_MODEM_CONNECTED, (state == MM_OLD_MODEM_STATE_CONNECTED), NULL); } diff --git a/src/modem-manager/nm-modem-cdma.h b/src/modem-manager/nm-modem-cdma.h index cd8d035604..0ee4d5238c 100644 --- a/src/modem-manager/nm-modem-cdma.h +++ b/src/modem-manager/nm-modem-cdma.h @@ -23,6 +23,7 @@ #define NM_MODEM_CDMA_H #include "nm-modem-old.h" +#include "nm-modem-old-types.h" G_BEGIN_DECLS @@ -52,7 +53,7 @@ GType nm_modem_cdma_get_type (void); NMModem *nm_modem_cdma_new (const char *path, const char *data_device, guint32 ip_method, - NMModemState state); + MMOldModemState state); G_END_DECLS diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c index e0c7a5fa6e..18d432d341 100644 --- a/src/modem-manager/nm-modem-gsm.c +++ b/src/modem-manager/nm-modem-gsm.c @@ -106,7 +106,7 @@ NMModem * nm_modem_gsm_new (const char *path, const char *data_device, guint32 ip_method, - NMModemState state) + MMOldModemState state) { g_return_val_if_fail (path != NULL, NULL); g_return_val_if_fail (data_device != NULL, NULL); @@ -117,7 +117,7 @@ nm_modem_gsm_new (const char *path, NM_MODEM_CONTROL_PORT, NULL, NM_MODEM_DATA_PORT, data_device, NM_MODEM_IP_METHOD, ip_method, - NM_MODEM_CONNECTED, (state == NM_MODEM_STATE_CONNECTED), + NM_MODEM_CONNECTED, (state == MM_OLD_MODEM_STATE_CONNECTED), NULL); } diff --git a/src/modem-manager/nm-modem-gsm.h b/src/modem-manager/nm-modem-gsm.h index fc6f74a4a3..bf974eaef5 100644 --- a/src/modem-manager/nm-modem-gsm.h +++ b/src/modem-manager/nm-modem-gsm.h @@ -23,6 +23,7 @@ #define NM_MODEM_GSM_H #include "nm-modem-old.h" +#include "nm-modem-old-types.h" G_BEGIN_DECLS @@ -52,7 +53,7 @@ GType nm_modem_gsm_get_type (void); NMModem *nm_modem_gsm_new (const char *path, const char *data_device, guint32 ip_method, - NMModemState state); + MMOldModemState state); G_END_DECLS diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c index 9185df9416..23647538b0 100644 --- a/src/modem-manager/nm-modem-manager.c +++ b/src/modem-manager/nm-modem-manager.c @@ -112,7 +112,7 @@ get_modem_properties (DBusGConnection *connection, guint32 *type, guint32 *ip_method, guint32 *ip_timeout, - NMModemState *state) + MMOldModemState *state) { DBusGProxy *proxy; GError *err = NULL; @@ -176,7 +176,7 @@ create_modem (NMModemManager *self, const char *path) uint modem_type = MM_OLD_MODEM_TYPE_UNKNOWN; uint ip_method = MM_MODEM_IP_METHOD_PPP; uint ip_timeout = 0; - NMModemState state = NM_MODEM_STATE_UNKNOWN; + MMOldModemState state = MM_OLD_MODEM_STATE_UNKNOWN; if (g_hash_table_lookup (self->priv->modems, path)) { nm_log_warn (LOGD_MB, "modem with path %s already exists, ignoring", path); diff --git a/src/modem-manager/nm-modem-old-types.h b/src/modem-manager/nm-modem-old-types.h index 22a1fafe9b..976605db2b 100644 --- a/src/modem-manager/nm-modem-old-types.h +++ b/src/modem-manager/nm-modem-old-types.h @@ -51,4 +51,19 @@ #define MM_OLD_MODEM_ERROR_SIM_PUK MM_OLD_MODEM_ERROR ".SimPukRequired" #define MM_OLD_MODEM_ERROR_SIM_WRONG MM_OLD_MODEM_ERROR ".SimWrong" +typedef enum { + MM_OLD_MODEM_STATE_UNKNOWN = 0, + MM_OLD_MODEM_STATE_DISABLED = 10, + MM_OLD_MODEM_STATE_DISABLING = 20, + MM_OLD_MODEM_STATE_ENABLING = 30, + MM_OLD_MODEM_STATE_ENABLED = 40, + MM_OLD_MODEM_STATE_SEARCHING = 50, + MM_OLD_MODEM_STATE_REGISTERED = 60, + MM_OLD_MODEM_STATE_DISCONNECTING = 70, + MM_OLD_MODEM_STATE_CONNECTING = 80, + MM_OLD_MODEM_STATE_CONNECTED = 90, + + MM_OLD_MODEM_STATE_LAST = MM_OLD_MODEM_STATE_CONNECTED +} MMOldModemState; + #endif /* NM_MODEM_OLD_TYPES_H */ diff --git a/src/modem-manager/nm-modem-old.c b/src/modem-manager/nm-modem-old.c index 97fe2978ef..e32cbddeb1 100644 --- a/src/modem-manager/nm-modem-old.c +++ b/src/modem-manager/nm-modem-old.c @@ -42,7 +42,7 @@ typedef struct { DBusGProxyCall *call; - NMModemState state; + MMOldModemState state; } NMModemOldPrivate; /*****************************************************************************/ @@ -311,7 +311,7 @@ modem_properties_changed (DBusGProxy *proxy, NMModemOld *self = NM_MODEM_OLD (user_data); NMModemOldPrivate *priv = NM_MODEM_OLD_GET_PRIVATE (self); GValue *value; - NMModemState new_state; + MMOldModemState new_state; if (strcmp (interface, MM_OLD_DBUS_INTERFACE_MODEM)) return; @@ -334,11 +334,11 @@ modem_properties_changed (DBusGProxy *proxy, if (value && G_VALUE_HOLDS_UINT (value)) { new_state = g_value_get_uint (value); if (new_state != priv->state) { - if (new_state == NM_MODEM_STATE_CONNECTED) + if (new_state == MM_OLD_MODEM_STATE_CONNECTED) g_object_set (self, NM_MODEM_CONNECTED, TRUE, NULL); - else if (priv->state == NM_MODEM_STATE_CONNECTED) + else if (priv->state == MM_OLD_MODEM_STATE_CONNECTED) g_object_set (self, NM_MODEM_CONNECTED, FALSE, NULL); diff --git a/src/modem-manager/nm-modem-old.h b/src/modem-manager/nm-modem-old.h index 2d83ef0c5d..c4c47cf3bf 100644 --- a/src/modem-manager/nm-modem-old.h +++ b/src/modem-manager/nm-modem-old.h @@ -35,21 +35,6 @@ G_BEGIN_DECLS #define NM_IS_MODEM_OLD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_MODEM_OLD)) #define NM_MODEM_OLD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MODEM_OLD, NMModemOldClass)) -typedef enum { - NM_MODEM_STATE_UNKNOWN = 0, - NM_MODEM_STATE_DISABLED = 10, - NM_MODEM_STATE_DISABLING = 20, - NM_MODEM_STATE_ENABLING = 30, - NM_MODEM_STATE_ENABLED = 40, - NM_MODEM_STATE_SEARCHING = 50, - NM_MODEM_STATE_REGISTERED = 60, - NM_MODEM_STATE_DISCONNECTING = 70, - NM_MODEM_STATE_CONNECTING = 80, - NM_MODEM_STATE_CONNECTED = 90, - - NM_MODEM_STATE_LAST = NM_MODEM_STATE_CONNECTED -} NMModemState; - typedef struct { NMModem parent; } NMModemOld;