diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-08-05 13:03:59 -0400 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-08-05 13:03:59 -0400 |
| commit | 2d194a5798fb06f41b018c2d8c2216f45bfc41a4 (patch) | |
| tree | 42b523b7c667092dd4e02f30443d3d585e45a621 /plugins/mm-modem-option.c | |
| parent | 356f8f097e5fe012ac762157c903bd9b51fa982d (diff) | |
gsm: harmonize band/mode enums
Use the same enum for set/get of band and mode, as for exposing the
device's capabilities.
Diffstat (limited to 'plugins/mm-modem-option.c')
| -rw-r--r-- | plugins/mm-modem-option.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/plugins/mm-modem-option.c b/plugins/mm-modem-option.c index f0a3bcbf..b325aec9 100644 --- a/plugins/mm-modem-option.c +++ b/plugins/mm-modem-option.c @@ -112,20 +112,20 @@ get_network_mode_done (MMSerialPort *port, int a, b; if (sscanf (response->str + 8, "%d,%d", &a, &b)) { - MMModemGsmNetworkMode mode = MM_MODEM_GSM_NETWORK_MODE_ANY; + MMModemGsmMode mode = MM_MODEM_GSM_MODE_ANY; switch (a) { case 0: - mode = MM_MODEM_GSM_NETWORK_MODE_2G_ONLY; + mode = MM_MODEM_GSM_MODE_2G_ONLY; break; case 1: - mode = MM_MODEM_GSM_NETWORK_MODE_3G_ONLY; + mode = MM_MODEM_GSM_MODE_3G_ONLY; break; case 2: - mode = MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED; + mode = MM_MODEM_GSM_MODE_2G_PREFERRED; break; case 3: - mode = MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED; + mode = MM_MODEM_GSM_MODE_3G_PREFERRED; break; default: break; @@ -173,7 +173,7 @@ set_network_mode_done (MMSerialPort *port, static void set_network_mode (MMModemGsmNetwork *modem, - MMModemGsmNetworkMode mode, + MMModemGsmMode mode, MMModemFn callback, gpointer user_data) { @@ -185,23 +185,23 @@ set_network_mode (MMModemGsmNetwork *modem, info = mm_callback_info_new (MM_MODEM (modem), callback, user_data); 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: + case MM_MODEM_GSM_MODE_ANY: + case MM_MODEM_GSM_MODE_GPRS: + case MM_MODEM_GSM_MODE_EDGE: + case MM_MODEM_GSM_MODE_2G_ONLY: i = 0; break; - 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: + case MM_MODEM_GSM_MODE_UMTS: + case MM_MODEM_GSM_MODE_HSDPA: + case MM_MODEM_GSM_MODE_HSUPA: + case MM_MODEM_GSM_MODE_HSPA: + case MM_MODEM_GSM_MODE_3G_ONLY: i = 1; break; - case MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED: + case MM_MODEM_GSM_MODE_2G_PREFERRED: i = 2; break; - case MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED: + case MM_MODEM_GSM_MODE_3G_PREFERRED: i = 3; break; default: |