diff options
Diffstat (limited to 'src/mm-modem-gsm-network.h')
| -rw-r--r-- | src/mm-modem-gsm-network.h | 46 |
1 files changed, 7 insertions, 39 deletions
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 */ |