broadband-modem-qmi: fix band enum names

1 files changed, 58 insertions, 58 deletions

diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index fd8fb86c..e2c14682 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -922,39 +922,39 @@ typedef struct {
 static const BandsMap bands_map [] = {
     /* CDMA bands */
     {
-        (QMI_DMS_BAND_CAPABILITY_BAND_CLASS_0_A_SYSTEM | QMI_DMS_BAND_CAPABILITY_BAND_CLASS_0_B_SYSTEM),
+        (QMI_DMS_BAND_CAPABILITY_BC_0_A_SYSTEM | QMI_DMS_BAND_CAPABILITY_BC_0_B_SYSTEM),
         MM_MODEM_BAND_CDMA_BC0_CELLULAR_800
     },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_1_ALL_BLOCKS, MM_MODEM_BAND_CDMA_BC1_PCS_1900       },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_2,            MM_MODEM_BAND_CDMA_BC2_TACS           },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_3_A_SYSTEM,   MM_MODEM_BAND_CDMA_BC3_JTACS          },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_4_ALL_BLOCKS, MM_MODEM_BAND_CDMA_BC4_KOREAN_PCS     },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_5_ALL_BLOCKS, MM_MODEM_BAND_CDMA_BC5_NMT450         },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_6,            MM_MODEM_BAND_CDMA_BC6_IMT2000        },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_7,            MM_MODEM_BAND_CDMA_BC7_CELLULAR_700   },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_8,            MM_MODEM_BAND_CDMA_BC8_1800           },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_9,            MM_MODEM_BAND_CDMA_BC9_900            },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_10,           MM_MODEM_BAND_CDMA_BC10_SECONDARY_800 },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_11,           MM_MODEM_BAND_CDMA_BC11_PAMR_400      },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_12,           MM_MODEM_BAND_CDMA_BC12_PAMR_800      },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_14,           MM_MODEM_BAND_CDMA_BC14_PCS2_1900     },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_15,           MM_MODEM_BAND_CDMA_BC15_AWS           },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_16,           MM_MODEM_BAND_CDMA_BC16_US_2500       },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_17,           MM_MODEM_BAND_CDMA_BC17_US_FLO_2500   },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_18,           MM_MODEM_BAND_CDMA_BC18_US_PS_700     },
-    { QMI_DMS_BAND_CAPABILITY_BAND_CLASS_19,           MM_MODEM_BAND_CDMA_BC19_US_LOWER_700  },
+    { QMI_DMS_BAND_CAPABILITY_BC_1_ALL_BLOCKS, MM_MODEM_BAND_CDMA_BC1_PCS_1900       },
+    { QMI_DMS_BAND_CAPABILITY_BC_2,            MM_MODEM_BAND_CDMA_BC2_TACS           },
+    { QMI_DMS_BAND_CAPABILITY_BC_3_A_SYSTEM,   MM_MODEM_BAND_CDMA_BC3_JTACS          },
+    { QMI_DMS_BAND_CAPABILITY_BC_4_ALL_BLOCKS, MM_MODEM_BAND_CDMA_BC4_KOREAN_PCS     },
+    { QMI_DMS_BAND_CAPABILITY_BC_5_ALL_BLOCKS, MM_MODEM_BAND_CDMA_BC5_NMT450         },
+    { QMI_DMS_BAND_CAPABILITY_BC_6,            MM_MODEM_BAND_CDMA_BC6_IMT2000        },
+    { QMI_DMS_BAND_CAPABILITY_BC_7,            MM_MODEM_BAND_CDMA_BC7_CELLULAR_700   },
+    { QMI_DMS_BAND_CAPABILITY_BC_8,            MM_MODEM_BAND_CDMA_BC8_1800           },
+    { QMI_DMS_BAND_CAPABILITY_BC_9,            MM_MODEM_BAND_CDMA_BC9_900            },
+    { QMI_DMS_BAND_CAPABILITY_BC_10,           MM_MODEM_BAND_CDMA_BC10_SECONDARY_800 },
+    { QMI_DMS_BAND_CAPABILITY_BC_11,           MM_MODEM_BAND_CDMA_BC11_PAMR_400      },
+    { QMI_DMS_BAND_CAPABILITY_BC_12,           MM_MODEM_BAND_CDMA_BC12_PAMR_800      },
+    { QMI_DMS_BAND_CAPABILITY_BC_14,           MM_MODEM_BAND_CDMA_BC14_PCS2_1900     },
+    { QMI_DMS_BAND_CAPABILITY_BC_15,           MM_MODEM_BAND_CDMA_BC15_AWS           },
+    { QMI_DMS_BAND_CAPABILITY_BC_16,           MM_MODEM_BAND_CDMA_BC16_US_2500       },
+    { QMI_DMS_BAND_CAPABILITY_BC_17,           MM_MODEM_BAND_CDMA_BC17_US_FLO_2500   },
+    { QMI_DMS_BAND_CAPABILITY_BC_18,           MM_MODEM_BAND_CDMA_BC18_US_PS_700     },
+    { QMI_DMS_BAND_CAPABILITY_BC_19,           MM_MODEM_BAND_CDMA_BC19_US_LOWER_700  },
 
     /* GSM bands */
