<div dir="ltr">I've a follow-up patch to add additional LTE bands, so hopefully we can migrate away from Roman numerals in those enums, which I found it a bit easier to make typo mistakes :)</div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Jun 22, 2017 at 6:08 PM, Ben Chan <<a href="mailto:benchan@chromium.org" target="_blank">benchan@chromium.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">3GPP TS 36.101 Table 5.5-1 refers the E-UTRA operating bands as 1, 2, 3, ..., etc. --- include/ModemManager-enums.h | 144 +++++++------- plugins/altair/mm-modem-helpers-altair-lte.c | 4 +- .../altair/tests/test-modem-helpers-altair-lte.c | 8 +- plugins/telit/mm-modem-helpers-telit.c | 6 +- plugins/telit/tests/test-mm-modem-helpers-telit.c | 24 +-- plugins/ublox/mm-modem-helpers-ublox.c | 20 +- plugins/ublox/tests/test-modem-helpers-ublox.c | 62 +++--- src/mm-modem-helpers-qmi.c | 211 ++++++++++----------- 8 files changed, 239 insertions(+), 240 deletions(-) diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h index c956573d..2ceb0e71 100644 --- a/include/ModemManager-enums.h +++ b/include/ModemManager-enums.h @@ -258,42 +258,42 @@ typedef enum { /*< underscore_name=mm_modem_mode >*/ * @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_EUTRAN_I: E-UTRAN band I. - * @MM_MODEM_BAND_EUTRAN_II: E-UTRAN band II. - * @MM_MODEM_BAND_EUTRAN_III: E-UTRAN band III. - * @MM_MODEM_BAND_EUTRAN_IV: E-UTRAN band IV. - * @MM_MODEM_BAND_EUTRAN_V: E-UTRAN band V. - * @MM_MODEM_BAND_EUTRAN_VI: E-UTRAN band VI. - * @MM_MODEM_BAND_EUTRAN_VII: E-UTRAN band VII. - * @MM_MODEM_BAND_EUTRAN_VIII: E-UTRAN band VIII. - * @MM_MODEM_BAND_EUTRAN_IX: E-UTRAN band IX. - * @MM_MODEM_BAND_EUTRAN_X: E-UTRAN band X. - * @MM_MODEM_BAND_EUTRAN_XI: E-UTRAN band XI. - * @MM_MODEM_BAND_EUTRAN_XII: E-UTRAN band XII. - * @MM_MODEM_BAND_EUTRAN_XIII: E-UTRAN band XIII. - * @MM_MODEM_BAND_EUTRAN_XIV: E-UTRAN band XIV. - * @MM_MODEM_BAND_EUTRAN_XVII: E-UTRAN band XVII. - * @MM_MODEM_BAND_EUTRAN_XVIII: E-UTRAN band XVIII. - * @MM_MODEM_BAND_EUTRAN_XIX: E-UTRAN band XIX. - * @MM_MODEM_BAND_EUTRAN_XX: E-UTRAN band XX. - * @MM_MODEM_BAND_EUTRAN_XXI: E-UTRAN band XXI. - * @MM_MODEM_BAND_EUTRAN_XXII: E-UTRAN band XXII. - * @MM_MODEM_BAND_EUTRAN_XXIII: E-UTRAN band XXIII. - * @MM_MODEM_BAND_EUTRAN_XXIV: E-UTRAN band XXIV. - * @MM_MODEM_BAND_EUTRAN_XXV: E-UTRAN band XXV. - * @MM_MODEM_BAND_EUTRAN_XXVI: E-UTRAN band XXVI. - * @MM_MODEM_BAND_EUTRAN_XXXIII: E-UTRAN band XXXIII. - * @MM_MODEM_BAND_EUTRAN_XXXIV: E-UTRAN band XXXIV. - * @MM_MODEM_BAND_EUTRAN_XXXV: E-UTRAN band XXXV. - * @MM_MODEM_BAND_EUTRAN_XXXVI: E-UTRAN band XXXVI. - * @MM_MODEM_BAND_EUTRAN_XXXVII: E-UTRAN band XXXVII. - * @MM_MODEM_BAND_EUTRAN_XXXVIII: E-UTRAN band XXXVIII. - * @MM_MODEM_BAND_EUTRAN_XXXIX: E-UTRAN band XXXIX. - * @MM_MODEM_BAND_EUTRAN_XL: E-UTRAN band XL. - * @MM_MODEM_BAND_EUTRAN_XLI: E-UTRAN band XLI. - * @MM_MODEM_BAND_EUTRAN_XLII: E-UTRAN band XLII. - * @MM_MODEM_BAND_EUTRAN_XLIII: E-UTRAN band XLIII. - * @MM_MODEM_BAND_EUTRAN_XLIV: E-UTRAN band XLIV. + * @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. + * @MM_MODEM_BAND_EUTRAN_4: E-UTRAN band 4. + * @MM_MODEM_BAND_EUTRAN_5: E-UTRAN band 5. + * @MM_MODEM_BAND_EUTRAN_6: E-UTRAN band 6. + * @MM_MODEM_BAND_EUTRAN_7: E-UTRAN band 7. + * @MM_MODEM_BAND_EUTRAN_8: E-UTRAN band 8. + * @MM_MODEM_BAND_EUTRAN_9: E-UTRAN band 9. + * @MM_MODEM_BAND_EUTRAN_10: E-UTRAN band 10. + * @MM_MODEM_BAND_EUTRAN_11: E-UTRAN band 11. + * @MM_MODEM_BAND_EUTRAN_12: E-UTRAN band 12. + * @MM_MODEM_BAND_EUTRAN_13: E-UTRAN band 13. + * @MM_MODEM_BAND_EUTRAN_14: E-UTRAN band 14. + * @MM_MODEM_BAND_EUTRAN_17: E-UTRAN band 17. + * @MM_MODEM_BAND_EUTRAN_18: E-UTRAN band 18. + * @MM_MODEM_BAND_EUTRAN_19: E-UTRAN band 19. + * @MM_MODEM_BAND_EUTRAN_20: E-UTRAN band 20. + * @MM_MODEM_BAND_EUTRAN_21: E-UTRAN band 21. + * @MM_MODEM_BAND_EUTRAN_22: E-UTRAN band 22. + * @MM_MODEM_BAND_EUTRAN_23: E-UTRAN band 23. + * @MM_MODEM_BAND_EUTRAN_24: E-UTRAN band 24. + * @MM_MODEM_BAND_EUTRAN_25: E-UTRAN band 25. + * @MM_MODEM_BAND_EUTRAN_26: E-UTRAN band 26. + * @MM_MODEM_BAND_EUTRAN_33: E-UTRAN band 33. + * @MM_MODEM_BAND_EUTRAN_34: E-UTRAN band 34. + * @MM_MODEM_BAND_EUTRAN_35: E-UTRAN band 35. + * @MM_MODEM_BAND_EUTRAN_36: E-UTRAN band 36. + * @MM_MODEM_BAND_EUTRAN_37: E-UTRAN band 37. + * @MM_MODEM_BAND_EUTRAN_38: E-UTRAN band 38. + * @MM_MODEM_BAND_EUTRAN_39: E-UTRAN band 39. + * @MM_MODEM_BAND_EUTRAN_40: E-UTRAN band 40. + * @MM_MODEM_BAND_EUTRAN_41: E-UTRAN band 41. + * @MM_MODEM_BAND_EUTRAN_42: E-UTRAN band 42. + * @MM_MODEM_BAND_EUTRAN_43: E-UTRAN band 43. + * @MM_MODEM_BAND_EUTRAN_44: E-UTRAN band 44. * @MM_MODEM_BAND_CDMA_BC0_CELLULAR_800: CDMA Band Class 0 (US Cellular 850MHz). * @MM_MODEM_BAND_CDMA_BC1_PCS_1900: CDMA Band Class 1 (US PCS 1900MHz). * @MM_MODEM_BAND_CDMA_BC2_TACS: CDMA Band Class 2 (UK TACS 900MHz). @@ -335,42 +335,42 @@ typedef enum { /*< underscore_name=mm_modem_band >*/ MM_MODEM_BAND_U1900 = 12, MM_MODEM_BAND_U2600 = 13, /* LTE bands */ - MM_MODEM_BAND_EUTRAN_I = 31, - MM_MODEM_BAND_EUTRAN_II = 32, - MM_MODEM_BAND_EUTRAN_III = 33, - MM_MODEM_BAND_EUTRAN_IV = 34, - MM_MODEM_BAND_EUTRAN_V = 35, - MM_MODEM_BAND_EUTRAN_VI = 36, - MM_MODEM_BAND_EUTRAN_VII = 37, - MM_MODEM_BAND_EUTRAN_VIII = 38, - MM_MODEM_BAND_EUTRAN_IX = 39, - MM_MODEM_BAND_EUTRAN_X = 40, - MM_MODEM_BAND_EUTRAN_XI = 41, - MM_MODEM_BAND_EUTRAN_XII = 42, - MM_MODEM_BAND_EUTRAN_XIII = 43, - MM_MODEM_BAND_EUTRAN_XIV = 44, - MM_MODEM_BAND_EUTRAN_XVII = 47, - MM_MODEM_BAND_EUTRAN_XVIII = 48, - MM_MODEM_BAND_EUTRAN_XIX = 49, - MM_MODEM_BAND_EUTRAN_XX = 50, - MM_MODEM_BAND_EUTRAN_XXI = 51, - MM_MODEM_BAND_EUTRAN_XXII = 52, - MM_MODEM_BAND_EUTRAN_XXIII = 53, - MM_MODEM_BAND_EUTRAN_XXIV = 54, - MM_MODEM_BAND_EUTRAN_XXV = 55, - MM_MODEM_BAND_EUTRAN_XXVI = 56, - MM_MODEM_BAND_EUTRAN_XXXIII = 63, - MM_MODEM_BAND_EUTRAN_XXXIV = 64, - MM_MODEM_BAND_EUTRAN_XXXV = 65, - MM_MODEM_BAND_EUTRAN_XXXVI = 66, - MM_MODEM_BAND_EUTRAN_XXXVII = 67, - MM_MODEM_BAND_EUTRAN_XXXVIII = 68, - MM_MODEM_BAND_EUTRAN_XXXIX = 69, - MM_MODEM_BAND_EUTRAN_XL = 70, - MM_MODEM_BAND_EUTRAN_XLI = 71, - MM_MODEM_BAND_EUTRAN_XLII = 72, - MM_MODEM_BAND_EUTRAN_XLIII = 73, - MM_MODEM_BAND_EUTRAN_XLIV = 74, + MM_MODEM_BAND_EUTRAN_1 = 31, + MM_MODEM_BAND_EUTRAN_2 = 32, + MM_MODEM_BAND_EUTRAN_3 = 33, + MM_MODEM_BAND_EUTRAN_4 = 34, + MM_MODEM_BAND_EUTRAN_5 = 35, + MM_MODEM_BAND_EUTRAN_6 = 36, + MM_MODEM_BAND_EUTRAN_7 = 37, + MM_MODEM_BAND_EUTRAN_8 = 38, + MM_MODEM_BAND_EUTRAN_9 = 39, + MM_MODEM_BAND_EUTRAN_10 = 40, + MM_MODEM_BAND_EUTRAN_11 = 41, + MM_MODEM_BAND_EUTRAN_12 = 42, + MM_MODEM_BAND_EUTRAN_13 = 43, + MM_MODEM_BAND_EUTRAN_14 = 44, + MM_MODEM_BAND_EUTRAN_17 = 47, + MM_MODEM_BAND_EUTRAN_18 = 48, + MM_MODEM_BAND_EUTRAN_19 = 49, + MM_MODEM_BAND_EUTRAN_20 = 50, + MM_MODEM_BAND_EUTRAN_21 = 51, + MM_MODEM_BAND_EUTRAN_22 = 52, + MM_MODEM_BAND_EUTRAN_23 = 53, + MM_MODEM_BAND_EUTRAN_24 = 54, + MM_MODEM_BAND_EUTRAN_25 = 55, + MM_MODEM_BAND_EUTRAN_26 = 56, + MM_MODEM_BAND_EUTRAN_33 = 63, + MM_MODEM_BAND_EUTRAN_34 = 64, + MM_MODEM_BAND_EUTRAN_35 = 65, + MM_MODEM_BAND_EUTRAN_36 = 66, + MM_MODEM_BAND_EUTRAN_37 = 67, + MM_MODEM_BAND_EUTRAN_38 = 68, + MM_MODEM_BAND_EUTRAN_39 = 69, + MM_MODEM_BAND_EUTRAN_40 = 70, + MM_MODEM_BAND_EUTRAN_41 = 71, + MM_MODEM_BAND_EUTRAN_42 = 72, + MM_MODEM_BAND_EUTRAN_43 = 73, + MM_MODEM_BAND_EUTRAN_44 = 74, /* CDMA Band Classes (see 3GPP2 C.S0057-C) */ MM_MODEM_BAND_CDMA_BC0_CELLULAR_800 = 128, MM_MODEM_BAND_CDMA_BC1_PCS_1900 = 129, diff --git a/plugins/altair/mm-modem-helpers-altair-lte.c b/plugins/altair/mm-modem-helpers-altair-lte.c index 3e52ee9c..ce652d1b 100644 --- a/plugins/altair/mm-modem-helpers-altair-lte.c +++ b/plugins/altair/mm-modem-helpers-altair-lte.c @@ -50,12 +50,12 @@ mm_altair_parse_bands_response (const gchar *response) MMModemBand band; band_value = (guint32)strtoul (split[i], NULL, 10); - band = MM_MODEM_BAND_EUTRAN_I - 1 + band_value; + band = MM_MODEM_BAND_EUTRAN_1 - 1 + band_value; /* Due to a firmware issue, the modem may incorrectly includes 0 in the * bands response. We thus ignore any band value outside the range of * E-UTRAN operating bands. */ - if (band >= MM_MODEM_BAND_EUTRAN_I && band <= MM_MODEM_BAND_EUTRAN_XLIV) + if (band >= MM_MODEM_BAND_EUTRAN_1 && band <= MM_MODEM_BAND_EUTRAN_44) g_array_append_val (bands, band); } diff --git a/plugins/altair/tests/test-modem-helpers-altair-lte.c b/plugins/altair/tests/test-modem-helpers-altair-lte.c index 4d038ce1..a4901cd6 100644 --- a/plugins/altair/tests/test-modem-helpers-altair-lte.c +++ b/plugins/altair/tests/test-modem-helpers-altair-lte.c @@ -43,10 +43,10 @@ test_parse_bands (void) bands = mm_altair_parse_bands_response ("0, 0, 1, 4,13,44,45"); g_assert (bands != NULL); g_assert_cmpuint (bands->len, ==, 4); - g_assert_cmpuint (g_array_index (bands, MMModemBand, 0), ==, MM_MODEM_BAND_EUTRAN_I); - g_assert_cmpuint (g_array_index (bands, MMModemBand, 1), ==, MM_MODEM_BAND_EUTRAN_IV); - g_assert_cmpuint (g_array_index (bands, MMModemBand, 2), ==, MM_MODEM_BAND_EUTRAN_XIII); - g_assert_cmpuint (g_array_index (bands, MMModemBand, 3), ==, MM_MODEM_BAND_EUTRAN_XLIV); + g_assert_cmpuint (g_array_index (bands, MMModemBand, 0), ==, MM_MODEM_BAND_EUTRAN_1); + g_assert_cmpuint (g_array_index (bands, MMModemBand, 1), ==, MM_MODEM_BAND_EUTRAN_4); + g_assert_cmpuint (g_array_index (bands, MMModemBand, 2), ==, MM_MODEM_BAND_EUTRAN_13); + g_assert_cmpuint (g_array_index (bands, MMModemBand, 3), ==, MM_MODEM_BAND_EUTRAN_44); g_array_free (bands, TRUE); } diff --git a/plugins/telit/mm-modem-helpers-telit.c b/plugins/telit/mm-modem-helpers-telit.c index 5a7ecb79..3b227044 100644 --- a/plugins/telit/mm-modem-helpers-telit.c +++ b/plugins/telit/mm-modem-helpers-telit.c @@ -57,8 +57,8 @@ mm_telit_get_band_flag (GArray *bands_array, } if (flag4g != NULL && - band >= MM_MODEM_BAND_EUTRAN_I && band <= MM_MODEM_BAND_EUTRAN_XLIV) { - mask4g += 1 << (band - MM_MODEM_BAND_EUTRAN_I); + band >= MM_MODEM_BAND_EUTRAN_1 && band <= MM_MODEM_BAND_EUTRAN_44) { + mask4g += 1 << (band - MM_MODEM_BAND_EUTRAN_1); found4g = TRUE; } } @@ -480,7 +480,7 @@ mm_telit_get_4g_mm_bands(GMatchInfo *match_info, for (i = 0; value > 0; i++) { if (value % 2 != 0) { - band = MM_MODEM_BAND_EUTRAN_I + i; + band = MM_MODEM_BAND_EUTRAN_1 + i; g_array_append_val (*bands, band); } value = value >> 1; diff --git a/plugins/telit/tests/test-mm-modem-helpers-telit.c b/plugins/telit/tests/test-mm-modem-helpers-telit.c index e42467ea..1a43846d 100644 --- a/plugins/telit/tests/test-mm-modem-helpers-telit.c +++ b/plugins/telit/tests/test-mm-modem-helpers-telit.c @@ -189,14 +189,14 @@ static BNDResponseTest supported_band_mapping_tests [] = { MM_MODEM_BAND_U2100, MM_MODEM_BAND_U850, MM_MODEM_BAND_U900, - MM_MODEM_BAND_EUTRAN_I} }, + MM_MODEM_BAND_EUTRAN_1} }, { "#BND: (0),(0),(1-3)", TRUE, TRUE, TRUE, 5, { MM_MODEM_BAND_EGSM, MM_MODEM_BAND_DCS, MM_MODEM_BAND_U2100, - MM_MODEM_BAND_EUTRAN_I, - MM_MODEM_BAND_EUTRAN_II} }, - { "#BND: (0),(0),(1-3)", FALSE, FALSE, TRUE, 2, { MM_MODEM_BAND_EUTRAN_I, - MM_MODEM_BAND_EUTRAN_II} }, + MM_MODEM_BAND_EUTRAN_1, + MM_MODEM_BAND_EUTRAN_2} }, + { "#BND: (0),(0),(1-3)", FALSE, FALSE, TRUE, 2, { MM_MODEM_BAND_EUTRAN_1, + MM_MODEM_BAND_EUTRAN_2} }, { NULL, FALSE, FALSE, FALSE, 0, {}}, }; @@ -261,17 +261,17 @@ static BNDResponseTest current_band_mapping_tests [] = { { "#BND: 3,0,1", TRUE, TRUE, TRUE, 4, { MM_MODEM_BAND_PCS, MM_MODEM_BAND_G850, MM_MODEM_BAND_U2100, - MM_MODEM_BAND_EUTRAN_I + MM_MODEM_BAND_EUTRAN_1 } }, { "#BND: 0,0,3", TRUE, FALSE, TRUE, 4, { MM_MODEM_BAND_EGSM, MM_MODEM_BAND_DCS, - MM_MODEM_BAND_EUTRAN_I, - MM_MODEM_BAND_EUTRAN_II + MM_MODEM_BAND_EUTRAN_1, + MM_MODEM_BAND_EUTRAN_2 } }, - { "#BND: 0,0,3", FALSE, FALSE, TRUE, 2, { MM_MODEM_BAND_EUTRAN_I, - MM_MODEM_BAND_EUTRAN_II + { "#BND: 0,0,3", FALSE, FALSE, TRUE, 2, { MM_MODEM_BAND_EUTRAN_1, + MM_MODEM_BAND_EUTRAN_2 } }, { NULL, FALSE, FALSE, FALSE, 0, {}}, @@ -471,8 +471,8 @@ static void test_telit_get_4g_bnd_flag (void) { GArray *bands_array; - MMModemBand eutran_i = MM_MODEM_BAND_EUTRAN_I; - MMModemBand eutran_ii = MM_MODEM_BAND_EUTRAN_II; + MMModemBand eutran_i = MM_MODEM_BAND_EUTRAN_1; + MMModemBand eutran_ii = MM_MODEM_BAND_EUTRAN_2; MMModemBand egsm = MM_MODEM_BAND_EGSM; gint flag = -1; diff --git a/plugins/ublox/mm-modem-helpers-ublox.c b/plugins/ublox/mm-modem-helpers-ublox.c index 96ac4702..bee1a8f0 100644 --- a/plugins/ublox/mm-modem-helpers-ublox.c +++ b/plugins/ublox/mm-modem-helpers-ublox.c @@ -552,55 +552,55 @@ typedef struct { static const BandConfiguration band_configuration[] = { { .ubandsel_value = 700, - .bands_4g = { MM_MODEM_BAND_EUTRAN_XIII, MM_MODEM_BAND_EUTRAN_XVII } + .bands_4g = { MM_MODEM_BAND_EUTRAN_13, MM_MODEM_BAND_EUTRAN_17 } }, { .ubandsel_value = 800, .bands_3g = { MM_MODEM_BAND_U800 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_XX } + .bands_4g = { MM_MODEM_BAND_EUTRAN_20 } }, { .ubandsel_value = 850, .bands_2g = { MM_MODEM_BAND_G850 }, .bands_3g = { MM_MODEM_BAND_U850 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_V } + .bands_4g = { MM_MODEM_BAND_EUTRAN_5 } }, { .ubandsel_value = 900, .bands_2g = { MM_MODEM_BAND_EGSM }, .bands_3g = { MM_MODEM_BAND_U900 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_VIII } + .bands_4g = { MM_MODEM_BAND_EUTRAN_8 } }, { .ubandsel_value = 1500, - .bands_4g = { MM_MODEM_BAND_EUTRAN_XI } + .bands_4g = { MM_MODEM_BAND_EUTRAN_11 } }, { .ubandsel_value = 1700, .bands_3g = { MM_MODEM_BAND_U17IV }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_IV } + .bands_4g = { MM_MODEM_BAND_EUTRAN_4 } }, { .ubandsel_value = 1800, .bands_2g = { MM_MODEM_BAND_DCS }, .bands_3g = { MM_MODEM_BAND_U1800 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_III } + .bands_4g = { MM_MODEM_BAND_EUTRAN_3 } }, { .ubandsel_value = 1900, .bands_2g = { MM_MODEM_BAND_PCS }, .bands_3g = { MM_MODEM_BAND_U1900 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_II } + .bands_4g = { MM_MODEM_BAND_EUTRAN_2 } }, { .ubandsel_value = 2100, .bands_3g = { MM_MODEM_BAND_U2100 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_I } + .bands_4g = { MM_MODEM_BAND_EUTRAN_1 } }, { .ubandsel_value = 2600, .bands_3g = { MM_MODEM_BAND_U2600 }, - .bands_4g = { MM_MODEM_BAND_EUTRAN_VII } + .bands_4g = { MM_MODEM_BAND_EUTRAN_7 } }, }; diff --git a/plugins/ublox/tests/test-modem-helpers-ublox.c b/plugins/ublox/tests/test-modem-helpers-ublox.c index 703e915b..286a58af 100644 --- a/plugins/ublox/tests/test-modem-helpers-ublox.c +++ b/plugins/ublox/tests/test-modem-helpers-ublox.c @@ -520,16 +520,16 @@ test_supported_bands_all (void) { /* All 2G, 3G and 4G bands */ const MMModemBand expected_bands[] = { - /* 700 */ MM_MODEM_BAND_EUTRAN_XIII, MM_MODEM_BAND_EUTRAN_XVII, - /* 800 */ MM_MODEM_BAND_U800, MM_MODEM_BAND_EUTRAN_XX, - /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_V, - /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_VIII, - /* 1500 */ MM_MODEM_BAND_EUTRAN_XI, - /* 1700 */ MM_MODEM_BAND_U17IV, MM_MODEM_BAND_EUTRAN_IV, - /* 1800 */ MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_III, - /* 1900 */ MM_MODEM_BAND_PCS, MM_MODEM_BAND_U1900, MM_MODEM_BAND_EUTRAN_II, - /* 2100 */ MM_MODEM_BAND_U2100, MM_MODEM_BAND_EUTRAN_I, - /* 2600 */ MM_MODEM_BAND_U2600, MM_MODEM_BAND_EUTRAN_VII, + /* 700 */ MM_MODEM_BAND_EUTRAN_13, MM_MODEM_BAND_EUTRAN_17, + /* 800 */ MM_MODEM_BAND_U800, MM_MODEM_BAND_EUTRAN_20, + /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_5, + /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_8, + /* 1500 */ MM_MODEM_BAND_EUTRAN_11, + /* 1700 */ MM_MODEM_BAND_U17IV, MM_MODEM_BAND_EUTRAN_4, + /* 1800 */ MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_3, + /* 1900 */ MM_MODEM_BAND_PCS, MM_MODEM_BAND_U1900, MM_MODEM_BAND_EUTRAN_2, + /* 2100 */ MM_MODEM_BAND_U2100, MM_MODEM_BAND_EUTRAN_1, + /* 2600 */ MM_MODEM_BAND_U2600, MM_MODEM_BAND_EUTRAN_7, }; common_validate_supported_bands (NULL, expected_bands, G_N_ELEMENTS (expected_bands)); @@ -540,16 +540,16 @@ test_supported_bands_toby_l201 (void) { /* Only 3G and 4G bands */ const MMModemBand expected_bands[] = { - /* 700 */ MM_MODEM_BAND_EUTRAN_XIII, MM_MODEM_BAND_EUTRAN_XVII, - /* 800 */ MM_MODEM_BAND_U800, MM_MODEM_BAND_EUTRAN_XX, - /* 850 */ MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_V, - /* 900 */ MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_VIII, - /* 1500 */ MM_MODEM_BAND_EUTRAN_XI, - /* 1700 */ MM_MODEM_BAND_U17IV, MM_MODEM_BAND_EUTRAN_IV, - /* 1800 */ MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_III, - /* 1900 */ MM_MODEM_BAND_U1900, MM_MODEM_BAND_EUTRAN_II, - /* 2100 */ MM_MODEM_BAND_U2100, MM_MODEM_BAND_EUTRAN_I, - /* 2600 */ MM_MODEM_BAND_U2600, MM_MODEM_BAND_EUTRAN_VII, + /* 700 */ MM_MODEM_BAND_EUTRAN_13, MM_MODEM_BAND_EUTRAN_17, + /* 800 */ MM_MODEM_BAND_U800, MM_MODEM_BAND_EUTRAN_20, + /* 850 */ MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_5, + /* 900 */ MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_8, + /* 1500 */ MM_MODEM_BAND_EUTRAN_11, + /* 1700 */ MM_MODEM_BAND_U17IV, MM_MODEM_BAND_EUTRAN_4, + /* 1800 */ MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_3, + /* 1900 */ MM_MODEM_BAND_U1900, MM_MODEM_BAND_EUTRAN_2, + /* 2100 */ MM_MODEM_BAND_U2100, MM_MODEM_BAND_EUTRAN_1, + /* 2600 */ MM_MODEM_BAND_U2600, MM_MODEM_BAND_EUTRAN_7, }; common_validate_supported_bands ("TOBY-L201", expected_bands, G_N_ELEMENTS (expected_bands)); @@ -627,10 +627,10 @@ static void test_ubandsel_response_four (void) { const MMModemBand expected_bands[] = { - /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_V, - /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_VIII, - /* 1800 */ MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_III, - /* 1900 */ MM_MODEM_BAND_PCS, MM_MODEM_BAND_U1900, MM_MODEM_BAND_EUTRAN_II, + /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_5, + /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_8, + /* 1800 */ MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_3, + /* 1900 */ MM_MODEM_BAND_PCS, MM_MODEM_BAND_U1900, MM_MODEM_BAND_EUTRAN_2, }; common_validate_ubandsel_response ("+UBANDSEL: 850,900,1800,1900\r\n", expected_bands, G_N_ELEMENTS (expected_bands)); @@ -640,9 +640,9 @@ static void test_ubandsel_response_three (void) { const MMModemBand expected_bands[] = { - /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_V, - /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_VIII, - /* 1800 */ MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_III, + /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_5, + /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_8, + /* 1800 */ MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_3, }; common_validate_ubandsel_response ("+UBANDSEL: 850,900,1800\r\n", expected_bands, G_N_ELEMENTS (expected_bands)); @@ -652,8 +652,8 @@ static void test_ubandsel_response_two (void) { const MMModemBand expected_bands[] = { - /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_V, - /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_VIII, + /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_5, + /* 900 */ MM_MODEM_BAND_EGSM, MM_MODEM_BAND_U900, MM_MODEM_BAND_EUTRAN_8, }; common_validate_ubandsel_response ("+UBANDSEL: 850,900\r\n", expected_bands, G_N_ELEMENTS (expected_bands)); @@ -663,7 +663,7 @@ static void test_ubandsel_response_one (void) { const MMModemBand expected_bands[] = { - /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_V, + /* 850 */ MM_MODEM_BAND_G850, MM_MODEM_BAND_U850, MM_MODEM_BAND_EUTRAN_5, }; common_validate_ubandsel_response ("+UBANDSEL: 850\r\n", expected_bands, G_N_ELEMENTS (expected_bands)); @@ -718,7 +718,7 @@ static void test_ubandsel_request_1800 (void) { const MMModemBand bands[] = { - MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_III + MM_MODEM_BAND_DCS, MM_MODEM_BAND_U1800, MM_MODEM_BAND_EUTRAN_3 }; common_validate_ubandsel_request (bands, G_N_ELEMENTS (bands), "+UBANDSEL=1800"); diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index 778ce9e7..de5b730b 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -258,45 +258,45 @@ typedef struct { } DmsLteBandsMap; static const DmsLteBandsMap dms_lte_bands_map [] = { - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_1, MM_MODEM_BAND_EUTRAN_I }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_2, MM_MODEM_BAND_EUTRAN_II }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_3, MM_MODEM_BAND_EUTRAN_III }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_4, MM_MODEM_BAND_EUTRAN_IV }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_5, MM_MODEM_BAND_EUTRAN_V }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_6, MM_MODEM_BAND_EUTRAN_VI }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_7, MM_MODEM_BAND_EUTRAN_VII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_8, MM_MODEM_BAND_EUTRAN_VIII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_9, MM_MODEM_BAND_EUTRAN_IX }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_10, MM_MODEM_BAND_EUTRAN_X }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_11, MM_MODEM_BAND_EUTRAN_XI }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_12, MM_MODEM_BAND_EUTRAN_XII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_13, MM_MODEM_BAND_EUTRAN_XIII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_14, MM_MODEM_BAND_EUTRAN_XIV }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_17, MM_MODEM_BAND_EUTRAN_XVII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_18, MM_MODEM_BAND_EUTRAN_XVIII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_19, MM_MODEM_BAND_EUTRAN_XIX }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_20, MM_MODEM_BAND_EUTRAN_XX }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_21, MM_MODEM_BAND_EUTRAN_XXI }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_24, MM_MODEM_BAND_EUTRAN_XXIV }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_25, MM_MODEM_BAND_EUTRAN_XXV }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_33, MM_MODEM_BAND_EUTRAN_XXXIII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_34, MM_MODEM_BAND_EUTRAN_XXXIV }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_35, MM_MODEM_BAND_EUTRAN_XXXV }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_36, MM_MODEM_BAND_EUTRAN_XXXVI }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_37, MM_MODEM_BAND_EUTRAN_XXXVII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_38, MM_MODEM_BAND_EUTRAN_XXXVIII }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_39, MM_MODEM_BAND_EUTRAN_XXXIX }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_40, MM_MODEM_BAND_EUTRAN_XL }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_41, MM_MODEM_BAND_EUTRAN_XLI }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_42, MM_MODEM_BAND_EUTRAN_XLI }, - { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_43, MM_MODEM_BAND_EUTRAN_XLIII } + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_1, MM_MODEM_BAND_EUTRAN_1 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_2, MM_MODEM_BAND_EUTRAN_2 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_3, MM_MODEM_BAND_EUTRAN_3 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_4, MM_MODEM_BAND_EUTRAN_4 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_5, MM_MODEM_BAND_EUTRAN_5 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_6, MM_MODEM_BAND_EUTRAN_6 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_7, MM_MODEM_BAND_EUTRAN_7 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_8, MM_MODEM_BAND_EUTRAN_8 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_9, MM_MODEM_BAND_EUTRAN_9 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_10, MM_MODEM_BAND_EUTRAN_10 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_11, MM_MODEM_BAND_EUTRAN_11 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_12, MM_MODEM_BAND_EUTRAN_12 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_13, MM_MODEM_BAND_EUTRAN_13 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_14, MM_MODEM_BAND_EUTRAN_14 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_17, MM_MODEM_BAND_EUTRAN_17 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_18, MM_MODEM_BAND_EUTRAN_18 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_19, MM_MODEM_BAND_EUTRAN_19 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_20, MM_MODEM_BAND_EUTRAN_20 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_21, MM_MODEM_BAND_EUTRAN_21 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_24, MM_MODEM_BAND_EUTRAN_24 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_25, MM_MODEM_BAND_EUTRAN_25 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_33, MM_MODEM_BAND_EUTRAN_33 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_34, MM_MODEM_BAND_EUTRAN_34 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_35, MM_MODEM_BAND_EUTRAN_35 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_36, MM_MODEM_BAND_EUTRAN_36 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_37, MM_MODEM_BAND_EUTRAN_37 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_38, MM_MODEM_BAND_EUTRAN_38 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_39, MM_MODEM_BAND_EUTRAN_39 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_40, MM_MODEM_BAND_EUTRAN_40 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_41, MM_MODEM_BAND_EUTRAN_41 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_42, MM_MODEM_BAND_EUTRAN_42 }, + { QMI_DMS_LTE_BAND_CAPABILITY_EUTRAN_43, MM_MODEM_BAND_EUTRAN_43 } /* NOTE. The following bands were unmatched: * - * - MM_MODEM_BAND_EUTRAN_XXII - * - MM_MODEM_BAND_EUTRAN_XXIII - * - MM_MODEM_BAND_EUTRAN_XXVI - * - MM_MODEM_BAND_EUTRAN_XLIV + * - MM_MODEM_BAND_EUTRAN_22 + * - MM_MODEM_BAND_EUTRAN_23 + * - MM_MODEM_BAND_EUTRAN_26 + * - MM_MODEM_BAND_EUTRAN_44 */ }; @@ -435,45 +435,45 @@ typedef struct { } NasLteBandsMap; static const NasLteBandsMap nas_lte_bands_map [] = { - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_1, MM_MODEM_BAND_EUTRAN_I }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_2, MM_MODEM_BAND_EUTRAN_II }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_3, MM_MODEM_BAND_EUTRAN_III }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_4, MM_MODEM_BAND_EUTRAN_IV }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_5, MM_MODEM_BAND_EUTRAN_V }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_6, MM_MODEM_BAND_EUTRAN_VI }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_7, MM_MODEM_BAND_EUTRAN_VII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_8, MM_MODEM_BAND_EUTRAN_VIII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_9, MM_MODEM_BAND_EUTRAN_IX }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_10, MM_MODEM_BAND_EUTRAN_X }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_11, MM_MODEM_BAND_EUTRAN_XI }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_12, MM_MODEM_BAND_EUTRAN_XII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_13, MM_MODEM_BAND_EUTRAN_XIII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_14, MM_MODEM_BAND_EUTRAN_XIV }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_17, MM_MODEM_BAND_EUTRAN_XVII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_18, MM_MODEM_BAND_EUTRAN_XVIII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_19, MM_MODEM_BAND_EUTRAN_XIX }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_20, MM_MODEM_BAND_EUTRAN_XX }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_21, MM_MODEM_BAND_EUTRAN_XXI }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_24, MM_MODEM_BAND_EUTRAN_XXIV }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_25, MM_MODEM_BAND_EUTRAN_XXV }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_33, MM_MODEM_BAND_EUTRAN_XXXIII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_34, MM_MODEM_BAND_EUTRAN_XXXIV }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_35, MM_MODEM_BAND_EUTRAN_XXXV }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_36, MM_MODEM_BAND_EUTRAN_XXXVI }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_37, MM_MODEM_BAND_EUTRAN_XXXVII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_38, MM_MODEM_BAND_EUTRAN_XXXVIII }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_39, MM_MODEM_BAND_EUTRAN_XXXIX }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_40, MM_MODEM_BAND_EUTRAN_XL }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_41, MM_MODEM_BAND_EUTRAN_XLI }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_42, MM_MODEM_BAND_EUTRAN_XLI }, - { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_43, MM_MODEM_BAND_EUTRAN_XLIII } + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_1, MM_MODEM_BAND_EUTRAN_1 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_2, MM_MODEM_BAND_EUTRAN_2 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_3, MM_MODEM_BAND_EUTRAN_3 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_4, MM_MODEM_BAND_EUTRAN_4 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_5, MM_MODEM_BAND_EUTRAN_5 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_6, MM_MODEM_BAND_EUTRAN_6 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_7, MM_MODEM_BAND_EUTRAN_7 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_8, MM_MODEM_BAND_EUTRAN_8 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_9, MM_MODEM_BAND_EUTRAN_9 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_10, MM_MODEM_BAND_EUTRAN_10 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_11, MM_MODEM_BAND_EUTRAN_11 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_12, MM_MODEM_BAND_EUTRAN_12 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_13, MM_MODEM_BAND_EUTRAN_13 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_14, MM_MODEM_BAND_EUTRAN_14 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_17, MM_MODEM_BAND_EUTRAN_17 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_18, MM_MODEM_BAND_EUTRAN_18 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_19, MM_MODEM_BAND_EUTRAN_19 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_20, MM_MODEM_BAND_EUTRAN_20 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_21, MM_MODEM_BAND_EUTRAN_21 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_24, MM_MODEM_BAND_EUTRAN_24 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_25, MM_MODEM_BAND_EUTRAN_25 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_33, MM_MODEM_BAND_EUTRAN_33 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_34, MM_MODEM_BAND_EUTRAN_34 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_35, MM_MODEM_BAND_EUTRAN_35 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_36, MM_MODEM_BAND_EUTRAN_36 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_37, MM_MODEM_BAND_EUTRAN_37 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_38, MM_MODEM_BAND_EUTRAN_38 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_39, MM_MODEM_BAND_EUTRAN_39 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_40, MM_MODEM_BAND_EUTRAN_40 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_41, MM_MODEM_BAND_EUTRAN_41 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_42, MM_MODEM_BAND_EUTRAN_42 }, + { QMI_NAS_LTE_BAND_PREFERENCE_EUTRAN_43, MM_MODEM_BAND_EUTRAN_43 } /* NOTE. The following bands were unmatched: * - * - MM_MODEM_BAND_EUTRAN_XXII - * - MM_MODEM_BAND_EUTRAN_XXIII - * - MM_MODEM_BAND_EUTRAN_XXVI - * - MM_MODEM_BAND_EUTRAN_XLIV + * - MM_MODEM_BAND_EUTRAN_22 + * - MM_MODEM_BAND_EUTRAN_23 + * - MM_MODEM_BAND_EUTRAN_26 + * - MM_MODEM_BAND_EUTRAN_44 */ }; @@ -521,8 +521,7 @@ mm_modem_bands_to_qmi_band_preference (GArray *mm_bands, band = g_array_index (mm_bands, MMModemBand, i); - if (band <= MM_MODEM_BAND_EUTRAN_XLIV && - band >= MM_MODEM_BAND_EUTRAN_I) { + if (band >= MM_MODEM_BAND_EUTRAN_1 && band <= MM_MODEM_BAND_EUTRAN_44) { /* Add LTE band preference */ guint j; @@ -603,38 +602,38 @@ static const ActiveBandsMap active_bands_map [] = { { QMI_NAS_ACTIVE_BAND_WCDMA_850_JAPAN, MM_MODEM_BAND_U850 }, /* LTE bands */ - { QMI_NAS_ACTIVE_BAND_EUTRAN_1, MM_MODEM_BAND_EUTRAN_I }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_2, MM_MODEM_BAND_EUTRAN_II }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_3, MM_MODEM_BAND_EUTRAN_III }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_4, MM_MODEM_BAND_EUTRAN_IV }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_5, MM_MODEM_BAND_EUTRAN_V }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_6, MM_MODEM_BAND_EUTRAN_VI }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_7, MM_MODEM_BAND_EUTRAN_VII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_8, MM_MODEM_BAND_EUTRAN_VIII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_9, MM_MODEM_BAND_EUTRAN_IX }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_10, MM_MODEM_BAND_EUTRAN_X }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_11, MM_MODEM_BAND_EUTRAN_XI }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_12, MM_MODEM_BAND_EUTRAN_XII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_13, MM_MODEM_BAND_EUTRAN_XIII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_14, MM_MODEM_BAND_EUTRAN_XIV }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_17, MM_MODEM_BAND_EUTRAN_XVII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_18, MM_MODEM_BAND_EUTRAN_XVIII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_19, MM_MODEM_BAND_EUTRAN_XIX }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_20, MM_MODEM_BAND_EUTRAN_XX }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_21, MM_MODEM_BAND_EUTRAN_XXI }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_24, MM_MODEM_BAND_EUTRAN_XXIV }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_25, MM_MODEM_BAND_EUTRAN_XXV }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_33, MM_MODEM_BAND_EUTRAN_XXXIII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_34, MM_MODEM_BAND_EUTRAN_XXXIV }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_35, MM_MODEM_BAND_EUTRAN_XXXV }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_36, MM_MODEM_BAND_EUTRAN_XXXVI }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_37, MM_MODEM_BAND_EUTRAN_XXXVII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_38, MM_MODEM_BAND_EUTRAN_XXXVIII }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_39, MM_MODEM_BAND_EUTRAN_XXXIX }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_40, MM_MODEM_BAND_EUTRAN_XL }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_41, MM_MODEM_BAND_EUTRAN_XLI }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_42, MM_MODEM_BAND_EUTRAN_XLI }, - { QMI_NAS_ACTIVE_BAND_EUTRAN_43, MM_MODEM_BAND_EUTRAN_XLIII } + { QMI_NAS_ACTIVE_BAND_EUTRAN_1, MM_MODEM_BAND_EUTRAN_1 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_2, MM_MODEM_BAND_EUTRAN_2 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_3, MM_MODEM_BAND_EUTRAN_3 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_4, MM_MODEM_BAND_EUTRAN_4 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_5, MM_MODEM_BAND_EUTRAN_5 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_6, MM_MODEM_BAND_EUTRAN_6 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_7, MM_MODEM_BAND_EUTRAN_7 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_8, MM_MODEM_BAND_EUTRAN_8 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_9, MM_MODEM_BAND_EUTRAN_9 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_10, MM_MODEM_BAND_EUTRAN_10 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_11, MM_MODEM_BAND_EUTRAN_11 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_12, MM_MODEM_BAND_EUTRAN_12 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_13, MM_MODEM_BAND_EUTRAN_13 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_14, MM_MODEM_BAND_EUTRAN_14 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_17, MM_MODEM_BAND_EUTRAN_17 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_18, MM_MODEM_BAND_EUTRAN_18 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_19, MM_MODEM_BAND_EUTRAN_19 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_20, MM_MODEM_BAND_EUTRAN_20 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_21, MM_MODEM_BAND_EUTRAN_21 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_24, MM_MODEM_BAND_EUTRAN_24 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_25, MM_MODEM_BAND_EUTRAN_25 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_33, MM_MODEM_BAND_EUTRAN_33 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_34, MM_MODEM_BAND_EUTRAN_34 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_35, MM_MODEM_BAND_EUTRAN_35 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_36, MM_MODEM_BAND_EUTRAN_36 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_37, MM_MODEM_BAND_EUTRAN_37 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_38, MM_MODEM_BAND_EUTRAN_38 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_39, MM_MODEM_BAND_EUTRAN_39 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_40, MM_MODEM_BAND_EUTRAN_40 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_41, MM_MODEM_BAND_EUTRAN_41 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_42, MM_MODEM_BAND_EUTRAN_42 }, + { QMI_NAS_ACTIVE_BAND_EUTRAN_43, MM_MODEM_BAND_EUTRAN_43 } /* NOTE. The following bands were unmatched: * -- 2.13.1.611.g7e3b11ae1-goog _______________________________________________ ModemManager-devel mailing list <a href="mailto:ModemManager-devel@lists.freedesktop.org">ModemManager-devel@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/modemmanager-devel" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/modemmanager-devel</a> </blockquote></div> </div>