commit f2ea8bf2c8e0759c14bfcbb6f58c5138f30e1c8f
author b.liu <b.liu@mobiletek.cn> Thu Jan 09 15:07:34 2025 +0800
committer b.liu <b.liu@mobiletek.cn> Thu Jan 09 15:07:34 2025 +0800
tree 7ef425ff7ed0c8bc1c55e317ea17a7d93f353f3e
parent 61ad917065bbe116d01c7ee0551f41e86cd418a2

兼容 dev_info v1

Change-Id: I5659a6275f96f68867d4fd753c05915576dee568

mbtk/mbtk_rild_v2/src/main.c

diff --git a/mbtk/mbtk_rild_v2/src/main.c b/mbtk/mbtk_rild_v2/src/main.c
index f768ce6..4b8d320 100755
--- a/mbtk/mbtk_rild_v2/src/main.c
+++ b/mbtk/mbtk_rild_v2/src/main.c
@@ -2566,6 +2566,7 @@
     if(mbtk_dev_info_read(MBTK_DEVICE_INFO_ITEM_MODEM, &(info_modem), sizeof(mbtk_device_info_modem_t))) {
         LOGD("mbtk_dev_info_read(MODEM) fail, use default band.");

         band_info.band_area = MBTK_MODEM_BAND_AREA_ALL;

+#ifdef MBTK_DEV_INFO_VERSION_2

 #ifdef MBTK_5G_SUPPORT

         band_info.band_support.net_pref = MBTK_NET_PREF_LTE_NR_NR_PREF;  // 19

         band_info.net_support = MBTK_NET_SUPPORT_4G | MBTK_NET_SUPPORT_5G;

@@ -2573,15 +2574,18 @@
         band_info.band_support.net_pref = MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF;  // 15

         band_info.net_support = MBTK_NET_SUPPORT_2G | MBTK_NET_SUPPORT_3G | MBTK_NET_SUPPORT_4G;

 #endif

+#endif

         band_info.band_support.gsm_band = MBTK_BAND_ALL_GSM_DEFAULT;

         band_info.band_support.umts_band = MBTK_BAND_ALL_WCDMA_DEFAULT;

         band_info.band_support.tdlte_band = MBTK_BAND_ALL_TDLTE_DEFAULT;

         band_info.band_support.fddlte_band = MBTK_BAND_ALL_FDDLTE_DEFAULT;

         band_info.band_support.lte_ext_band = MBTK_BAND_ALL_EXT_LTE_DEFAULT;

+#ifdef MBTK_DEV_INFO_VERSION_2

         band_info.band_support.nr_3_band = MBTK_BAND_ALL_NR_3_DEFAULT;

         band_info.band_support.nr_2_band = MBTK_BAND_ALL_NR_2_DEFAULT;

         band_info.band_support.nr_1_band = MBTK_BAND_ALL_NR_1_DEFAULT;

         band_info.band_support.nr_0_band = MBTK_BAND_ALL_NR_0_DEFAULT;

+#endif

     } else {
         band_info.band_area = info_modem.band_area;

 #ifdef MBTK_DEV_INFO_VERSION_2

@@ -2603,10 +2607,12 @@
         band_info.band_support.tdlte_band = info_modem.band_tdlte;

         band_info.band_support.fddlte_band = info_modem.band_fddlte;

         band_info.band_support.lte_ext_band = info_modem.band_lte_ext;

+#ifdef MBTK_DEV_INFO_VERSION_2

         band_info.band_support.nr_3_band = info_modem.band_nr_3;

         band_info.band_support.nr_2_band = info_modem.band_nr_2;

         band_info.band_support.nr_1_band = info_modem.band_nr_1;

         band_info.band_support.nr_0_band = info_modem.band_nr_0;

+#endif

     }
 
 //    bool is_first = TRUE;

mbtk/mbtk_rild_v2/src/ril_net.c

diff --git a/mbtk/mbtk_rild_v2/src/ril_net.c b/mbtk/mbtk_rild_v2/src/ril_net.c
index 6f2ad50..2848bf9 100755
--- a/mbtk/mbtk_rild_v2/src/ril_net.c
+++ b/mbtk/mbtk_rild_v2/src/ril_net.c
@@ -366,7 +366,7 @@
 
             at_response_free(response);
         }
-
+#ifdef MBTK_DEV_INFO_VERSION_2
         // Only support 4G/5G
         if(band_info.net_support & MBTK_NET_SUPPORT_5G) {
             // AT*band=19,0,0,482,134742231,0,24576,256,134217877,0
@@ -384,6 +384,13 @@
                 sprintf(cmd, "AT*BAND=%d,%d,%d,%d,%d", band->net_pref, band->gsm_band, band->umts_band, band->tdlte_band, band->fddlte_band);
             }
         }
+#else
+        if(band->lte_ext_band > 0) {
+            sprintf(cmd, "AT*BAND=%d,%d,%d,%d,%d,,,,%d", band->net_pref, band->gsm_band, band->umts_band, band->tdlte_band, band->fddlte_band, band->lte_ext_band);
+        } else {
+            sprintf(cmd, "AT*BAND=%d,%d,%d,%d,%d", band->net_pref, band->gsm_band, band->umts_band, band->tdlte_band, band->fddlte_band);
+        }
+#endif
     }
     err = at_send_command(port, cmd, &response);
 
@@ -526,7 +533,9 @@
     }
     band->fddlte_band = (uint32)tmp_int;
 
-    if(band_info.net_support & MBTK_NET_SUPPORT_5G) {
+#ifdef MBTK_DEV_INFO_VERSION_2
+    if(band_info.net_support & MBTK_NET_SUPPORT_5G)
+    {
         err = at_tok_nextint(&line, &tmp_int);
         if (err < 0)
         {
@@ -555,6 +564,7 @@
         }
         band->nr_0_band = (uint32)tmp_int;
     }
+#endif
 
     // roamingConfig
     err = at_tok_nextint(&line, &tmp_int);