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.

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;