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

mobile: rename old MM bits to clarify that they're for old ModemManager

Browse Source
This commit is contained in:
Dan Williams
2013-05-29 10:36:38 -05:00
parent db3ad9bc90
commit ab69e9bc2a
11 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@@ -124,13 +124,13 @@ nm_sources = \
\
modem-manager/nm-modem-cdma.c \
modem-manager/nm-modem-cdma.h \
modem-manager/nm-modem-generic.c \
modem-manager/nm-modem-generic.h \
modem-manager/nm-modem-old.c \
modem-manager/nm-modem-old.h \
modem-manager/nm-modem-old-types.h \
modem-manager/nm-modem-gsm.c \
modem-manager/nm-modem-gsm.h \
modem-manager/nm-modem-manager.c \
modem-manager/nm-modem-manager.h \
modem-manager/nm-modem-types.h \
modem-manager/nm-modem.c \
modem-manager/nm-modem.h \
\

4
src/modem-manager/README
View File

@@ -29,10 +29,10 @@ ModemManager 0.7 integration
ModemManager 0.4/0.5/0.6 integration
********************************************************************************
* nm-modem-types.h:
* nm-modem-old-types.h:
Defines helper types to use with the (old) ModemManager DBus API.
* nm-modem-generic.[h|c]:
* nm-modem-old.[h|c]:
Defines the `NMModemGeneric' object. All modem objects based on the old
ModemManager interface are subclasses of this one.

10
src/modem-manager/nm-modem-cdma.c
View File

@@ -26,7 +26,7 @@
#include "nm-dbus-glib-types.h"
#include "nm-modem-cdma.h"
#include "nm-modem-types.h"
#include "nm-modem-old-types.h"
#include "nm-enum-types.h"
#include "nm-device.h"
#include "nm-device-private.h"
@@ -37,7 +37,7 @@
#include "NetworkManagerUtils.h"
#include "nm-logging.h"
G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM_GENERIC)
G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM_OLD)
#define NM_MODEM_CDMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_CDMA, NMModemCdmaPrivate))
@@ -110,7 +110,7 @@ do_connect (NMModemCdma *self)
NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (self);
DBusGProxy *proxy;
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
priv->call = dbus_g_proxy_begin_call_with_timeout (proxy,
"Connect", stage1_prepare_done,
self, NULL, 120000,
@@ -178,7 +178,7 @@ act_stage1_prepare (NMModem *modem,
if (enabled)
do_connect (self);
else {
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (modem), MM_OLD_DBUS_INTERFACE_MODEM);
dbus_g_proxy_begin_call_with_timeout (proxy,
"Enable", stage1_enable_done,
modem, NULL, 20000,
@@ -293,7 +293,7 @@ deactivate (NMModem *modem, NMDevice *device)
if (priv->call) {
DBusGProxy *proxy;
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
dbus_g_proxy_cancel_call (proxy, priv->call);
priv->call = NULL;
}

6
src/modem-manager/nm-modem-cdma.h
View File

@@ -22,7 +22,7 @@
#ifndef NM_MODEM_CDMA_H
#define NM_MODEM_CDMA_H
#include <nm-modem-generic.h>
#include "nm-modem-old.h"
G_BEGIN_DECLS
@@ -40,11 +40,11 @@ typedef enum {
} NMCdmaError;
typedef struct {
NMModemGeneric parent;
NMModemOld parent;
} NMModemCdma;
typedef struct {
NMModemGenericClass parent;
NMModemOldClass parent;
} NMModemCdmaClass;
GType nm_modem_cdma_get_type (void);

12
src/modem-manager/nm-modem-gsm.c
View File

@@ -31,7 +31,7 @@
#include "nm-setting-connection.h"
#include "nm-setting-gsm.h"
#include "nm-setting-ppp.h"
#include "nm-modem-types.h"
#include "nm-modem-old-types.h"
#include "nm-enum-types.h"
#include "nm-logging.h"
#include "NetworkManagerUtils.h"
@@ -77,7 +77,7 @@ typedef enum {
MM_MODEM_GSM_ALLOWED_AUTH_LAST = MM_MODEM_GSM_ALLOWED_AUTH_EAP
} MMModemGsmAllowedAuth;
G_DEFINE_TYPE (NMModemGsm, nm_modem_gsm, NM_TYPE_MODEM_GENERIC)
G_DEFINE_TYPE (NMModemGsm, nm_modem_gsm, NM_TYPE_MODEM_OLD)
#define NM_MODEM_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_GSM, NMModemGsmPrivate))
@@ -224,7 +224,7 @@ do_connect (NMModemGsm *self)
NMModemGsmPrivate *priv = NM_MODEM_GSM_GET_PRIVATE (self);
DBusGProxy *proxy;
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
priv->call = dbus_g_proxy_begin_call_with_timeout (proxy,
"Connect", stage1_prepare_done,
self, NULL, 120000,
@@ -243,7 +243,7 @@ do_enable (NMModemGsm *self)
g_return_val_if_fail (NM_IS_MODEM_GSM (self), FALSE);
NM_MODEM_GSM_GET_PRIVATE (self)->enable_delay_id = 0;
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (self), MM_OLD_DBUS_INTERFACE_MODEM);
dbus_g_proxy_begin_call_with_timeout (proxy,
"Enable", stage1_enable_done,
self, NULL, 20000,
@@ -296,7 +296,7 @@ handle_enable_pin_required (NMModemGsm *self)
/* If we do, send it */
if (pin) {
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (self), MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD);
dbus_g_proxy_begin_call_with_timeout (proxy,
"SendPin", stage1_pin_done,
self, NULL, 10000,
@@ -569,7 +569,7 @@ deactivate (NMModem *modem, NMDevice *device)
if (priv->call) {
DBusGProxy *proxy;
proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
proxy = nm_modem_old_get_proxy (NM_MODEM_OLD (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE);
dbus_g_proxy_cancel_call (proxy, priv->call);
priv->call = NULL;
}

6
src/modem-manager/nm-modem-gsm.h
View File

@@ -22,7 +22,7 @@
#ifndef NM_MODEM_GSM_H
#define NM_MODEM_GSM_H
#include <nm-modem-generic.h>
#include "nm-modem-old.h"
G_BEGIN_DECLS
@@ -40,11 +40,11 @@ typedef enum {
} NMGsmError;
typedef struct {
NMModemGeneric parent;
NMModemOld parent;
} NMModemGsm;
typedef struct {
NMModemGenericClass parent;
NMModemOldClass parent;
} NMModemGsmClass;
GType nm_modem_gsm_get_type (void);

2
src/modem-manager/nm-modem-manager.c
View File

@@ -28,7 +28,7 @@
#include "nm-modem-gsm.h"
#include "nm-modem-cdma.h"
#include "nm-dbus-manager.h"
#include "nm-modem-types.h"
#include "nm-modem-old-types.h"
#include "nm-dbus-glib-types.h"
#if WITH_MODEM_MANAGER_1

6
src/modem-manager/nm-modem-types.h → src/modem-manager/nm-modem-old-types.h
View File

@@ -18,8 +18,8 @@
* Copyright (C) 2009 Novell, Inc.
*/
#ifndef NM_MODEM_TYPES_H
#define NM_MODEM_TYPES_H
#ifndef NM_MODEM_OLD_TYPES_H
#define NM_MODEM_OLD_TYPES_H
#define MM_OLD_DBUS_SERVICE "org.freedesktop.ModemManager"
#define MM_OLD_DBUS_PATH "/org/freedesktop/ModemManager"
@@ -51,4 +51,4 @@
#define MM_OLD_MODEM_ERROR_SIM_PUK MM_OLD_MODEM_ERROR ".SimPukRequired"
#define MM_OLD_MODEM_ERROR_SIM_WRONG MM_OLD_MODEM_ERROR ".SimWrong"
#endif /* NM_MODEM_TYPES_H */
#endif /* NM_MODEM_OLD_TYPES_H */

67
src/modem-manager/nm-modem-generic.c → src/modem-manager/nm-modem-old.c
View File

@@ -20,21 +20,21 @@
*/
#include <string.h>
#include "nm-modem-generic.h"
#include "nm-modem-old.h"
#include "nm-system.h"
#include "nm-dbus-manager.h"
#include "nm-setting-connection.h"
#include "nm-properties-changed-signal.h"
#include "nm-modem-types.h"
#include "nm-modem-old-types.h"
#include "nm-logging.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-dbus-glib-types.h"
#include "nm-glib-compat.h"
G_DEFINE_TYPE (NMModemGeneric, nm_modem_generic, NM_TYPE_MODEM)
G_DEFINE_TYPE (NMModemOld, nm_modem_old, NM_TYPE_MODEM)
#define NM_MODEM_GENERIC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_GENERIC, NMModemGenericPrivate))
#define NM_MODEM_OLD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_OLD, NMModemOldPrivate))
typedef struct {
DBusGProxy *proxy;
@@ -43,19 +43,18 @@ typedef struct {
DBusGProxyCall *call;
NMModemState state;
} NMModemGenericPrivate;
} NMModemOldPrivate;
/*****************************************************************************/
DBusGProxy *
nm_modem_generic_get_proxy (NMModemGeneric *self,
const char *interface)
nm_modem_old_get_proxy (NMModemOld *self, const char *interface)
{
NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
NMModemOldPrivate *priv = NM_MODEM_OLD_GET_PRIVATE (self);
const char *current_iface;
g_return_val_if_fail (NM_IS_MODEM_GENERIC (self), NULL);
g_return_val_if_fail (NM_IS_MODEM_OLD (self), NULL);
/* Default to the default interface. */
if (interface == NULL)
@@ -110,9 +109,9 @@ get_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d
}
static void
query_mm_enabled (NMModemGeneric *self)
query_mm_enabled (NMModemOld *self)
{
dbus_g_proxy_begin_call (NM_MODEM_GENERIC_GET_PRIVATE (self)->props_proxy,
dbus_g_proxy_begin_call (NM_MODEM_OLD_GET_PRIVATE (self)->props_proxy,
"Get", get_mm_enabled_done,
self, NULL,
G_TYPE_STRING, MM_OLD_DBUS_INTERFACE_MODEM,
@@ -132,7 +131,7 @@ set_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d
}
/* Update enabled/disabled state again */
query_mm_enabled (NM_MODEM_GENERIC (user_data));
query_mm_enabled (NM_MODEM_OLD (user_data));
}
static void
@@ -142,7 +141,7 @@ set_mm_enabled (NMModem *self, gboolean enabled)
* future we want to tie this into rfkill state instead so that the user can
* toggle rfkill status of the WWAN modem.
*/
dbus_g_proxy_begin_call (nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self),
dbus_g_proxy_begin_call (nm_modem_old_get_proxy (NM_MODEM_OLD (self),
MM_OLD_DBUS_INTERFACE_MODEM),
"Enable", set_mm_enabled_done,
self, NULL,
@@ -178,8 +177,8 @@ ip_address_to_string (guint32 numeric)
static void
static_stage3_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
{
NMModemGeneric *self = NM_MODEM_GENERIC (user_data);
NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
NMModemOld *self = NM_MODEM_OLD (user_data);
NMModemOldPrivate *priv = NM_MODEM_OLD_GET_PRIVATE (self);
GValueArray *ret_array = NULL;
GError *error = NULL;
NMIP4Config *config = NULL;
@@ -233,15 +232,15 @@ static_stage3_ip4_config_start (NMModem *self,
NMActRequest *req,
NMDeviceStateReason *reason)
{
NMModemGenericPrivate *priv;
NMModemOldPrivate *priv;
g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE);
g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NM_ACT_STAGE_RETURN_FAILURE);
g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
priv = NM_MODEM_OLD_GET_PRIVATE (self);
priv->call = dbus_g_proxy_begin_call (nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self),
priv->call = dbus_g_proxy_begin_call (nm_modem_old_get_proxy (NM_MODEM_OLD (self),
MM_OLD_DBUS_INTERFACE_MODEM),
"GetIP4Config", static_stage3_done,
self, NULL,
@@ -271,7 +270,7 @@ static void
disconnect (NMModem *self,
gboolean warn)
{
dbus_g_proxy_begin_call (nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self),
dbus_g_proxy_begin_call (nm_modem_old_get_proxy (NM_MODEM_OLD (self),
MM_OLD_DBUS_INTERFACE_MODEM),
"Disconnect",
disconnect_done,
@@ -285,12 +284,12 @@ disconnect (NMModem *self,
static void
deactivate (NMModem *self, NMDevice *device)
{
NMModemGenericPrivate *priv;
NMModemOldPrivate *priv;
g_assert (NM_IS_MODEM_GENERIC (self));
g_assert (NM_IS_MODEM_OLD (self));
g_assert (NM_IS_DEVICE (device));
priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
priv = NM_MODEM_OLD_GET_PRIVATE (self);
if (priv->call) {
dbus_g_proxy_cancel_call (priv->proxy, priv->call);
@@ -298,7 +297,7 @@ deactivate (NMModem *self, NMDevice *device)
}
/* Chain up parent's */
NM_MODEM_CLASS (nm_modem_generic_parent_class)->deactivate (self, device);
NM_MODEM_CLASS (nm_modem_old_parent_class)->deactivate (self, device);
}
/*****************************************************************************/
@@ -309,8 +308,8 @@ modem_properties_changed (DBusGProxy *proxy,
GHashTable *props,
gpointer user_data)
{
NMModemGeneric *self = NM_MODEM_GENERIC (user_data);
NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (self);
NMModemOld *self = NM_MODEM_OLD (user_data);
NMModemOldPrivate *priv = NM_MODEM_OLD_GET_PRIVATE (self);
GValue *value;
NMModemState new_state;
@@ -351,7 +350,7 @@ modem_properties_changed (DBusGProxy *proxy,
/*****************************************************************************/
static void
nm_modem_generic_init (NMModemGeneric *self)
nm_modem_old_init (NMModemOld *self)
{
}
@@ -361,14 +360,14 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
NMModemGenericPrivate *priv;
NMModemOldPrivate *priv;
DBusGConnection *bus;
object = G_OBJECT_CLASS (nm_modem_generic_parent_class)->constructor (type, n_construct_params, construct_params);
object = G_OBJECT_CLASS (nm_modem_old_parent_class)->constructor (type, n_construct_params, construct_params);
if (!object)
return NULL;
priv = NM_MODEM_GENERIC_GET_PRIVATE (object);
priv = NM_MODEM_OLD_GET_PRIVATE (object);
bus = nm_dbus_manager_get_connection (nm_dbus_manager_get ());
priv->proxy = dbus_g_proxy_new_for_name (bus,
@@ -392,7 +391,7 @@ constructor (GType type,
object,
NULL);
query_mm_enabled (NM_MODEM_GENERIC (object));
query_mm_enabled (NM_MODEM_OLD (object));
return object;
}
@@ -400,7 +399,7 @@ constructor (GType type,
static void
dispose (GObject *object)
{
NMModemGenericPrivate *priv = NM_MODEM_GENERIC_GET_PRIVATE (object);
NMModemOldPrivate *priv = NM_MODEM_OLD_GET_PRIVATE (object);
if (priv->proxy) {
g_object_unref (priv->proxy);
@@ -412,16 +411,16 @@ dispose (GObject *object)
priv->props_proxy = NULL;
}
G_OBJECT_CLASS (nm_modem_generic_parent_class)->dispose (object);
G_OBJECT_CLASS (nm_modem_old_parent_class)->dispose (object);
}
static void
nm_modem_generic_class_init (NMModemGenericClass *klass)
nm_modem_old_class_init (NMModemOldClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMModemClass *modem_class = NM_MODEM_CLASS (klass);
g_type_class_add_private (object_class, sizeof (NMModemGenericPrivate));
g_type_class_add_private (object_class, sizeof (NMModemOldPrivate));
/* Virtual methods */
object_class->constructor = constructor;

27
src/modem-manager/nm-modem-generic.h → src/modem-manager/nm-modem-old.h
View File

@@ -19,8 +19,8 @@
* Copyright (C) 2009 Novell, Inc.
*/
#ifndef NM_MODEM_GENERIC_H
#define NM_MODEM_GENERIC_H
#ifndef NM_MODEM_OLD_H
#define NM_MODEM_OLD_H
#include <dbus/dbus-glib.h>
#include <glib-object.h>
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
#define NM_TYPE_MODEM_GENERIC (nm_modem_generic_get_type ())
#define NM_MODEM_GENERIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_GENERIC, NMModemGeneric))
#define NM_MODEM_GENERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MODEM_GENERIC, NMModemGenericClass))
#define NM_IS_MODEM_GENERIC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_GENERIC))
#define NM_IS_MODEM_GENERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_MODEM_GENERIC))
#define NM_MODEM_GENERIC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MODEM_GENERIC, NMModemGenericClass))
#define NM_TYPE_MODEM_OLD (nm_modem_old_get_type ())
#define NM_MODEM_OLD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_OLD, NMModemOld))
#define NM_MODEM_OLD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MODEM_OLD, NMModemOldClass))
#define NM_IS_MODEM_OLD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_OLD))
#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,
@@ -52,18 +52,17 @@ typedef enum {
typedef struct {
NMModem parent;
} NMModemGeneric;
} NMModemOld;
typedef struct {
NMModemClass parent;
} NMModemGenericClass;
} NMModemOldClass;
GType nm_modem_generic_get_type (void);
GType nm_modem_old_get_type (void);
/* Protected */
DBusGProxy *nm_modem_generic_get_proxy (NMModemGeneric *modem,
const gchar *interface);
DBusGProxy *nm_modem_old_get_proxy (NMModemOld *modem, const gchar *interface);
G_END_DECLS
#endif /* NM_MODEM_GENERIC_H */
#endif /* NM_MODEM_OLD_H */

1
src/modem-manager/nm-modem.c
View File

@@ -26,7 +26,6 @@
#include "nm-dbus-manager.h"
#include "nm-setting-connection.h"
#include "nm-properties-changed-signal.h"
#include "nm-modem-types.h"
#include "nm-logging.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"