commit d7c757d979aa3de65f34396f258aab3eea45cff7
author b.liu <b.liu@mobiletek.cn> Wed Feb 12 16:16:08 2025 +0800
committer b.liu <b.liu@mobiletek.cn> Wed Feb 12 16:16:08 2025 +0800
tree 7551b7a253eda1216401743375b90830e96b4310
parent de98991922a977a0d31f9868311defad304c5704

Fix ril v2 build error.

Change-Id: I81361c5f39f8d9a7a3a7041b9cc7f4241f7ec699

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 89090be..649fd72 100755
--- a/mbtk/mbtk_rild_v2/src/ril_net.c
+++ b/mbtk/mbtk_rild_v2/src/ril_net.c
@@ -25,6 +25,19 @@
 extern ril_band_info_t band_info;
 void ril_rsp_pack_send(ATPortType_enum port, int fd, int ril_id, int msg_index, const void* data, int data_len);
 
+static bool net_support_check(uint32 net_type, uint32 net_flag)
+{
+#ifdef MBTK_DEV_INFO_VERSION_2
+    return (net_type & net_flag);
+#else
+    if(net_flag == MBTK_NET_SUPPORT_5G) {
+        return FALSE;
+    } else {
+        return TRUE;
+    }
+#endif
+}
+
 /*
 AT+COPS=?
 
@@ -268,14 +281,14 @@
         log_hex("BAND_SUPPORT", &band_info.band_support, sizeof(mbtk_band_info_t));
         log_hex("BAND", band, sizeof(mbtk_band_info_t));
 
-        if(band->gsm_band == 0 && (band_info.net_support & MBTK_NET_SUPPORT_2G)) {
+        if(band->gsm_band == 0 && net_support_check(band_info.net_support, MBTK_NET_SUPPORT_2G)) {
             band->gsm_band = band_info.band_support.gsm_band;
         }
-        if(band->umts_band == 0 && (band_info.net_support & MBTK_NET_SUPPORT_3G)) {
+        if(band->umts_band == 0 && net_support_check(band_info.net_support, MBTK_NET_SUPPORT_3G)) {
             band->umts_band = band_info.band_support.umts_band;
         }
 
-        if(band_info.net_support & MBTK_NET_SUPPORT_4G) {
+        if(net_support_check(band_info.net_support, MBTK_NET_SUPPORT_4G)) {
             if(band->tdlte_band == 0) {
                 band->tdlte_band = band_info.band_support.tdlte_band;
             }
@@ -287,7 +300,7 @@
             }
         }
 
-        if(band_info.net_support & MBTK_NET_SUPPORT_5G) {
+        if(net_support_check(band_info.net_support, MBTK_NET_SUPPORT_5G)) {
             if(band->nr_3_band == 0) {
                 band->nr_3_band = band_info.band_support.nr_3_band;
             }