gsm: clean up network modes

Add specific modes for HSUPA and HSPA; add modes for 2G and 3G only, and
update plugins to use the right modes.
This commit is contained in:
Dan Williams
2009-04-15 10:44:09 -04:00
parent 8eb9fa50b4
commit 58a48405cf
5 changed files with 94 additions and 39 deletions
+12 -8
View File
@@ -11,15 +11,19 @@
#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_3G = 3,
MM_MODEM_GSM_NETWORK_MODE_HSDPA = 4,
MM_MODEM_GSM_NETWORK_MODE_PREFER_2G = 5,
MM_MODEM_GSM_NETWORK_MODE_PREFER_3G = 6,
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_PREFER_3G
MM_MODEM_GSM_NETWORK_MODE_LAST = MM_MODEM_GSM_NETWORK_MODE_HSPA
} MMModemGsmNetworkMode;
typedef enum {