universal7885: interfaces: Implement FMRadio HAL V1.2

* Also, track our fork of OneUI theme lib

* Implement read from sysfs interface which can fix channel searching on some cases

* Commit link: fead45ba0e

Change-Id: I81532b7f8169637fdcad0f678790a2b1f1888ecc
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>

universal7885-common/apps/FMRadio/Android.bp

@@ -14,6 +14,7 @@ android_app {
     ],
     required: [
     	"privapp_whitelist_com.eurekateam.fmradio.xml",
+    	"vendor.eureka.hardware.fmradio@1.2-service",
     ],
     optimize: {
         proguard_flags_files: ["rules.pro"],

universal7885-common/apps/FMRadio/jni/Android.bp

@@ -4,6 +4,14 @@ cc_library_shared {
         "-Wno-unused-parameter",
     ],
     srcs: ["fm_ioctl.cpp"],
+    shared_libs: [
+        "libhidlbase",
+        "liblog",
+        "libutils",
+        "vendor.eureka.hardware.fmradio@1.0",
+        "vendor.eureka.hardware.fmradio@1.1",
+        "vendor.eureka.hardware.fmradio@1.2",
+    ],
     header_libs: ["jni_headers"],
 }
 

universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp

@@ -11,6 +11,16 @@
 #include "kernel_internal.h"
 #include <algorithm>
 #include <jni.h>
+#include <hardware/hardware.h>
+#include <hidl/HidlSupport.h>
+#include <hidl/LegacySupport.h>
+#include <hidl/Status.h>
+#include <vendor/eureka/hardware/fmradio/1.2/IFMRadio.h>
+
+using android::sp;
+using vendor::eureka::hardware::fmradio::V1_2::IFMRadio;
+using vendor::eureka::hardware::fmradio::V1_0::Direction;
+using vendor::eureka::hardware::fmradio::V1_1::Status;
 
 //#define DEBUG
 #define TRACK_SIZE 30
