[BugFix][T8TSK-333]A few seconds slower mipc init causes the ril-service to connect to the rild to take longer
Only Configure：No
Affected branch：ALL
Affected module：RILD
Is it affected on both ZXIC and MTK: MTK
Self-test: Yes
Doc Update:No
Change-Id: I29052eb770b04616d78eda20d49315b4b42abc74
diff --git a/IC_meta/mtk/2735/mtk-telephonyware/mtkfusionrild/mtkfusionrild.bb b/IC_meta/mtk/2735/mtk-telephonyware/mtkfusionrild/mtkfusionrild.bb
index e97afec..ac99d9d 100644
--- a/IC_meta/mtk/2735/mtk-telephonyware/mtkfusionrild/mtkfusionrild.bb
+++ b/IC_meta/mtk/2735/mtk-telephonyware/mtkfusionrild/mtkfusionrild.bb
@@ -4,7 +4,7 @@
LICENSE = "MediaTekProprietary"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e1696b147d49d491bcb4da1a57173fff"
-DEPENDS = "platform-libs mipc libuciwrapper netagent"
+DEPENDS = "platform-libs mipc libuciwrapper netagent liblynq-uci"
#Skip strip check in QA test
INSANE_SKIP_${PN} += "already-stripped"
diff --git a/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/CMakeLists.txt b/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/CMakeLists.txt
index 60dbcdb..bd59991 100644
--- a/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/CMakeLists.txt
+++ b/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/CMakeLists.txt
@@ -28,7 +28,7 @@
set(src_fils rild.c)
add_executable(mtkfusionrild ${src_fils})
-set(link_libs rilfusion mtkrilutils mtkconfigutils mtkcutils mtkproperty mipc_api dl)
+set(link_libs rilfusion mtkrilutils mtkconfigutils mtkcutils mtkproperty lynq-uci mipc_api dl)
target_link_libraries(mtkfusionrild ${link_libs})
#install
diff --git a/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/rild.c b/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/rild.c
index ec3fac6..f307a07 100644
--- a/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/rild.c
+++ b/IC_src/mtk/telephonyware/3.0/hardware/ril/fusion/rild/rild.c
@@ -97,7 +97,9 @@
extern void RIL_onIssueLocalRequest(int request, void *data, int len, RIL_SOCKET_ID socket_id);
//xy.he add for platform 2023_08_18 start
-int (*lynq_get_value)(char *file, char *section, char *key, char *tmp);
+#ifdef DEBUG_MODE_CHECK
+extern int lynq_get_value(char *file, char *section, char *key, char *tmp);
+#endif
//xy.he add for platform 2023_08_18 end
static struct RIL_Env s_rilEnv = {
@@ -256,55 +258,31 @@
}
void sleep_wait_md_ready(void *cb_priv) {
- sleep(0.1);
+ usleep(100*1000);
}
-
+#ifdef DEBUG_MODE_CHECK
//xy.he add for platform 2023_08_18 start
int lynq_get_debug_mode(){
- void *dlHandle_uci = NULL;
char test[24] = "0";
- //uci lib path
- const char *lynqLibPath_uci = "/lib64/liblynq-uci.so";
int ret = -1;
-
// load lynq_get_value() fuction to load uci setting
- dlHandle_uci = dlopen(lynqLibPath_uci, RTLD_NOW);
- mtkLogI(LOG_TAG, "start load debug_mode");
- if (dlHandle_uci == NULL)
+ mtkLogI(LOG_TAG, "start lynq_Get_value ");
+ ret = lynq_get_value("lynq_uci","debug_mode","rild_debug_status",test);
+ mtkLogI(LOG_TAG,"lynq_debug_mode_type ret is %d", ret);
+ if(ret != 0)
{
- mtkLogD(LOG_TAG, "dlopen dlHandle_uci failed: %s,use standard.", dlerror());
- return 0;
+ mtkLogI(LOG_TAG,"lynq_get_value failed,use standard");
}
- else
- {
- mtkLogI(LOG_TAG, "dlopen dlHandle_uci success");
- }
- lynq_get_value = (int(*)(char *file, char *section, char *key, char *tmp))dlsym(dlHandle_uci, "lynq_get_value");
-
- if (lynq_get_value == NULL)
- {
- mtkLogD(LOG_TAG, "dlopen lynq_get_value failed: %s use standard.", dlerror());
- }
- else
- {
- mtkLogI(LOG_TAG, "dlopen lynq_Get_value success");
- ret = lynq_get_value("lynq_uci","debug_mode","rild_debug_status",test);
- mtkLogI(LOG_TAG,"lynq_debug_mode_type ret is %d", ret);
- if(ret != 0)
- {
- mtkLogI(LOG_TAG,"lynq_get_value failed,use standard");
- }
- }
-
mtkLogI(LOG_TAG,"lynq_debug_mode_type is %s", test);
- dlclose(dlHandle_uci);
+
return atoi(test);
}
+#endif
//xy.he add for platform 2023_08_18 end
int main(int argc, char **argv) {
@@ -381,6 +359,7 @@
//xy.he add for platform 2023_08_18 start
#ifdef DEBUG_MODE_CHECK
+ mtkLogI(LOG_TAG, "start load debug_mode");
mode = lynq_get_debug_mode();
if(mode == 1)
{