[feature][Task-106][T800-WOM-SWR-046][network] use led dispaly net signal , add compile macro
Change-Id: I38fd9e8356aa5c543aef1f6f812f4eb69f889aad
diff --git a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
index 030d0f5..a54e5e1 100755
--- a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
@@ -203,3 +203,5 @@
#TCXO support
TCXO_SUPPORT = "no"
+
+MTK_LED_SUPPORT = "yes"
diff --git a/meta/meta-mediatek-mt2735/recipes-lynq/lynq-ril-service/lynq-ril-service.bb b/meta/meta-mediatek-mt2735/recipes-lynq/lynq-ril-service/lynq-ril-service.bb
index 4706098..e954bf1 100755
--- a/meta/meta-mediatek-mt2735/recipes-lynq/lynq-ril-service/lynq-ril-service.bb
+++ b/meta/meta-mediatek-mt2735/recipes-lynq/lynq-ril-service/lynq-ril-service.bb
@@ -15,8 +15,8 @@
#Parameters passed to do_compile()
EXTRA_OEMAKE = "'RAT_CONFIG_C2K_SUPPORT = ${RAT_CONFIG_C2K_SUPPORT}'\
'MTK_MULTI_SIM_SUPPORT = ${MTK_MULTI_SIM_SUPPORT}'\
- 'TARGET_PLATFORM = ${TARGET_PLATFORM}'"
-
+ 'TARGET_PLATFORM = ${TARGET_PLATFORM}'\
+ 'MTK_LED_SUPPORT = ${MTK_LED_SUPPORT}'"
#INHIBIT_PACKAGE_STRIP = "1"
do_compile () {
if test "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" || test "${PACKAGE_ARCH}" = "cortexa7hf-neon-vfpv4"; then
diff --git a/src/lynq/framework/lynq-ril-service/src/cc.cpp b/src/lynq/framework/lynq-ril-service/src/cc.cpp
index b1094c4..36cdfc5 100755
--- a/src/lynq/framework/lynq-ril-service/src/cc.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/cc.cpp
@@ -47,7 +47,9 @@
/*Warren add for t800 ril servie 2021/12/23 start*/
#include "lynq_interface.h"
#include <binder/Parcel.h>
+#ifdef LED_SUPPORT
#include "led.h"
+#endif
using android::Parcel;
/*Warren add for t800 ril servie 2021/12/23 end*/
diff --git a/src/lynq/framework/lynq-ril-service/src/common.cpp b/src/lynq/framework/lynq-ril-service/src/common.cpp
index 45f196b..dfee298 100755
--- a/src/lynq/framework/lynq-ril-service/src/common.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/common.cpp
@@ -39,8 +39,9 @@
#include "cc.h"
#include "include/lynq_systime.h"
#include <include/lynq_uci.h>
+#ifdef LED_SUPPORT
#include "led.h"
-
+#endif
static pthread_mutex_t s_DataMutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t s_DataCond = PTHREAD_COND_INITIALIZER;
@@ -532,7 +533,9 @@
} else {
RLOGD("[slot%d]updateCardStatusV6: sim card message is null", slot);
}
+#ifdef LED_SUPPORT
mbtk_netled_state_update(GPIO_NETLED_REFLASH_NORMAL);
+#endif
}
char* getAid(int slot)
@@ -559,7 +562,9 @@
reg_voice_service_state[slot] = atoi(code);
regCodeToServiceState(request, atoi(code), slot);
}
+#ifdef LED_SUPPORT
mbtk_netled_state_update(GPIO_NETLED_REFLASH_NORMAL);
+#endif
}
void update_reg_voice_radio_tech(int request, int code, int slot, int32_t token) {
@@ -974,6 +979,7 @@
}
}
+#ifdef LED_SUPPORT
bool ril_get_if_insert_simcard()
{
int slot_id=get_default_sim_voice();
@@ -995,6 +1001,7 @@
}
return false;
}
+#endif
/*hq add for key info output 2022/03/01 begin*/
// void lynq_output_LINFO_all()
// {
diff --git a/src/lynq/framework/lynq-ril-service/src/common.h b/src/lynq/framework/lynq-ril-service/src/common.h
index 9d1446d..7033b58 100755
--- a/src/lynq/framework/lynq-ril-service/src/common.h
+++ b/src/lynq/framework/lynq-ril-service/src/common.h
@@ -200,11 +200,11 @@
const char *radioStateToString(RIL_RadioState);
const char * rilSocketIdToString(RIL_SOCKET_ID socket_id);
+#ifdef LED_SUPPORT
/*for led add by hq 20221202*/
bool ril_get_if_insert_simcard();
bool ril_get_if_3gpp_reg_success();
-
-
+#endif
#if EM_MODE_SUPPORT
typedef void (* netwokInfoNotify)(int type, char *data);
diff --git a/src/lynq/framework/lynq-ril-service/src/data/data_gdbus.cpp b/src/lynq/framework/lynq-ril-service/src/data/data_gdbus.cpp
index 5685ae7..6994fae 100755
--- a/src/lynq/framework/lynq-ril-service/src/data/data_gdbus.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/data/data_gdbus.cpp
@@ -48,7 +48,9 @@
#include "lynq_common.h"
#include "lynq_interface.h"
#include <binder/Parcel.h>
+#ifdef LED_SUPPORT
#include "led.h"
+#endif
using android::Parcel;
/*Warren add for t800 ril service 2021/12/25 end*/
@@ -141,10 +143,12 @@
writeStringToParcel(p,urc_response->apnType);
android::LYNQ_RIL_urcBroadcast(p);
RLOGD("removed apn:%s,apntype:%s",apn_table[i].apn,apn_table[i].apntype);
+#ifdef LED_SUPPORT
if(apn_count==0)
{
mbtk_netled_state_update(GPIO_NETLED_PPP_CLOSED);
}
+#endif
break;
}
}
@@ -185,7 +189,9 @@
writeStringToParcel(p,urc_response->apnType);
writeStringToParcel(p,urc_response->ifname);
android::LYNQ_RIL_urcBroadcast(p);
- mbtk_netled_state_update(GPIO_NETLED_PPP_CONNECT);
+#ifdef LED_SUPPORT
+ mbtk_netled_state_update(GPIO_NETLED_PPP_CONNECT);
+#endif
}
else
{
diff --git a/src/lynq/framework/lynq-ril-service/src/led/include/led.h b/src/lynq/framework/lynq-ril-service/src/led/include/led.h
index bd5b6b3..d8d6508 100755
--- a/src/lynq/framework/lynq-ril-service/src/led/include/led.h
+++ b/src/lynq/framework/lynq-ril-service/src/led/include/led.h
@@ -8,6 +8,7 @@
* @copyright Copyright (c) 2022
*
*/
+#ifdef LED_SUPPORT
#ifndef LED_H
#define LED_H 1
@@ -40,3 +41,4 @@
}
#endif
#endif
+#endif
diff --git a/src/lynq/framework/lynq-ril-service/src/led/led.cpp b/src/lynq/framework/lynq-ril-service/src/led/led.cpp
index 5fef7a1..6acfc45 100755
--- a/src/lynq/framework/lynq-ril-service/src/led/led.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/led/led.cpp
@@ -1,3 +1,4 @@
+#ifdef LED_SUPPORT
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -563,3 +564,4 @@
RLOGE("GPIO: Unkown netled state !");
}
}
+#endif
diff --git a/src/lynq/framework/lynq-ril-service/src/led/led_inner.h b/src/lynq/framework/lynq-ril-service/src/led/led_inner.h
index 2e31e21..5b0750d 100755
--- a/src/lynq/framework/lynq-ril-service/src/led/led_inner.h
+++ b/src/lynq/framework/lynq-ril-service/src/led/led_inner.h
@@ -8,6 +8,7 @@
* @copyright Copyright (c) 2022
*
*/
+#ifdef LED_SUPPORT
#ifndef LED_INNER_H
#define LED_INNER_H 1
@@ -57,3 +58,4 @@
}
#endif
#endif
+#endif
diff --git a/src/lynq/framework/lynq-ril-service/src/makefile b/src/lynq/framework/lynq-ril-service/src/makefile
index 2b49b61..5fe24ca 100755
--- a/src/lynq/framework/lynq-ril-service/src/makefile
+++ b/src/lynq/framework/lynq-ril-service/src/makefile
@@ -25,6 +25,10 @@
LOCAL_CFLAGS += -DMODE_DSSS
endif
+ifeq ($(strip $(MTK_LED_SUPPORT)), yes)
+ LOCAL_CFLAGS += -DLED_SUPPORT
+endif
+
$(warning ################# TARGET_PLATFORM: $(TARGET_PLATFORM))
ifeq ($(strip $(TARGET_PLATFORM)), mt2731)
$(warning ################# TARGET_PLATFORM_MT2731)
diff --git a/src/lynq/framework/lynq-ril-service/src/ril.cpp b/src/lynq/framework/lynq-ril-service/src/ril.cpp
index 721f3d9..8266f40 100755
--- a/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -91,7 +91,9 @@
#include "lynq_fota.h"
/*lt add end*/
/*Warren add for t800 RIL service 2021_12_10 end*/
+#ifdef LED_SUPPORT
#include "led.h"
+#endif
#define LOG_TAG "DEMO_RIL"
#define WAIT_TIME_FOR_SIM_SWITCH 30
@@ -5671,7 +5673,9 @@
static void initCoditions()
{
+#ifdef LED_SUPPORT
mbtk_netled_init();
+#endif
mixer_init();
if(utils::is_support_dsds()) {
for(int i = 0; i < 2 ; i++) {
@@ -6170,7 +6174,9 @@
}
RLOGD("close socket fd");
close(server_socket_fd);
+#ifdef LED_SUPPORT
mbtk_netled_deinit();
+#endif
return ;
}
int LYNQ_RIL_respSocket(Parcel &p,RIL_Token t)
diff --git a/src/lynq/framework/lynq-ril-service/src/stateManager/stateManager.cpp b/src/lynq/framework/lynq-ril-service/src/stateManager/stateManager.cpp
index 8a9eb57..d4f3ce3 100755
--- a/src/lynq/framework/lynq-ril-service/src/stateManager/stateManager.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/stateManager/stateManager.cpp
@@ -47,7 +47,9 @@
#include "util/utils.h"
#include <cutils/jstring.h>
#include <liblog/lynq_deflog.h>
+#ifdef LED_SUPPORT
#include "led.h"
+#endif
#undef LOG_TAG
#define LOG_TAG "DEMO_MANAGER"
@@ -100,9 +102,10 @@
int screen_state= atoi(argv[1]);
p.writeInt32(screen_state);
-
+#ifdef LED_SUPPORT
mbtk_netled_state_update(screen_state==0 ? GPIO_NETLED_AP_GOINGSLEEP : GPIO_NETLED_AP_WAKEUP);
usleep(wait_led_update_effective_timer_ms*1000);
+#endif
p.setDataPosition(pos);
pRI->pCI->dispatchFunction(p, pRI);