@@ -185,7 +195,12 @@ static long fm_radio_get_freqs(int fd){
     long ret = 0;
     fm_radio_set_mute(fd, true);
     for (long & track : tracks){
+    	if (mSysfs) {
+    		service->adjustFreqByStep(Direction::UP);
+    		ret = (long) service->getFreqFromSysfs();
+    	} else {
     		fm_radio_channel_searching(fd, 1, 0, FM_CHANNEL_SPACING_50KHZ, &ret);
+    	}
     	if (contains(tracks, ret)) break;
     	track = ret;
     	printf("Found Freq %ld\n", ret);

universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal

@@ -17,5 +17,6 @@ package vendor.eureka.hardware.fmradio@1.1;
 import @1.0::IFMRadio;
 
 interface IFMRadio extends @1.0::IFMRadio {
+	getFreqFromSysfs() generates (int32_t freq);
 	isAvailable() generates (Status	status);
 };

universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp

@@ -0,0 +1,14 @@
+hidl_interface { 
+    name: "vendor.eureka.hardware.fmradio@1.2",
+    root: "vendor.eureka",  
+    srcs: [
+       "types.hal",
+       "IFMRadio.hal",
+    ],
+    interfaces: [ 
+    	"android.hidl.base@1.0",
+    	"vendor.eureka.hardware.fmradio@1.1",
+    	"vendor.eureka.hardware.fmradio@1.0",
+    ],
+    gen_java: true,
+}

universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal

@@ -0,0 +1,22 @@
+// Copyright (C) 2021 Eureka Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vendor.eureka.hardware.fmradio@1.2;
+
+import @1.1::IFMRadio;
+
+interface IFMRadio extends @1.1::IFMRadio {
+	setChannelSpacing(Space space);
+	getChannelSpacing() generates (Space space);
+};

universal7885-common/interfaces/hardware/fmradio/1.2/default/Android.bp

@@ -1,7 +1,7 @@
 // FIXME: your file license if you have one
 
 cc_binary {
-    name: "vendor.eureka.hardware.fmradio@1.1-service",
+    name: "vendor.eureka.hardware.fmradio@1.2-service",
     relative_install_path: "hw",
     proprietary: true,
     srcs: [
@@ -14,7 +14,8 @@ cc_binary {
         "liblog",
         "vendor.eureka.hardware.fmradio@1.0",
         "vendor.eureka.hardware.fmradio@1.1",
+        "vendor.eureka.hardware.fmradio@1.2",
     ],
-    init_rc: [ "vendor.eureka.hardware.fmradio@1.1-service.rc" ],
+    init_rc: [ "vendor.eureka.hardware.fmradio@1.2-service.rc" ],
-    vintf_fragments: [ "vendor.eureka.hardware.fmradio@1.1.xml" ],
+    vintf_fragments: [ "vendor.eureka.hardware.fmradio@1.2.xml" ],
 }

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

@@ -19,9 +19,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-namespace vendor::eureka::hardware::fmradio::V1_1 {
+static int mChannelSpacing = 3;
 
-Return<void> IFMRadio::setManualFreq(float freq) {
+namespace vendor::eureka::hardware::fmradio::V1_2 {
+
+Return<void> FMRadio::setManualFreq(float freq) {
     std::ofstream file;
     file.open("/sys/devices/virtual/s610_radio/s610_radio/radio_freq_ctrl");
     file << freq * 1000;
@@ -29,13 +31,13 @@ Return<void> IFMRadio::setManualFreq(float freq) {
     return Void();
 }
 
-Return<void> IFMRadio::adjustFreqByStep(fmradio::V1_0::Direction dir) {
+Return<void> FMRadio::adjustFreqByStep(fmradio::V1_0::Direction dir) {
     std::ofstream file;
     std::string value = "";
-    if (dir == Direction::UP){
+    if (dir == V1_0::Direction::UP){
-    	value = "1 50";
+    	value = "1 " + std::to_string(mChannelSpacing * 10);
-    } else if (dir == Direction::DOWN){
+    } else if (dir == V1_0::Direction::DOWN){
-    	value = "0 50";
+    	value = "0 " + std::to_string(mChannelSpacing * 10);
     }
     file.open("/sys/devices/virtual/s610_radio/s610_radio/radio_freq_seek");
     file << value;
@@ -45,12 +47,34 @@ Return<void> IFMRadio::adjustFreqByStep(fmradio::V1_0::Direction dir) {
 Return<int32_t> IFMRadio::isAvailable(){
     struct stat info;
     if(stat("/sys/devices/virtual/s610_radio/s610_radio/", &info ) != 0) {
-    	return Status::NO;
+    	return V1_1::Status::NO;
-    else
+    } else {
-    	return Status::YES;
+    	return V1_1::Status::YES;
     }
 }
-IFMRadio* IFMRadio::getInstance(void) {
+Return<void> FMRadio::setChannelSpacing(V1_2::Space space){
+    mChannelSpacing = (int) space;
+    return Void();
+}
+Return<int32_t> FMRadio::getFreqFromSysfs(){
+    std::ifstream file;
+    std::string value;
+    file.open("/sys/devices/virtual/s610_radio/s610_radio/radio_freq_ctrl");
+    std::getline(file, value);
+    file.close();
+    return std::stoi(value);
+}  
+Return<V1_2::Space> FMRadio::getChannelSpacing(){
+    switch (mChannelSpacing) {
+    	case 1: return V1_2::Space::CHANNEL_SPACING_10HZ;
+    	case 2: return V1_2::Space::CHANNEL_SPACING_20HZ;
+    	case 3: return V1_2::Space::CHANNEL_SPACING_30HZ;
+    	case 4: return V1_2::Space::CHANNEL_SPACING_40HZ;
+    	case 5: return V1_2::Space::CHANNEL_SPACING_50HZ;
+    	default: return V1_2::Space::CHANNEL_SPACING_30HZ;
+    }
+}
+IFMRadio* FMRadio::getInstance(void) {
     return new FMRadio();
 }
 }  // namespace vendor::eureka::hardware::fmradio::V1_0

universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.h

@@ -16,9 +16,9 @@
 
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
-#include <vendor/eureka/hardware/fmradio/1.1/IFMRadio.h>
+#include <vendor/eureka/hardware/fmradio/1.2/IFMRadio.h>
 
-namespace vendor::eureka::hardware::fmradio::V1_1 {
+namespace vendor::eureka::hardware::fmradio::V1_2 {
 
 using ::android::sp;
 using ::android::hardware::hidl_array;
@@ -31,9 +31,13 @@ using ::android::hardware::Void;
 struct FMRadio : public IFMRadio {
     // Methods from ::vendor::eureka::hardware::fmradio::V1_0::IFMRadio follow.
     Return<void> setManualFreq(float freq);
-    Return<void> adjustFreqByStep(Direction dir);
+    Return<void> adjustFreqByStep(V1_0::Direction dir);
     // Methods from ::vendor::eureka::hardware::fmradio::V1_1::IFMRadio follow.
-    Return<int32_t> isAvailable();
+    Return<V1_1::Status> isAvailable();
+    Return<int32_t> getFreqFromSysfs();
+    // Methods from ::vendor::eureka::hardware::fmradio::V1_2::IFMRadio follow.
+    Return<void> setChannelSpacing(V1_2::Space space);
+    Return<V1_2::Space> getChannelSpacing();
     // Methods from ::android::hidl::base::V1_0::IBase follow.
     static IFMRadio* getInstance(void);
 };

universal7885-common/interfaces/hardware/fmradio/1.2/default/service.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#define LOG_TAG "vendor.eureka.hardware.fmradio@1.0-service"
+#define LOG_TAG "vendor.eureka.hardware.fmradio@1.2-service"
 
-#include <vendor/eureka/hardware/fmradio/1.1/IFMRadio.h>
+#include <vendor/eureka/hardware/fmradio/1.2/IFMRadio.h>
 
 #include <hidl/LegacySupport.h>
 
@@ -23,8 +23,8 @@
 using android::sp;
 using android::hardware::configureRpcThreadpool;
 using android::hardware::joinRpcThreadpool;
-using vendor::eureka::hardware::fmradio::V1_1::FMRadio;
+using vendor::eureka::hardware::fmradio::V1_2::FMRadio;
-using vendor::eureka::hardware::fmradio::V1_1::IFMRadio;
+using vendor::eureka::hardware::fmradio::V1_2::IFMRadio;
 
 int main() {
     int ret;

universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc

@@ -1,6 +1,7 @@
-service vendor.parts-hal /vendor/bin/hw/vendor.eureka.hardware.fmradio@1.1-service
+service vendor.parts-hal /vendor/bin/hw/vendor.eureka.hardware.fmradio@1.2-service
     interface vendor.eureka.hardware.fmradio@1.0::IFMRadio default
     interface vendor.eureka.hardware.fmradio@1.1::IFMRadio default
+    interface vendor.eureka.hardware.fmradio@1.2::IFMRadio default
     class hal
     user root
     group root

universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml

@@ -2,7 +2,7 @@
    <hal format="hidl">
      <name>vendor.eureka.hardware.fmradio</name>
      <transport>hwbinder</transport>
-     <version>1.1</version>
+     <version>1.2</version>
      <interface>
          <name>IFMRadio</name>
          <instance>default</instance>

universal7885-common/interfaces/hardware/fmradio/1.2/types.hal

@@ -0,0 +1,23 @@
+// Copyright (C) 2021 Eureka Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vendor.eureka.hardware.fmradio@1.2;
+
+enum Space : int32_t {
+	CHANNEL_SPACING_10HZ = 1,
+	CHANNEL_SPACING_20HZ,
+	CHANNEL_SPACING_30HZ,
+	CHANNEL_SPACING_40HZ,
+	CHANNEL_SPACING_50HZ = 5,
+};

universal7885-common/vendorsetup.sh

@@ -11,6 +11,7 @@ git clone https://github.com/lineageos/android_hardware_samsung_nfc hardware/sam
 git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt
 git clone https://github.com/eurekadevelopment/android_hardware_samsung_slsi_scsc_wifibt_wifi_hal.git hardware/samsung_slsi/scsc_wifibt/wifi_hal
 git clone https://github.com/lineageos/android_hardware_samsung_slsi_scsc_wifibt_wpa_supplicant_lib hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib
+git clone https://github.com/eurekadevelopment/OneUI-Design-Library external/OneUI --depth=1
 # Vendors
 git clone --depth=1 https://github.com/eurekadevelopment/android_vendor_samsung_exynos7885.git -b master vendor/samsung
 if test -f device/samsung/universal7885-common/vendor_name; then