-    { QMI_DMS_BAND_CAPABILITY_GSM_DCS,  MM_MODEM_BAND_DCS  },
-    { QMI_DMS_BAND_CAPABILITY_GSM_EGSM, MM_MODEM_BAND_EGSM },
-    { QMI_DMS_BAND_CAPABILITY_GSM_PCS,  MM_MODEM_BAND_PCS  },
-    { QMI_DMS_BAND_CAPABILITY_GSM_850,  MM_MODEM_BAND_G850 },
+    { QMI_DMS_BAND_CAPABILITY_GSM_DCS_1800,     MM_MODEM_BAND_DCS  },
+    { QMI_DMS_BAND_CAPABILITY_GSM_900_EXTENDED, MM_MODEM_BAND_EGSM },
+    { QMI_DMS_BAND_CAPABILITY_GSM_PCS_1900,     MM_MODEM_BAND_PCS  },
+    { QMI_DMS_BAND_CAPABILITY_GSM_850,          MM_MODEM_BAND_G850 },
 
     /* UMTS/WCDMA bands */
     { QMI_DMS_BAND_CAPABILITY_WCDMA_2100,       MM_MODEM_BAND_U2100 },
     { QMI_DMS_BAND_CAPABILITY_WCDMA_DCS_1800,   MM_MODEM_BAND_U1800 },
     { QMI_DMS_BAND_CAPABILITY_WCDMA_1700_US,    MM_MODEM_BAND_U17IV },
-    { QMI_DMS_BAND_CAPABILITY_QWCDMA_800,       MM_MODEM_BAND_U800  },
+    { QMI_DMS_BAND_CAPABILITY_WCDMA_800,        MM_MODEM_BAND_U800  },
     {
         (QMI_DMS_BAND_CAPABILITY_WCDMA_850_US | QMI_DMS_BAND_CAPABILITY_WCDMA_850_JAPAN),
         MM_MODEM_BAND_U850
@@ -965,11 +965,11 @@ static const BandsMap bands_map [] = {
 
     /* NOTE. The following bands were unmatched:
      *
-     * - QMI_DMS_BAND_CAPABILITY_GSM_PGSM
+     * - QMI_DMS_BAND_CAPABILITY_GSM_900_PRIMARY
      * - QMI_DMS_BAND_CAPABILITY_GSM_450
      * - QMI_DMS_BAND_CAPABILITY_GSM_480
      * - QMI_DMS_BAND_CAPABILITY_GSM_750
-     * - QMI_DMS_BAND_CAPABILITY_GSM_RAILWAILS
+     * - QMI_DMS_BAND_CAPABILITY_GSM_900_RAILWAILS
      * - QMI_DMS_BAND_CAPABILITY_WCDMA_1500
      * - MM_MODEM_BAND_CDMA_BC13_IMT2000_2500
      * - MM_MODEM_BAND_U1900
@@ -1016,38 +1016,38 @@ typedef struct {
 } LteBandsMap;
 
 static const LteBandsMap lte_bands_map [] = {
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_1,  MM_MODEM_BAND_EUTRAN_I       },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_2,  MM_MODEM_BAND_EUTRAN_II      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_3,  MM_MODEM_BAND_EUTRAN_III     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_4,  MM_MODEM_BAND_EUTRAN_IV      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_5,  MM_MODEM_BAND_EUTRAN_V       },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_6,  MM_MODEM_BAND_EUTRAN_VI      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_7,  MM_MODEM_BAND_EUTRAN_VII     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_8,  MM_MODEM_BAND_EUTRAN_VIII    },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_9,  MM_MODEM_BAND_EUTRAN_IX      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_10, MM_MODEM_BAND_EUTRAN_X       },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_11, MM_MODEM_BAND_EUTRAN_XI      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_12, MM_MODEM_BAND_EUTRAN_XII     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_13, MM_MODEM_BAND_EUTRAN_XIII    },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_14, MM_MODEM_BAND_EUTRAN_XIV     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_17, MM_MODEM_BAND_EUTRAN_XVII    },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_18, MM_MODEM_BAND_EUTRAN_XVIII   },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_19, MM_MODEM_BAND_EUTRAN_XIX     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_20, MM_MODEM_BAND_EUTRAN_XX      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_21, MM_MODEM_BAND_EUTRAN_XXI     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_24, MM_MODEM_BAND_EUTRAN_XXIV    },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_25, MM_MODEM_BAND_EUTRAN_XXV     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_33, MM_MODEM_BAND_EUTRAN_XXXIII  },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_34, MM_MODEM_BAND_EUTRAN_XXXIV   },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_35, MM_MODEM_BAND_EUTRAN_XXXV    },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_36, MM_MODEM_BAND_EUTRAN_XXXVI   },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_37, MM_MODEM_BAND_EUTRAN_XXXVII  },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_38, MM_MODEM_BAND_EUTRAN_XXXVIII },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_39, MM_MODEM_BAND_EUTRAN_XXXIX   },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_40, MM_MODEM_BAND_EUTRAN_XL      },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_41, MM_MODEM_BAND_EUTRAN_XLI     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_42, MM_MODEM_BAND_EUTRAN_XLI     },
-    { QMI_DMS_LTE_BAND_CAPABILITY_BAND_43, MM_MODEM_BAND_EUTRAN_XLIII   }
+    { 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   }
 
     /* NOTE. The following bands were unmatched:
      *