aboutsummaryrefslogtreecommitdiff
path: root/plugins/ublox
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ublox')
-rw-r--r--plugins/ublox/mm-modem-helpers-ublox.c20
-rw-r--r--plugins/ublox/tests/test-modem-helpers-ublox.c62
2 files changed, 41 insertions, 41 deletions
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");
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-11 07:51:43 +0000