diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-04-15 10:44:09 -0400 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-04-15 10:44:09 -0400 |
| commit | 58a48405cf95e3d74633ac4d5d4e0d4d0ab491f4 (patch) | |
| tree | afa94e97442323c16c47453fd9d8496e9bc6c0f4 /plugins/mm-modem-option.c | |
| parent | 8eb9fa50b40658d267da8763e7eef3680cad4b0b (diff) | |
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.
Diffstat (limited to 'plugins/mm-modem-option.c')
| -rw-r--r-- | plugins/mm-modem-option.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/plugins/mm-modem-option.c b/plugins/mm-modem-option.c index 8a587908..0c77c892 100644 --- a/plugins/mm-modem-option.c +++ b/plugins/mm-modem-option.c @@ -98,16 +98,16 @@ get_network_mode_done (MMSerial *serial, switch (a) { case 0: - mode = MM_MODEM_GSM_NETWORK_MODE_GPRS; + mode = MM_MODEM_GSM_NETWORK_MODE_2G_ONLY; break; case 1: - mode = MM_MODEM_GSM_NETWORK_MODE_3G; + mode = MM_MODEM_GSM_NETWORK_MODE_3G_ONLY; break; case 2: - mode = MM_MODEM_GSM_NETWORK_MODE_PREFER_2G; + mode = MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED; break; case 3: - mode = MM_MODEM_GSM_NETWORK_MODE_PREFER_3G; + mode = MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED; break; default: break; @@ -165,15 +165,21 @@ set_network_mode (MMModemGsmNetwork *modem, switch (mode) { case MM_MODEM_GSM_NETWORK_MODE_ANY: case MM_MODEM_GSM_NETWORK_MODE_GPRS: + case MM_MODEM_GSM_NETWORK_MODE_EDGE: + case MM_MODEM_GSM_NETWORK_MODE_2G_ONLY: i = 0; break; - case MM_MODEM_GSM_NETWORK_MODE_3G: + case MM_MODEM_GSM_NETWORK_MODE_UMTS: + case MM_MODEM_GSM_NETWORK_MODE_HSDPA: + case MM_MODEM_GSM_NETWORK_MODE_HSUPA: + case MM_MODEM_GSM_NETWORK_MODE_HSPA: + case MM_MODEM_GSM_NETWORK_MODE_3G_ONLY: i = 1; break; - case MM_MODEM_GSM_NETWORK_MODE_PREFER_2G: + case MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED: i = 2; break; - case MM_MODEM_GSM_NETWORK_MODE_PREFER_3G: + case MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED: i = 3; break; default: |