diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-08 14:15:25 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-08 14:15:25 -0800 |
| commit | 5e2983484e4ab3a594e63b03d34804d57c0dc292 (patch) | |
| tree | f943e4bb92419cf5fdcfd208d27980e4d1b2211d | |
| parent | 343245fc2179a6d05ba131771def84c84b1be639 (diff) | |
api: make HSPA a standalone network mode again
It's just easier this way. It makes little sense to allow
selecting mode combinations for anything other than
(HSDPA | HSUPA). Most radios don't allow fine-grained control
of the different technologies within each 2G or 3G class anyway
thus combinations like (GPRS | UMTS) are pointless since the
device wouldn't be able to use GPRS but not use EDGE.
| -rw-r--r-- | introspection/mm-modem-gsm.xml | 7 | ||||
| -rw-r--r-- | src/mm-modem-gsm.h | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/introspection/mm-modem-gsm.xml b/introspection/mm-modem-gsm.xml index 579899cc..f5def8ac 100644 --- a/introspection/mm-modem-gsm.xml +++ b/introspection/mm-modem-gsm.xml @@ -41,10 +41,13 @@ <tp:flag suffix="HSUPA" value="0x200"> <tp:docstring>HSUPA (3G)</tp:docstring> </tp:flag> - <tp:flag suffix="GSM" value="0x400"> + <tp:flag suffix="HSPA" value="0x400"> + <tp:docstring>HSPA (3G)</tp:docstring> + </tp:flag> + <tp:flag suffix="GSM" value="0x800"> <tp:docstring>GSM</tp:docstring> </tp:flag> - <tp:flag suffix="GSM_COMPACT" value="0x800"> + <tp:flag suffix="GSM_COMPACT" value="0x1000"> <tp:docstring>GSM Compact</tp:docstring> </tp:flag> </tp:flags> diff --git a/src/mm-modem-gsm.h b/src/mm-modem-gsm.h index cac7c65f..8f1155ec 100644 --- a/src/mm-modem-gsm.h +++ b/src/mm-modem-gsm.h @@ -29,9 +29,9 @@ typedef enum { 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 = 0x00000210, /* HSDPA + HSUPA */ - MM_MODEM_GSM_MODE_GSM = 0x00000400, - MM_MODEM_GSM_MODE_GSM_COMPACT = 0x00000800, + MM_MODEM_GSM_MODE_HSPA = 0x00000400, + MM_MODEM_GSM_MODE_GSM = 0x00000800, + MM_MODEM_GSM_MODE_GSM_COMPACT = 0x00001000, MM_MODEM_GSM_MODE_LAST = MM_MODEM_GSM_MODE_GSM_COMPACT } MMModemGsmMode; |