commit 61ad917065bbe116d01c7ee0551f41e86cd418a2
author b.liu <b.liu@mobiletek.cn> Thu Jan 09 14:33:55 2025 +0800
committer b.liu <b.liu@mobiletek.cn> Thu Jan 09 14:33:55 2025 +0800
tree a082568bf113429ca506c132cfdce5a1a86061a5
parent 41b5205068d28f3dd98cff24edf49085f2d168b1

Fix dev_info

Change-Id: If0239f3821c5ff984a35c43cb528f09eafcbf3e5

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 881c12b..f768ce6 100755
--- a/mbtk/mbtk_rild_v2/src/main.c
+++ b/mbtk/mbtk_rild_v2/src/main.c
@@ -2564,30 +2564,49 @@
     memset(&info_modem, 0, sizeof(mbtk_device_info_modem_t));
     band_info.band_set_success = FALSE;

     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.");
+        LOGD("mbtk_dev_info_read(MODEM) fail, use default band.");

         band_info.band_area = MBTK_MODEM_BAND_AREA_ALL;

+#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;

+#else

         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

         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;

+        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;

     } else {
         band_info.band_area = info_modem.band_area;

 #ifdef MBTK_DEV_INFO_VERSION_2

+        band_info.net_support = info_modem.net_support;

         if(info_modem.net_pref < MBTK_NET_PREF_MAX) {

             band_info.band_support.net_pref = info_modem.net_pref;

         } else {

-            band_info.band_support.net_pref = MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF;  // 15

+            if(band_info.net_support & MBTK_NET_SUPPORT_5G) {

+                band_info.band_support.net_pref = MBTK_NET_PREF_LTE_NR_NR_PREF;  // 19

+            } else {

+                band_info.band_support.net_pref = MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF;  // 15

+            }

         }

 #else

-		band_info.band_support.net_pref = MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF;  // 15

+        band_info.band_support.net_pref = MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF;  // 15

 #endif

         band_info.band_support.gsm_band = info_modem.band_gsm;

         band_info.band_support.umts_band = info_modem.band_wcdma;

         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;

+        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;

     }
 
 //    bool is_first = TRUE;