diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mm-generic-gsm.h | 1 | ||||
| -rw-r--r-- | src/mm-modem-gsm-network.c | 52 | ||||
| -rw-r--r-- | src/mm-modem-gsm-network.h | 46 | ||||
| -rw-r--r-- | src/mm-modem-gsm.h | 57 |
5 files changed, 111 insertions, 46 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b8374fef..d1e3091e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,6 +35,7 @@ modem_manager_SOURCES = \ mm-generic-gsm.h \ mm-modem-cdma.c \ mm-modem-cdma.h \ + mm-modem-gsm.h \ mm-modem-gsm-card.c \ mm-modem-gsm-card.h \ mm-modem-gsm-network.c \ diff --git a/src/mm-generic-gsm.h b/src/mm-generic-gsm.h index d43ba53e..d0df846c 100644 --- a/src/mm-generic-gsm.h +++ b/src/mm-generic-gsm.h @@ -3,6 +3,7 @@ #ifndef MM_GENERIC_GSM_H #define MM_GENERIC_GSM_H +#include "mm-modem-gsm.h" #include "mm-modem-gsm-network.h" #include "mm-modem-base.h" #include "mm-serial-port.h" diff --git a/src/mm-modem-gsm-network.c b/src/mm-modem-gsm-network.c index c302dead..2bf75236 100644 --- a/src/mm-modem-gsm-network.c +++ b/src/mm-modem-gsm-network.c @@ -23,14 +23,14 @@ static void impl_gsm_modem_get_signal_quality (MMModemGsmNetwork *modem, DBusGMethodInvocation *context); static void impl_gsm_modem_set_band (MMModemGsmNetwork *modem, - MMModemGsmNetworkBand band, + MMModemGsmBand band, DBusGMethodInvocation *context); static void impl_gsm_modem_get_band (MMModemGsmNetwork *modem, DBusGMethodInvocation *context); static void impl_gsm_modem_set_network_mode (MMModemGsmNetwork *modem, - MMModemGsmNetworkMode mode, + MMModemGsmMode mode, DBusGMethodInvocation *context); static void impl_gsm_modem_get_network_mode (MMModemGsmNetwork *modem, @@ -264,7 +264,7 @@ mm_modem_gsm_network_get_signal_quality (MMModemGsmNetwork *self, void mm_modem_gsm_network_set_band (MMModemGsmNetwork *self, - MMModemGsmNetworkBand band, + MMModemGsmBand band, MMModemFn callback, gpointer user_data) { @@ -293,7 +293,7 @@ mm_modem_gsm_network_get_band (MMModemGsmNetwork *self, void mm_modem_gsm_network_set_mode (MMModemGsmNetwork *self, - MMModemGsmNetworkMode mode, + MMModemGsmMode mode, MMModemFn callback, gpointer user_data) { @@ -358,7 +358,7 @@ mm_modem_gsm_network_registration_info (MMModemGsmNetwork *self, void mm_modem_gsm_network_mode (MMModemGsmNetwork *self, - MMModemGsmNetworkMode mode) + MMModemGsmMode mode) { g_return_if_fail (MM_IS_MODEM_GSM_NETWORK (self)); @@ -406,11 +406,39 @@ impl_gsm_modem_get_signal_quality (MMModemGsmNetwork *modem, mm_modem_gsm_network_get_signal_quality (modem, uint_call_done, context); } +static gboolean +check_for_single_value (guint32 value) +{ + gboolean found = FALSE; + guint32 i; + + for (i = 1; i <= 32; i++) { + if (value & 0x1) { + if (found) + return FALSE; /* More than one bit set */ + found = TRUE; + } + value >>= 1; + } + + return TRUE; +} + static void impl_gsm_modem_set_band (MMModemGsmNetwork *modem, - MMModemGsmNetworkBand band, + MMModemGsmBand band, DBusGMethodInvocation *context) { + if (!check_for_single_value (band)) { + GError *error; + + error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, + "Invalid arguments (more than one value given)"); + dbus_g_method_return_error (context, error); + g_error_free (error); + return; + } + mm_modem_gsm_network_set_band (modem, band, async_call_done, context); } @@ -423,9 +451,19 @@ impl_gsm_modem_get_band (MMModemGsmNetwork *modem, static void impl_gsm_modem_set_network_mode (MMModemGsmNetwork *modem, - MMModemGsmNetworkMode mode, + MMModemGsmMode mode, DBusGMethodInvocation *context) { + if (!check_for_single_value (mode)) { + GError *error; + + error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, + "Invalid arguments (more than one value given)"); + dbus_g_method_return_error (context, error); + g_error_free (error); + return; + } + mm_modem_gsm_network_set_mode (modem, mode, async_call_done, context); } diff --git a/src/mm-modem-gsm-network.h b/src/mm-modem-gsm-network.h index e838dc85..5ffa7cd1 100644 --- a/src/mm-modem-gsm-network.h +++ b/src/mm-modem-gsm-network.h @@ -4,6 +4,7 @@ #define MM_MODEM_GSM_NETWORK_H #include <mm-modem.h> +#include <mm-modem-gsm.h> #define MM_TYPE_MODEM_GSM_NETWORK (mm_modem_gsm_network_get_type ()) #define MM_MODEM_GSM_NETWORK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_GSM_NETWORK, MMModemGsmNetwork)) @@ -11,39 +12,6 @@ #define MM_MODEM_GSM_NETWORK_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_MODEM_GSM_NETWORK, MMModemGsmNetwork)) typedef enum { - MM_MODEM_GSM_NETWORK_MODE_ANY = 0, - MM_MODEM_GSM_NETWORK_MODE_GPRS = 1, - MM_MODEM_GSM_NETWORK_MODE_EDGE = 2, - MM_MODEM_GSM_NETWORK_MODE_UMTS = 3, - MM_MODEM_GSM_NETWORK_MODE_HSDPA = 4, - MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED = 5, - MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED = 6, - MM_MODEM_GSM_NETWORK_MODE_2G_ONLY = 7, - MM_MODEM_GSM_NETWORK_MODE_3G_ONLY = 8, - MM_MODEM_GSM_NETWORK_MODE_HSUPA = 9, - MM_MODEM_GSM_NETWORK_MODE_HSPA = 10, - - MM_MODEM_GSM_NETWORK_MODE_LAST = MM_MODEM_GSM_NETWORK_MODE_HSPA -} MMModemGsmNetworkMode; - -typedef enum { - MM_MODEM_GSM_NETWORK_BAND_ANY = 0, - MM_MODEM_GSM_NETWORK_BAND_EGSM = 1, /* 900 MHz */ - MM_MODEM_GSM_NETWORK_BAND_DCS = 2, /* 1800 MHz */ - MM_MODEM_GSM_NETWORK_BAND_PCS = 3, /* 1900 MHz */ - MM_MODEM_GSM_NETWORK_BAND_G850 = 4, /* 850 MHz */ - MM_MODEM_GSM_NETWORK_BAND_U2100 = 5, /* WCDMA 2100 MHz (Class I) */ - MM_MODEM_GSM_NETWORK_BAND_U1700 = 6, /* WCDMA 3GPP UMTS1800 MHz (Class III) */ - MM_MODEM_GSM_NETWORK_BAND_17IV = 7, /* WCDMA 3GPP AWS 1700/2100 MHz (Class IV) */ - MM_MODEM_GSM_NETWORK_BAND_U800 = 8, /* WCDMA 3GPP UMTS800 MHz (Class VI) */ - MM_MODEM_GSM_NETWORK_BAND_U850 = 9, /* WCDMA 3GPP UMTS850 MHz (Class V) */ - MM_MODEM_GSM_NETWORK_BAND_U900 = 10, /* WCDMA 3GPP UMTS900 MHz (Class VIII) */ - MM_MODEM_GSM_NETWORK_BAND_U17IX = 11, /* WCDMA 3GPP UMTS MHz (Class IX) */ - - MM_MODEM_GSM_NETWORK_BAND_LAST = MM_MODEM_GSM_NETWORK_BAND_U17IX -} MMModemGsmNetworkBand; - -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, @@ -90,7 +58,7 @@ struct _MMModemGsmNetwork { gpointer user_data); void (*set_band) (MMModemGsmNetwork *self, - MMModemGsmNetworkBand band, + MMModemGsmBand band, MMModemFn callback, gpointer user_data); @@ -99,7 +67,7 @@ struct _MMModemGsmNetwork { gpointer user_data); void (*set_network_mode) (MMModemGsmNetwork *self, - MMModemGsmNetworkMode mode, + MMModemGsmMode mode, MMModemFn callback, gpointer user_data); @@ -121,7 +89,7 @@ struct _MMModemGsmNetwork { const char *oper_name); void (*network_mode) (MMModemGsmNetwork *self, - MMModemGsmNetworkMode mode); + MMModemGsmMode mode); }; GType mm_modem_gsm_network_get_type (void); @@ -145,7 +113,7 @@ void mm_modem_gsm_network_get_signal_quality (MMModemGsmNetwork *self, gpointer user_data); void mm_modem_gsm_network_set_band (MMModemGsmNetwork *self, - MMModemGsmNetworkBand band, + MMModemGsmBand band, MMModemFn callback, gpointer user_data); @@ -154,7 +122,7 @@ void mm_modem_gsm_network_get_band (MMModemGsmNetwork *self, gpointer user_data); void mm_modem_gsm_network_set_mode (MMModemGsmNetwork *self, - MMModemGsmNetworkMode mode, + MMModemGsmMode mode, MMModemFn callback, gpointer user_data); @@ -177,6 +145,6 @@ void mm_modem_gsm_network_registration_info (MMModemGsmNetwork *self, const char *oper_name); void mm_modem_gsm_network_mode (MMModemGsmNetwork *self, - MMModemGsmNetworkMode mode); + MMModemGsmMode mode); #endif /* MM_MODEM_GSM_NETWORK_H */ diff --git a/src/mm-modem-gsm.h b/src/mm-modem-gsm.h new file mode 100644 index 00000000..852ff853 --- /dev/null +++ b/src/mm-modem-gsm.h @@ -0,0 +1,57 @@ +/* -*- 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_LAST = MM_MODEM_GSM_MODE_HSPA +} MMModemGsmMode; + +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_LAST = MM_MODEM_GSM_BAND_U17IX +} MMModemGsmBand; + + +#endif /* MM_MODEM_GSM_H */ + |