From 6e880ecd28a090d2ff3d7a2e9abf49dd37f3f53b Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Thu, 20 Oct 2022 09:26:21 +0900 Subject: [PATCH] universal7885: fm-aidl: Export channel spacing --- .../apps/aidl-support/fm/default/Android.bp | 4 +++- .../apps/aidl-support/fm/default/FMSupport.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/universal7885-common/apps/aidl-support/fm/default/Android.bp b/universal7885-common/apps/aidl-support/fm/default/Android.bp index 1c87ffd..52c2fec 100644 --- a/universal7885-common/apps/aidl-support/fm/default/Android.bp +++ b/universal7885-common/apps/aidl-support/fm/default/Android.bp @@ -1,6 +1,8 @@ cc_defaults { name: "fm_aidl_defaults", - cflags: ["-DTRACK_SIZE=30"], + cflags: [ + "-DTRACK_SIZE=30", + "-DSYSFS_SPACING=3",], } cc_binary { diff --git a/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp b/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp index cb11794..bf80f38 100644 --- a/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp @@ -44,11 +44,11 @@ constexpr const char *FM_FREQ_SEEK = case GetType::GET_TYPE_FM_RMSSI: NOT_SUPPORTED; case GetType::GET_TYPE_FM_BEFORE_CHANNEL: - FileIO::writeline(FM_FREQ_SEEK, "0 " + std::to_string(3 * 10)); + FileIO::writeline(FM_FREQ_SEEK, "0 " + std::to_string(SYSFS_SPACING * 10)); *_aidl_return = FileIO::readline(FM_FREQ_CTL); break; case GetType::GET_TYPE_FM_NEXT_CHANNEL: - FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(3 * 10)); + FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(SYSFS_SPACING * 10)); *_aidl_return = FileIO::readline(FM_FREQ_CTL); break; case GetType::GET_TYPE_FM_SYSFS_IF: @@ -92,7 +92,7 @@ static inline bool vector_contains(const std::vector vec, ::ndk::ScopedAStatus FMSupport::getFreqsList(std::vector *_aidl_return) { RETURN_IF_FAILED_LOCK; for (int i = 0; i < TRACK_SIZE; i++) { - FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(3 * 10)); + FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(SYSFS_SPACING * 10)); int freq = FileIO::readline(FM_FREQ_CTL); if (vector_contains(*_aidl_return, freq)) continue;