From 111f3529ae07230db4536b137331b67efa65e227 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Thu, 3 Nov 2022 20:39:15 +0900 Subject: [PATCH] universal7885: fm-aidl-support: Cleanup logs - __func__ macros in lambda is useless, nuke it - Append function name on impl lib - Remove useless logging --- .../apps/aidl-support/fm/default/FMDevControl.cpp | 6 ++---- .../fm/default/libfm_slsi-impl/FMDeviceControl.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp b/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp index 45d311d..63ebe79 100644 --- a/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp @@ -149,15 +149,13 @@ namespace aidl::vendor::eureka::hardware::fmradio { client_observe_thread = std::thread([=] { pid_t pid = value; - LOG_D("%s: FM_APP_PID: recieved value %d", __func__, pid); + LOG_D("FM_APP_PID: received value %d", pid); while (true) { if (kill(pid, 0) < 0 && errno == ESRCH) break; std::this_thread::sleep_for(std::chrono::seconds(2)); } - LOG_W("%s: FM_APP_PID: Starting client death receiver", __func__); + LOG_W("FM_APP_PID: Starting client death receiver"); fm_radio_slsi::fm_thread_set(fd, 0); - auto svc = IAudioRoute::fromBinder(ndk::SpAIBinder(AServiceManager_waitForService("vendor.eureka.hardware.audio_route.IAudioRoute/default"))); - svc->setParam("l_fmradio_mode=off"); close(); }); client_observe_thread.detach(); diff --git a/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FMDeviceControl.cpp b/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FMDeviceControl.cpp index f153d5a..c0c6433 100644 --- a/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FMDeviceControl.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FMDeviceControl.cpp @@ -65,7 +65,7 @@ int get_frequency(const int fd, int *channel) { *channel = static_cast(freq.frequency) / 16000; - LOG_D("Channel freq: %d", *channel); + LOG_D("%s: Channel freq: %d", __func__, *channel); return ret; } @@ -73,7 +73,7 @@ void set_frequency(const int fd, int channel) { struct v4l2_frequency freq {}; int ret; - LOG_D("Channel freq: %d", channel); + LOG_D("%s: Channel freq: %d", __func__, channel); freq.tuner = 0; freq.type = V4L2_TUNER_RADIO; @@ -89,8 +89,6 @@ static int set_control(const int fd, unsigned int id, int val) { int ret; ctrl.id = id; - LOG_D("Control value: %d", val); - if (val) ctrl.value = static_cast(val); else