bunnypad/android_device_samsung_a20
Watch
1
0
Fork
You've already forked android_device_samsung_a20
 0
mirror of https://github.com/chararomandroid/android_device_samsung_a20 synced 2026-08-22 20:15:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

universal7885: FMRadio: jni: fix build errors

Browse source 
* Fix errors on FM HAL too

Change-Id: I95885939d55efa0b400fe55d0a444f64d1f65a51
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
This commit is contained in:
roynatech2544 2022-02-21 02:07:38 +09:00
commit 6235756b90
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
View file

@ -7,7 +7,7 @@
#include <unistd.h> #include <unistd.h>
#include <cerrno> #include <cerrno>
#include <iostream> #include <iostream>
#include "fm.h" #include "s610_radio.h"
#include "kernel_internal.h" #include "kernel_internal.h"
#include <algorithm> #include <algorithm>
#include <jni.h> #include <jni.h>
@ -117,7 +117,7 @@ static int fm_radio_channel_searching(int fd, unsigned int upward, unsigned int
{ {
int ret; int ret;
ret = fm_radio_set_control(fd, V4L2_CID_S610_SEEK_MODE, FM_TUNER_AUTONOMOUS_SEARCH_MODE_NEXT); ret = fm_radio_set_control(fd, V4L2_CID_S610_SEEK_MODE, FM_TUNER_AUTONOMOUS_SEARCH_MODE);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -194,6 +194,8 @@ bool contains(C&& c, T e) { return std::find(std::begin(c), std::end(c), e) != s
static long fm_radio_get_freqs(int fd){ static long fm_radio_get_freqs(int fd){
long ret = 0; long ret = 0;
fm_radio_set_mute(fd, true); fm_radio_set_mute(fd, true);
sp<IFMRadio> service = IFMRadio::getService();
bool mSysfs = service->isAvailable() == Status::YES;
for (long & track : tracks){ for (long & track : tracks){
if (mSysfs) { if (mSysfs) {
service->adjustFreqByStep(Direction::UP); service->adjustFreqByStep(Direction::UP);
@ -436,15 +438,28 @@ JNIEXPORT jint JNICALL
Java_com_eurekateam_fmradio_NativeFMInterface_getNextChannel Java_com_eurekateam_fmradio_NativeFMInterface_getNextChannel
(__unused JNIEnv *env, __unused jobject thiz, jint fd) { (__unused JNIEnv *env, __unused jobject thiz, jint fd) {
long ret; long ret;
fm_radio_channel_searching(fd, 1, 0, FM_CHANNEL_SPACING_100KHZ, &ret); sp<IFMRadio> service = IFMRadio::getService();
bool mSysfs = service->isAvailable() == Status::YES;
if (!mSysfs){
fm_radio_channel_searching(fd, 1, 0, FM_CHANNEL_SPACING_100KHZ, &ret);
} else {
service->adjustFreqByStep(Direction::UP);
ret = service->getFreqFromSysfs();
}
return ret; return ret;
} }
extern "C" extern "C"
JNIEXPORT jint JNICALL JNIEXPORT jint JNICALL
Java_com_eurekateam_fmradio_NativeFMInterface_getBeforeChannel Java_com_eurekateam_fmradio_NativeFMInterface_getBeforeChannel
(__unused JNIEnv *env, __unused jobject thiz, jint fd) { (__unused JNIEnv *env, __unused jobject thiz, jint fd) {
long ret; long ret;sp<IFMRadio> service = IFMRadio::getService();
fm_radio_channel_searching(fd, 0, 0, FM_CHANNEL_SPACING_100KHZ, &ret); bool mSysfs = service->isAvailable() == Status::YES;
if (!mSysfs){
fm_radio_channel_searching(fd, 0, 0, FM_CHANNEL_SPACING_100KHZ, &ret);
} else {
service->adjustFreqByStep(Direction::DOWN);
ret = service->getFreqFromSysfs();
}
return ret; return ret;
} }

0
universal7885-common/apps/FMRadio/jni/fm.h → universal7885-common/apps/FMRadio/jni/s610_radio.h
View file

2
universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
View file

@ -44,7 +44,7 @@ Return<void> FMRadio::adjustFreqByStep(fmradio::V1_0::Direction dir) {
file.close(); file.close();
return Void(); return Void();
} }
Return<int32_t> IFMRadio::isAvailable(){ Return<V1_1::Status> FMRadio::isAvailable(){
struct stat info; struct stat info;
if(stat("/sys/devices/virtual/s610_radio/s610_radio/", &info ) != 0) { if(stat("/sys/devices/virtual/s610_radio/s610_radio/", &info ) != 0) {
return V1_1::Status::NO; return V1_1::Status::NO;