From 5e2983484e4ab3a594e63b03d34804d57c0dc292 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 8 Mar 2010 14:15:25 -0800 Subject: [PATCH] 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. --- introspection/mm-modem-gsm.xml | 7 +++++-- 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 @@ HSUPA (3G) - + + HSPA (3G) + + GSM - + GSM Compact 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;