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

api: use common ModemManager.h for API, core and plugins

Browse Source
This commit is contained in:
Aleksander Morgado
2011-08-19 22:54:48 +02:00
parent c4a8291349
commit ea23851326
16 changed files with 113 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/Makefile.am
+61 -22
View File
@@ -12,7 +12,9 @@ libicera_utils_la_SOURCES = \
libicera_utils_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libicera_utils_la_LIBADD = \
$(GUDEV_LDFLAGS)
@@ -48,8 +50,10 @@ libmm_plugin_generic_la_SOURCES = \
libmm_plugin_generic_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
$(GUDEV_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_generic_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -66,8 +70,10 @@ libmm_plugin_moto_c_la_SOURCES = \
libmm_plugin_moto_c_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
$(GUDEV_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_moto_c_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -85,7 +91,9 @@ libmm_plugin_gobi_la_SOURCES = \
libmm_plugin_gobi_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_gobi_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -105,7 +113,9 @@ libmm_plugin_huawei_la_SOURCES = \
libmm_plugin_huawei_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_huawei_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -127,7 +137,9 @@ mm-modem-gsm-hso-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManage
libmm_plugin_hso_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_hso_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -145,7 +157,9 @@ libmm_plugin_mbm_la_SOURCES = \
libmm_plugin_mbm_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_mbm_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -163,7 +177,9 @@ libmm_plugin_option_la_SOURCES = \
libmm_plugin_option_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_option_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -183,7 +199,9 @@ libmm_plugin_sierra_la_SOURCES = \
libmm_plugin_sierra_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_sierra_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -201,7 +219,9 @@ libmm_plugin_wavecom_la_SOURCES = \
libmm_plugin_wavecom_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_wavecom_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -221,8 +241,9 @@ libmm_plugin_novatel_la_SOURCES = \
libmm_plugin_novatel_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)
-I$(top_srcdir)/include
libmm_plugin_novatel_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -240,7 +261,9 @@ libmm_plugin_nokia_la_SOURCES = \
libmm_plugin_nokia_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_nokia_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -258,7 +281,9 @@ libmm_plugin_zte_la_SOURCES = \
libmm_plugin_zte_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_zte_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -279,7 +304,9 @@ libmm_plugin_longcheer_la_SOURCES = \
libmm_plugin_longcheer_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_longcheer_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -297,7 +324,9 @@ libmm_plugin_anydata_la_SOURCES = \
libmm_plugin_anydata_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_anydata_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -315,7 +344,9 @@ libmm_plugin_simtech_la_SOURCES = \
libmm_plugin_simtech_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_simtech_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -333,7 +364,9 @@ libmm_plugin_x22x_la_SOURCES = \
libmm_plugin_x22x_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_x22x_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -351,7 +384,9 @@ libmm_plugin_linktop_la_SOURCES = \
libmm_plugin_linktop_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_linktop_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -369,7 +404,9 @@ libmm_plugin_samsung_la_SOURCES = \
libmm_plugin_samsung_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_samsung_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
@@ -390,7 +427,9 @@ libmm_plugin_cinterion_la_SOURCES = \
libmm_plugin_cinterion_la_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir)/src
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
libmm_plugin_cinterion_la_LDFLAGS = \
$(GUDEV_LDFLAGS) \
plugins/mm-modem-icera.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include <glib-object.h>
#include "mm-modem-gsm.h"
#include <ModemManager.h>
#include "mm-generic-gsm.h"
#define MM_TYPE_MODEM_ICERA (mm_modem_icera_get_type ())
src/Makefile.am
+3 -1
View File
@@ -13,7 +13,8 @@ EXTRA_DIST = \
noinst_LTLIBRARIES = libmodem-helpers.la libserial.la
libmodem_helpers_la_CPPFLAGS = \
$(MM_CFLAGS)
$(MM_CFLAGS) \
-I$(top_srcdir)/include
libmodem_helpers_la_SOURCES = \
mm-errors.c \
@@ -47,6 +48,7 @@ modem_manager_CPPFLAGS = \
$(MM_CFLAGS) \
$(GUDEV_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I${top_builddir}/marshallers \
-DPLUGINDIR=\"$(pkglibdir)\"
src/mm-generic-gsm.c
+7 -6
View File
@@ -3959,12 +3959,13 @@ _internal_update_access_technology (MMGenericGsm *modem,
g_return_if_fail (modem != NULL);
g_return_if_fail (MM_IS_GENERIC_GSM (modem));
g_return_if_fail (act >= MM_MODEM_GSM_ACCESS_TECH_UNKNOWN && act <= MM_MODEM_GSM_ACCESS_TECH_LAST);
g_return_if_fail (act >= MM_MODEM_GSM_ACCESS_TECH_UNKNOWN &&
act <= MM_MODEM_GSM_ACCESS_TECH_LTE);
priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
if (act != priv->act) {
MMModemDeprecatedMode old_mode;
MMModemGsmNetworkDeprecatedMode old_mode;
priv->act = act;
g_object_notify (G_OBJECT (modem), MM_MODEM_GSM_NETWORK_ACCESS_TECHNOLOGY);
@@ -4999,13 +5000,13 @@ simple_get_allowed_mode (MMCallbackInfo *info,
MMModemGsmAllowedMode *out_mode,
GError **error)
{
MMModemDeprecatedMode old_mode = MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY;
MMModemGsmNetworkDeprecatedMode old_mode = MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY;
MMModemGsmAllowedMode allowed_mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
GError *tmp_error = NULL;
/* check for new allowed mode first */
if (simple_get_uint_property (info, "allowed_mode", &allowed_mode, &tmp_error)) {
if (allowed_mode > MM_MODEM_GSM_ALLOWED_MODE_LAST) {
if (allowed_mode > MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY) {
g_set_error (&tmp_error, MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Invalid allowed mode %d", old_mode);
} else {
@@ -5015,7 +5016,7 @@ simple_get_allowed_mode (MMCallbackInfo *info,
} else if (!tmp_error) {
/* and if not, the old allowed mode */
if (simple_get_uint_property (info, "network_mode", &old_mode, &tmp_error)) {
if (old_mode > MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_LAST) {
if (old_mode > MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSPA) {
g_set_error (&tmp_error, MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Invalid allowed mode %d", old_mode);
} else {
@@ -5290,7 +5291,7 @@ simple_get_status (MMModemSimple *simple,
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (simple);
GHashTable *properties;
MMCallbackInfo *info;
MMModemDeprecatedMode old_mode;
MMModemGsmNetworkDeprecatedMode old_mode;
info = mm_callback_info_new_full (MM_MODEM (simple),
simple_get_status_invoke,
src/mm-generic-gsm.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include <config.h>
#include "mm-modem-gsm.h"
#include <ModemManager.h>
#include "mm-modem-gsm-network.h"
#include "mm-modem-base.h"
#include "mm-at-serial-port.h"
src/mm-modem-base.c
+6 -6
View File
@@ -682,27 +682,27 @@ mm_modem_base_init (MMModemBase *self)
mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_ENABLED,
NULL,
MM_MODEM_DBUS_INTERFACE);
MM_DBUS_INTERFACE_MODEM);
mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_EQUIPMENT_IDENTIFIER,
NULL,
MM_MODEM_DBUS_INTERFACE);
MM_DBUS_INTERFACE_MODEM);
mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_DEVICE_IDENTIFIER,
NULL,
MM_MODEM_DBUS_INTERFACE);
MM_DBUS_INTERFACE_MODEM);
mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_UNLOCK_REQUIRED,
NULL,
MM_MODEM_DBUS_INTERFACE);
MM_DBUS_INTERFACE_MODEM);
mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_UNLOCK_RETRIES,
NULL,
MM_MODEM_DBUS_INTERFACE);
MM_DBUS_INTERFACE_MODEM);
mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_IP_METHOD,
NULL,
MM_MODEM_DBUS_INTERFACE);
MM_DBUS_INTERFACE_MODEM);
}
static void
src/mm-modem-cdma.h
+1 -9
View File
@@ -17,17 +17,9 @@
#ifndef MM_MODEM_CDMA_H
#define MM_MODEM_CDMA_H
#include <ModemManager.h>
#include <mm-modem.h>
typedef enum {
MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN = 0,
MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED = 1,
MM_MODEM_CDMA_REGISTRATION_STATE_HOME = 2,
MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING = 3,
MM_MODEM_CDMA_REGISTRATION_STATE_LAST = MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING
} MMModemCdmaRegistrationState;
#define MM_TYPE_MODEM_CDMA (mm_modem_cdma_get_type ())
#define MM_MODEM_CDMA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_CDMA, MMModemCdma))
#define MM_IS_MODEM_CDMA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_CDMA))
src/mm-modem-gsm-card.c
+2 -1
View File
@@ -17,10 +17,11 @@
#include <dbus/dbus-glib.h>
#include <string.h>
#include <ModemManager.h>
#include "mm-modem-gsm-card.h"
#include "mm-errors.h"
#include "mm-callback-info.h"
#include "mm-modem-gsm.h"
static void impl_gsm_modem_get_imei (MMModemGsmCard *modem,
DBusGMethodInvocation *context);
src/mm-modem-gsm-network.c
+7 -7
View File
@@ -49,7 +49,7 @@ static void impl_gsm_modem_set_allowed_mode (MMModemGsmNetwork *modem,
DBusGMethodInvocation *context);
static void impl_gsm_modem_set_network_mode (MMModemGsmNetwork *modem,
MMModemDeprecatedMode old_mode,
MMModemGsmNetworkDeprecatedMode old_mode,
DBusGMethodInvocation *context);
static void impl_gsm_modem_get_network_mode (MMModemGsmNetwork *modem,
@@ -75,7 +75,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
/*****************************************************************************/
MMModemGsmAllowedMode
mm_modem_gsm_network_old_mode_to_allowed (MMModemDeprecatedMode old_mode)
mm_modem_gsm_network_old_mode_to_allowed (MMModemGsmNetworkDeprecatedMode old_mode)
{
/* Translate deprecated mode into new mode */
switch (old_mode) {
@@ -93,7 +93,7 @@ mm_modem_gsm_network_old_mode_to_allowed (MMModemDeprecatedMode old_mode)
}
}
MMModemDeprecatedMode
MMModemGsmNetworkDeprecatedMode
mm_modem_gsm_network_act_to_old_mode (MMModemGsmAccessTech act)
{
/* Translate new mode into old deprecated mode */
@@ -491,7 +491,7 @@ impl_gsm_modem_get_band (MMModemGsmNetwork *modem,
static void
impl_gsm_modem_set_network_mode (MMModemGsmNetwork *modem,
MMModemDeprecatedMode old_mode,
MMModemGsmNetworkDeprecatedMode old_mode,
DBusGMethodInvocation *context)
{
if (!utils_check_for_single_value (old_mode)) {
@@ -515,7 +515,7 @@ impl_gsm_modem_set_allowed_mode (MMModemGsmNetwork *modem,
MMModemGsmAllowedMode mode,
DBusGMethodInvocation *context)
{
if (mode > MM_MODEM_GSM_ALLOWED_MODE_LAST) {
if (mode > MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY) {
GError *error;
error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
@@ -566,7 +566,7 @@ mm_modem_gsm_network_init (gpointer g_iface)
"Allowed Mode",
"Allowed network access mode",
MM_MODEM_GSM_ALLOWED_MODE_ANY,
MM_MODEM_GSM_ALLOWED_MODE_LAST,
MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY,
MM_MODEM_GSM_ALLOWED_MODE_ANY,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@@ -577,7 +577,7 @@ mm_modem_gsm_network_init (gpointer g_iface)
"Current access technology in use when connected to "
"a mobile network.",
MM_MODEM_GSM_ACCESS_TECH_UNKNOWN,
MM_MODEM_GSM_ACCESS_TECH_LAST,
MM_MODEM_GSM_ACCESS_TECH_LTE,
MM_MODEM_GSM_ACCESS_TECH_UNKNOWN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
src/mm-modem-gsm-network.h
+3 -12
View File
@@ -17,8 +17,8 @@
#ifndef MM_MODEM_GSM_NETWORK_H
#define MM_MODEM_GSM_NETWORK_H
#include <ModemManager.h>
#include <mm-modem.h>
#include <mm-modem-gsm.h>
#define MM_MODEM_GSM_NETWORK_DBUS_INTERFACE "org.freedesktop.ModemManager.Modem.Gsm.Network"
@@ -37,15 +37,6 @@ typedef enum {
MM_MODEM_GSM_NETWORK_PROP_ACCESS_TECHNOLOGY,
} MMModemGsmNetworkProp;
typedef enum {
MM_MODEM_GSM_NETWORK_REG_STATUS_IDLE = 0,
MM_MODEM_GSM_NETWORK_REG_STATUS_HOME = 1,
MM_MODEM_GSM_NETWORK_REG_STATUS_SEARCHING = 2,
MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED = 3,
MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN = 4,
MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING = 5
} MMModemGsmNetworkRegStatus;
typedef struct _MMModemGsmNetwork MMModemGsmNetwork;
typedef void (*MMModemGsmNetworkScanFn) (MMModemGsmNetwork *self,
@@ -160,8 +151,8 @@ void mm_modem_gsm_network_registration_info (MMModemGsmNetwork *self,
const char *oper_name);
/* Private */
MMModemDeprecatedMode mm_modem_gsm_network_act_to_old_mode (MMModemGsmAccessTech act);
MMModemGsmNetworkDeprecatedMode mm_modem_gsm_network_act_to_old_mode (MMModemGsmAccessTech act);
MMModemGsmAllowedMode mm_modem_gsm_network_old_mode_to_allowed (MMModemDeprecatedMode old_mode);
MMModemGsmAllowedMode mm_modem_gsm_network_old_mode_to_allowed (MMModemGsmNetworkDeprecatedMode old_mode);
#endif /* MM_MODEM_GSM_NETWORK_H */
src/mm-modem-gsm.h
-99
View File
@@ -1,99 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details:
*
* Copyright (C) 2008 - 2009 Novell, Inc.
* Copyright (C) 2009 Red Hat, Inc.
*/
#ifndef MM_MODEM_GSM_H
#define MM_MODEM_GSM_H
typedef enum {
MM_MODEM_GSM_MODE_UNKNOWN = 0x00000000,
MM_MODEM_GSM_MODE_ANY = 0x00000001,
MM_MODEM_GSM_MODE_GPRS = 0x00000002,
MM_MODEM_GSM_MODE_EDGE = 0x00000004,
MM_MODEM_GSM_MODE_UMTS = 0x00000008,
MM_MODEM_GSM_MODE_HSDPA = 0x00000010,
MM_MODEM_GSM_MODE_2G_PREFERRED = 0x00000020,
MM_MODEM_GSM_MODE_3G_PREFERRED = 0x00000040,
MM_MODEM_GSM_MODE_2G_ONLY = 0x00000080,
MM_MODEM_GSM_MODE_3G_ONLY = 0x00000100,
MM_MODEM_GSM_MODE_HSUPA = 0x00000200,
MM_MODEM_GSM_MODE_HSPA = 0x00000400,
MM_MODEM_GSM_MODE_GSM = 0x00000800,
MM_MODEM_GSM_MODE_GSM_COMPACT = 0x00001000,
} MMModemGsmMode;
typedef enum {
MM_MODEM_GSM_ALLOWED_MODE_ANY = 0,
MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED = 1,
MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED = 2,
MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY = 3,
MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY = 4,
MM_MODEM_GSM_ALLOWED_MODE_LAST = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY
} MMModemGsmAllowedMode;
typedef enum {
MM_MODEM_GSM_ACCESS_TECH_UNKNOWN = 0,
MM_MODEM_GSM_ACCESS_TECH_GSM = 1,
MM_MODEM_GSM_ACCESS_TECH_GSM_COMPACT = 2,
MM_MODEM_GSM_ACCESS_TECH_GPRS = 3,
MM_MODEM_GSM_ACCESS_TECH_EDGE = 4, /* GSM w/EGPRS */
MM_MODEM_GSM_ACCESS_TECH_UMTS = 5, /* UTRAN */
MM_MODEM_GSM_ACCESS_TECH_HSDPA = 6, /* UTRAN w/HSDPA */
MM_MODEM_GSM_ACCESS_TECH_HSUPA = 7, /* UTRAN w/HSUPA */
MM_MODEM_GSM_ACCESS_TECH_HSPA = 8, /* UTRAN w/HSDPA and HSUPA */
MM_MODEM_GSM_ACCESS_TECH_HSPA_PLUS = 9, /* UTRAN w/HSPA+ */
MM_MODEM_GSM_ACCESS_TECH_LAST = MM_MODEM_GSM_ACCESS_TECH_HSPA_PLUS
} MMModemGsmAccessTech;
typedef enum {
MM_MODEM_GSM_BAND_UNKNOWN = 0x00000000,
MM_MODEM_GSM_BAND_ANY = 0x00000001,
MM_MODEM_GSM_BAND_EGSM = 0x00000002, /* 900 MHz */
MM_MODEM_GSM_BAND_DCS = 0x00000004, /* 1800 MHz */
MM_MODEM_GSM_BAND_PCS = 0x00000008, /* 1900 MHz */
MM_MODEM_GSM_BAND_G850 = 0x00000010, /* 850 MHz */
MM_MODEM_GSM_BAND_U2100 = 0x00000020, /* WCDMA 3GPP UMTS 2100 MHz (Class I) */
MM_MODEM_GSM_BAND_U1800 = 0x00000040, /* WCDMA 3GPP UMTS 1800 MHz (Class III) */
MM_MODEM_GSM_BAND_U17IV = 0x00000080, /* WCDMA 3GPP AWS 1700/2100 MHz (Class IV) */
MM_MODEM_GSM_BAND_U800 = 0x00000100, /* WCDMA 3GPP UMTS 800 MHz (Class VI) */
MM_MODEM_GSM_BAND_U850 = 0x00000200, /* WCDMA 3GPP UMTS 850 MHz (Class V) */
MM_MODEM_GSM_BAND_U900 = 0x00000400, /* WCDMA 3GPP UMTS 900 MHz (Class VIII) */
MM_MODEM_GSM_BAND_U17IX = 0x00000800, /* WCDMA 3GPP UMTS 1700 MHz (Class IX) */
MM_MODEM_GSM_BAND_U1900 = 0x00001000, /* WCDMA 3GPP UMTS 1900 MHz (Class II) */
MM_MODEM_GSM_BAND_U2600 = 0x00002000, /* WCDMA 3GPP UMTS 2600 MHz (Class VII, internal) */
MM_MODEM_GSM_BAND_LAST = MM_MODEM_GSM_BAND_U2600
} MMModemGsmBand;
typedef enum {
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY = 0,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_GPRS,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_EDGE,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_UMTS,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSDPA,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_PREFERRED,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_PREFERRED,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_ONLY,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_ONLY,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSUPA,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSPA,
MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_LAST = MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSPA
} MMModemDeprecatedMode;
#endif /* MM_MODEM_GSM_H */
src/mm-modem-helpers.h
+2 -1
View File
@@ -17,8 +17,9 @@
#ifndef MM_MODEM_HELPERS_H
#define MM_MODEM_HELPERS_H
#include <ModemManager.h>
#include "mm-modem-cdma.h"
#include "mm-modem-gsm.h"
#include "mm-charsets.h"
#define MM_SCAN_TAG_STATUS "status"
src/mm-modem-location.h
-9
View File
@@ -32,15 +32,6 @@
#define MM_MODEM_LOCATION_SIGNALS_LOCATION "signals-location"
#define MM_MODEM_LOCATION_LOCATION "location"
typedef enum {
MM_MODEM_LOCATION_CAPABILITY_UNKNOWN = 0x00000000,
MM_MODEM_LOCATION_CAPABILITY_GPS_NMEA = 0x00000001,
MM_MODEM_LOCATION_CAPABILITY_GSM_LAC_CI = 0x00000002,
MM_MODEM_LOCATION_CAPABILITY_GPS_RAW = 0x00000004,
MM_MODEM_LOCATION_CAPABILITY_LAST = MM_MODEM_LOCATION_CAPABILITY_GPS_RAW
} MMModemLocationCapabilities;
typedef struct _MMModemLocation MMModemLocation;
typedef void (*MMModemLocationGetFn) (MMModemLocation *modem,
src/mm-modem.c
+1 -1
View File
@@ -868,7 +868,7 @@ mm_modem_init (gpointer g_iface)
"State",
"State",
MM_MODEM_STATE_UNKNOWN,
MM_MODEM_STATE_LAST,
MM_MODEM_STATE_CONNECTED,
MM_MODEM_STATE_UNKNOWN,
G_PARAM_READWRITE));
src/mm-modem.h
+2 -31
View File
@@ -20,31 +20,12 @@
#include <glib-object.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <ModemManager.h>
#include "mm-port.h"
#include "mm-auth-provider.h"
#include "mm-charsets.h"
typedef enum {
MM_MODEM_STATE_UNKNOWN = 0,
MM_MODEM_STATE_DISABLED = 10,
MM_MODEM_STATE_DISABLING = 20,
MM_MODEM_STATE_ENABLING = 30,
MM_MODEM_STATE_ENABLED = 40,
MM_MODEM_STATE_SEARCHING = 50,
MM_MODEM_STATE_REGISTERED = 60,
MM_MODEM_STATE_DISCONNECTING = 70,
MM_MODEM_STATE_CONNECTING = 80,
MM_MODEM_STATE_CONNECTED = 90,
MM_MODEM_STATE_LAST = MM_MODEM_STATE_CONNECTED
} MMModemState;
typedef enum {
MM_MODEM_STATE_REASON_NONE = 0,
MM_MODEM_STATE_REASON_USER_REQUESTED,
MM_MODEM_STATE_REASON_SUSPEND
} MMModemStateReason;
#define DBUS_PATH_TAG "dbus-path"
#define MM_TYPE_MODEM (mm_modem_get_type ())
@@ -52,8 +33,6 @@ typedef enum {
#define MM_IS_MODEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM))
#define MM_MODEM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_MODEM, MMModem))
#define MM_MODEM_DBUS_INTERFACE "org.freedesktop.ModemManager.Modem"
#define MM_MODEM_DATA_DEVICE "device"
#define MM_MODEM_MASTER_DEVICE "master-device"
#define MM_MODEM_DRIVER "driver"
@@ -70,14 +49,6 @@ typedef enum {
#define MM_MODEM_HW_VID "hw-vid" /* not exported */
#define MM_MODEM_HW_PID "hw-pid" /* not exported */
#define MM_MODEM_TYPE_UNKNOWN 0
#define MM_MODEM_TYPE_GSM 1
#define MM_MODEM_TYPE_CDMA 2
#define MM_MODEM_IP_METHOD_PPP 0
#define MM_MODEM_IP_METHOD_STATIC 1
#define MM_MODEM_IP_METHOD_DHCP 2
typedef enum {
MM_MODEM_PROP_FIRST = 0x1000,
src/tests/Makefile.am
+16 -7
View File
@@ -1,5 +1,3 @@
INCLUDES = \
-I$(top_srcdir)/src
noinst_PROGRAMS = \
test-modem-helpers \
@@ -11,7 +9,10 @@ test_modem_helpers_SOURCES = \
test-modem-helpers.c
test_modem_helpers_CPPFLAGS = \
$(MM_CFLAGS)
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
test_modem_helpers_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -21,7 +22,10 @@ test_charsets_SOURCES = \
test-charsets.c
test_charsets_CPPFLAGS = \
$(MM_CFLAGS)
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
test_charsets_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -32,7 +36,9 @@ test_qcdm_serial_port_SOURCES = \
test_qcdm_serial_port_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \
@@ -44,8 +50,11 @@ test_qcdm_serial_port_LDADD = \
test_sms_SOURCES = \
test-sms.c
test_sms_CFLAGS = \
$(MM_CFLAGS)
test_sms_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
test_sms_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \