commit e4f94f44c872c29d1ddf64686ac9e18d7108a00e
author l.yang <l.yang@mobiletek.cn> Tue Apr 29 18:08:39 2025 -0700
committer l.yang <l.yang@mobiletek.cn> Tue Apr 29 18:08:39 2025 -0700
tree 204b2276683b41fd5b2a8f8a24d1810fc2fc4d24
parent 459e77da8dfb766bee3ff374ab52d065ad381b1a

T108 sim Voie data network sms 支持双卡 ql 接口第一版

Change-Id: If5a9fb81971258bb5a3d811f3e4562b2df351853

mbtk/libql_lib_v2_rilv2/ql_nw.c

diff --git a/mbtk/libql_lib_v2_rilv2/ql_nw.c b/mbtk/libql_lib_v2_rilv2/ql_nw.c
index 8249cbd..2374f81 100755
--- a/mbtk/libql_lib_v2_rilv2/ql_nw.c
+++ b/mbtk/libql_lib_v2_rilv2/ql_nw.c
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 
 #include "ql_nw.h"
+
 #include "ql_type.h"
 #include "mbtk_type.h"
 #include "mbtk_ril_api.h"
@@ -77,6 +78,46 @@
     ql_nw_service_error_cb_f     server_cb;
 }ql_nw_info_handle_t;
 
+static mbtk_sim_type_enum s_net_slot = MBTK_SIM_1;
+
+static bool check_slot_valid(QL_SIM_SLOT_E slot)
+{
+    if (slot !=QL_SIM_SLOT_1 && slot != QL_SIM_SLOT_2)
+    {
+        QL_NW_LOGE("bad slot: %d, slot should be 1 or 2", slot);
+        return false;
+    }
+    
+    return true;
+}
+
+static void ql_slot_convert_to_mbtk(QL_SIM_SLOT_E ql_slot,mbtk_sim_type_enum *mbtk_slot)
+{
+    if(ql_slot == QL_SIM_SLOT_1)
+    {
+        *mbtk_slot = MBTK_SIM_1;
+    }
+    
+    if(ql_slot == QL_SIM_SLOT_2)
+    {
+        *mbtk_slot = MBTK_SIM_2;
+    }
+    return;
+    
+}
+
+int  ql_set_nw_slot(QL_SIM_SLOT_E log_slot)
+{
+    if(!check_slot_valid(log_slot))
+    {
+        QL_NW_LOGE("[%s] check_slot_valid failed.", __func__);
+        return QL_ERR_INVALID_ARG;
+    }
+    ql_slot_convert_to_mbtk(log_slot,&s_net_slot);
+    QL_NW_LOGE("s_net_slot is %d",s_net_slot);
+    return QL_ERR_OK;
+}
+
 /*----------------------------------------------STRUCT-------------------------------------------*/
 
 /*----------------------------------------------GLOBAL STATIC VARIABLE---------------------------*/
@@ -91,7 +132,7 @@
     char mcc_mnc[MBTK_BUFF_TEMP_SIZE_8] = {0};
     mbtk_net_info_t net = {0};
     memset(&net, 0x0, sizeof(mbtk_net_info_t));
-    ret = mbtk_net_sel_mode_get(p_handle->handle, &net);
+    ret = mbtk_ds_net_sel_mode_get(p_handle->handle,s_net_slot, &net);
     if(ret != MBTK_ERR_OK)
     {
         QL_NW_LOGE("[%s] net sel mode get fail.[%d]", __func__, ret);
@@ -169,7 +210,7 @@
     uint8 reg_state = 0;
     mbtk_net_reg_info_t reg;
     memset(&reg, 0x0, sizeof(mbtk_net_reg_info_t));
-    ret = mbtk_net_reg_get(p_handle->handle, &reg);
+    ret = mbtk_ds_net_reg_get(p_handle->handle,s_net_slot,&reg);
     if(ret != MBTK_ERR_OK)
     {
         QL_NW_LOGE("[%s] net reg get fail.[%d]", __func__, ret);
@@ -599,19 +640,34 @@
             goto error_1;
         }
 
-        int ret = mbtk_signal_state_change_cb_reg(ql_signal_state_change_cb);
+        int ret = mbtk_ds_signal_state_change_cb_reg(MBTK_SIM_1,ql_signal_state_change_cb);
         if(ret != MBTK_ERR_OK)
         {
             QL_NW_LOGE("[%s] set nw signal cb fail.[%d]", __func__, ret);
             goto error_2;
         }
 
-        ret = mbtk_net_reg_state_change_cb_reg(ql_net_state_change_cb);
+         ret = mbtk_ds_signal_state_change_cb_reg(MBTK_SIM_2,ql_signal_state_change_cb);
         if(ret != MBTK_ERR_OK)
         {
             QL_NW_LOGE("[%s] set nw signal cb fail.[%d]", __func__, ret);
             goto error_2;
         }
+        
+        ret = mbtk_ds_net_reg_state_change_cb_reg(MBTK_SIM_1,ql_net_state_change_cb);
+        if(ret != MBTK_ERR_OK)
+        {
+            QL_NW_LOGE("[%s] set nw signal cb fail.[%d]", __func__, ret);
+            goto error_2;
+        }
+
+        ret = mbtk_ds_net_reg_state_change_cb_reg(MBTK_SIM_2,ql_net_state_change_cb);
+        if(ret != MBTK_ERR_OK)
+        {
+            QL_NW_LOGE("[%s] set nw signal cb fail.[%d]", __func__, ret);
+            goto error_2;
+        }
+        
 
         ret = mbtk_ril_ser_state_change_cb_reg(ql_nw_server_change_cb);
         if(ret != MBTK_ERR_OK)
@@ -752,12 +808,12 @@
 
     if((lower_mode & QL_NW_LOWER_POWER_MASK_SMS) == QL_NW_LOWER_POWER_MASK_SMS)
     {
-        mode |= 0x4;
+        mode |= 0x7;
     }
 
     if((lower_mode & QL_NW_LOWER_POWER_MASK_VOICE) == QL_NW_LOWER_POWER_MASK_VOICE)
     {
-        mode |= 0x8;
+        mode |= 0x1B;
     }
 
     int ret = 0;
@@ -1536,3 +1592,6 @@
 }
 
 
+
+
+