[PATCH v2 3/6] api: new MM_BAND_UTRAN_ enumerations for WCDMA bands
Aleksander Morgado
aleksander at aleksander.es
Mon Aug 21 10:39:21 UTC 2017
Flag as deprecated the old names, and define new ones based on the
defined UTRAN band numbers, equivalent to what was done for LTE bands.
---
docs/reference/api/ModemManager-sections.txt | 9 +++
include/ModemManager-compat.h | 90 ++++++++++++++++++++++++++++
include/ModemManager-enums.h | 58 +++++++++---------
3 files changed, 128 insertions(+), 29 deletions(-)
diff --git a/docs/reference/api/ModemManager-sections.txt b/docs/reference/api/ModemManager-sections.txt
index 1100be99..95a29375 100644
--- a/docs/reference/api/ModemManager-sections.txt
+++ b/docs/reference/api/ModemManager-sections.txt
@@ -70,6 +70,15 @@ MM_SERIAL_ERROR_DBUS_PREFIX
<SECTION>
<FILE>mm-compat</FILE>
+MM_MODEM_BAND_U2100
+MM_MODEM_BAND_U1900
+MM_MODEM_BAND_U1800
+MM_MODEM_BAND_U17IV
+MM_MODEM_BAND_U850
+MM_MODEM_BAND_U800
+MM_MODEM_BAND_U2600
+MM_MODEM_BAND_U900
+MM_MODEM_BAND_U17IX
MM_MODEM_BAND_EUTRAN_I
MM_MODEM_BAND_EUTRAN_II
MM_MODEM_BAND_EUTRAN_III
diff --git a/include/ModemManager-compat.h b/include/ModemManager-compat.h
index 9b67e075..c5772479 100644
--- a/include/ModemManager-compat.h
+++ b/include/ModemManager-compat.h
@@ -37,6 +37,96 @@
G_DEPRECATED
typedef int MMModemBandDeprecated;
+/**
+ * MM_MODEM_BAND_U2100:
+ *
+ * WCDMA 2100 MHz (UTRAN band 1).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_1 instead.
+ */
+#define MM_MODEM_BAND_U2100 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_1)
+
+/**
+ * MM_MODEM_BAND_U1900:
+ *
+ * WCDMA 1900 MHz (UTRAN band 2).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_2 instead.
+ */
+#define MM_MODEM_BAND_U1900 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_2)
+
+/**
+ * MM_MODEM_BAND_U1800:
+ *
+ * WCDMA 1800 MHz (UTRAN band 3).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_3 instead.
+ */
+#define MM_MODEM_BAND_U1800 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_3)
+
+/**
+ * MM_MODEM_BAND_U17IV:
+ *
+ * AWS 1700/2100 MHz (UTRAN band 4).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_4 instead.
+ */
+#define MM_MODEM_BAND_U17IV ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_4)
+
+/**
+ * MM_MODEM_BAND_U850:
+ *
+ * UMTS 850 MHz (UTRAN band 5).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_5 instead.
+ */
+#define MM_MODEM_BAND_U850 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_5)
+
+/**
+ * MM_MODEM_BAND_U800:
+ *
+ * UMTS 800 MHz (UTRAN band 6).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_6 instead.
+ */
+#define MM_MODEM_BAND_U800 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_6)
+
+/**
+ * MM_MODEM_BAND_U2600:
+ *
+ * UMTS 2600 MHz (UTRAN band 7).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_7 instead.
+ */
+#define MM_MODEM_BAND_U2600 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_7)
+
+/**
+ * MM_MODEM_BAND_U900:
+ *
+ * UMTS 900 MHz (UTRAN band 8).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_8 instead.
+ */
+#define MM_MODEM_BAND_U900 ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_8)
+
+/**
+ * MM_MODEM_BAND_U17IX:
+ *
+ * UMTS 1700 MHz (UTRAN band 9).
+ *
+ * Since: 1.0
+ * Deprecated: 1.8.0: Use #MM_MODEM_BAND_UTRAN_9 instead.
+ */
+#define MM_MODEM_BAND_U17IX ((MMModemBandDeprecated)MM_MODEM_BAND_UTRAN_9)
+
/**
* MM_MODEM_BAND_EUTRAN_I:
*
diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h
index 1aa784ba..650ac11b 100644
--- a/include/ModemManager-enums.h
+++ b/include/ModemManager-enums.h
@@ -256,15 +256,15 @@ typedef enum { /*< underscore_name=mm_modem_mode >*/
* @MM_MODEM_BAND_G410: GSM/GPRS/EDGE 410 MHz.
* @MM_MODEM_BAND_G710: GSM/GPRS/EDGE 710 MHz.
* @MM_MODEM_BAND_G810: GSM/GPRS/EDGE 810 MHz.
- * @MM_MODEM_BAND_U2100: WCDMA 2100 MHz (Class I).
- * @MM_MODEM_BAND_U1800: WCDMA 3GPP 1800 MHz (Class III).
- * @MM_MODEM_BAND_U17IV: WCDMA 3GPP AWS 1700/2100 MHz (Class IV).
- * @MM_MODEM_BAND_U800: WCDMA 3GPP UMTS 800 MHz (Class VI).
- * @MM_MODEM_BAND_U850: WCDMA 3GPP UMTS 850 MHz (Class V).
- * @MM_MODEM_BAND_U900: WCDMA 3GPP UMTS 900 MHz (Class VIII).
- * @MM_MODEM_BAND_U17IX: WCDMA 3GPP UMTS 1700 MHz (Class IX).
- * @MM_MODEM_BAND_U1900: WCDMA 3GPP UMTS 1900 MHz (Class II).
- * @MM_MODEM_BAND_U2600: WCDMA 3GPP UMTS 2600 MHz (Class VII, internal).
+ * @MM_MODEM_BAND_UTRAN_1: UMTS 2100 MHz (IMT, UTRAN band 1).
+ * @MM_MODEM_BAND_UTRAN_2: UMTS 1900 MHz (PCS A-F, UTRAN band 2).
+ * @MM_MODEM_BAND_UTRAN_3: UMTS 1800 MHz (DCS, UTRAN band 3).
+ * @MM_MODEM_BAND_UTRAN_4: UMTS 1700 MHz (AWS A-F, UTRAN band 4).
+ * @MM_MODEM_BAND_UTRAN_5: UMTS 850 MHz (CLR, UTRAN band 5).
+ * @MM_MODEM_BAND_UTRAN_6: UMTS 800 MHz (UTRAN band 6).
+ * @MM_MODEM_BAND_UTRAN_7: UMTS 2600 MHz (IMT-E, UTRAN band 7).
+ * @MM_MODEM_BAND_UTRAN_8: UMTS 900 MHz (E-GSM, UTRAN band 8).
+ * @MM_MODEM_BAND_UTRAN_9: UMTS 1700 MHz (UTRAN band 9).
* @MM_MODEM_BAND_EUTRAN_1: E-UTRAN band 1.
* @MM_MODEM_BAND_EUTRAN_2: E-UTRAN band 2.
* @MM_MODEM_BAND_EUTRAN_3: E-UTRAN band 3.
@@ -328,26 +328,26 @@ typedef enum { /*< underscore_name=mm_modem_mode >*/
typedef enum { /*< underscore_name=mm_modem_band >*/
MM_MODEM_BAND_UNKNOWN = 0,
/* GSM/UMTS bands */
- MM_MODEM_BAND_EGSM = 1,
- MM_MODEM_BAND_DCS = 2,
- MM_MODEM_BAND_PCS = 3,
- MM_MODEM_BAND_G850 = 4,
- MM_MODEM_BAND_U2100 = 5,
- MM_MODEM_BAND_U1800 = 6,
- MM_MODEM_BAND_U17IV = 7,
- MM_MODEM_BAND_U800 = 8,
- MM_MODEM_BAND_U850 = 9,
- MM_MODEM_BAND_U900 = 10,
- MM_MODEM_BAND_U17IX = 11,
- MM_MODEM_BAND_U1900 = 12,
- MM_MODEM_BAND_U2600 = 13,
- MM_MODEM_BAND_G450 = 14,
- MM_MODEM_BAND_G480 = 15,
- MM_MODEM_BAND_G750 = 16,
- MM_MODEM_BAND_G380 = 17,
- MM_MODEM_BAND_G410 = 18,
- MM_MODEM_BAND_G710 = 19,
- MM_MODEM_BAND_G810 = 20,
+ MM_MODEM_BAND_EGSM = 1,
+ MM_MODEM_BAND_DCS = 2,
+ MM_MODEM_BAND_PCS = 3,
+ MM_MODEM_BAND_G850 = 4,
+ MM_MODEM_BAND_UTRAN_1 = 5,
+ MM_MODEM_BAND_UTRAN_3 = 6,
+ MM_MODEM_BAND_UTRAN_4 = 7,
+ MM_MODEM_BAND_UTRAN_6 = 8,
+ MM_MODEM_BAND_UTRAN_5 = 9,
+ MM_MODEM_BAND_UTRAN_8 = 10,
+ MM_MODEM_BAND_UTRAN_9 = 11,
+ MM_MODEM_BAND_UTRAN_2 = 12,
+ MM_MODEM_BAND_UTRAN_7 = 13,
+ MM_MODEM_BAND_G450 = 14,
+ MM_MODEM_BAND_G480 = 15,
+ MM_MODEM_BAND_G750 = 16,
+ MM_MODEM_BAND_G380 = 17,
+ MM_MODEM_BAND_G410 = 18,
+ MM_MODEM_BAND_G710 = 19,
+ MM_MODEM_BAND_G810 = 20,
/* LTE bands */
MM_MODEM_BAND_EUTRAN_1 = 31,
MM_MODEM_BAND_EUTRAN_2 = 32,
--
2.14.1
More information about the ModemManager-devel
mailing list