Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 10:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds default (mock) Context Hub HAL 1.2 impl

Browse Source 
Also refactors common code.

Bug: 166845383
Test: Compile only (VTS test coming up in future CL)
Change-Id: Iae6cf09e2fffb854af61c29e6004ceb062a892b3
This commit is contained in:
Arthur Ishiguro
2020-10-06 11:05:17 -07:00
parent 08596b4629
commit 46c2bd0439
12 changed files with 344 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contexthub/1.1/default/Android.bp
View File

@@ -38,5 +38,8 @@ cc_binary {
"liblog",
"libutils",
],
header_libs: [
"android.hardware.contexthub@1.X-common-impl",
],
vintf_fragments: ["android.hardware.contexthub@1.1.xml"],
}

75
contexthub/1.1/default/Contexthub.cpp
View File

@@ -23,81 +23,6 @@ namespace contexthub {
namespace V1_1 {
namespace implementation {
using ::android::hardware::contexthub::V1_0::ContextHub;
using ::android::hardware::contexthub::V1_0::HubAppInfo;
using ::android::hardware::contexthub::V1_0::Result;
namespace {
constexpr uint32_t kMockHubId = 0;
} // anonymous namespace
Return<void> Contexthub::getHubs(getHubs_cb _hidl_cb) {
ContextHub hub = {};
hub.name = "Mock Context Hub";
hub.vendor = "AOSP";
hub.toolchain = "n/a";
hub.platformVersion = 1;
hub.toolchainVersion = 1;
hub.hubId = kMockHubId;
hub.peakMips = 1;
hub.peakPowerDrawMw = 1;
hub.maxSupportedMsgLen = 4096;
hub.chrePlatformId = UINT64_C(0x476f6f6754000000);
hub.chreApiMajorVersion = 1;
hub.chreApiMinorVersion = 4;
// Report a single mock hub
std::vector<ContextHub> hubs;
hubs.push_back(hub);
_hidl_cb(hubs);
return Void();
}
Return<Result> Contexthub::registerCallback(uint32_t hubId, const sp<IContexthubCallback>& cb) {
if (hubId == kMockHubId) {
mCallback = cb;
return Result::OK;
}
return Result::BAD_PARAMS;
}
// We don't expose any nanoapps, therefore all nanoapp-related API calls return with BAD_PARAMS
Return<Result> Contexthub::sendMessageToHub(uint32_t /*hubId*/, const ContextHubMsg& /*msg*/) {
return Result::BAD_PARAMS;
}
Return<Result> Contexthub::loadNanoApp(uint32_t /*hubId*/, const NanoAppBinary& /*appBinary*/,
uint32_t /*transactionId*/) {
return Result::BAD_PARAMS;
}
Return<Result> Contexthub::unloadNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,
uint32_t /*transactionId*/) {
return Result::BAD_PARAMS;
}
Return<Result> Contexthub::enableNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,
uint32_t /*transactionId*/) {
return Result::BAD_PARAMS;
}
Return<Result> Contexthub::disableNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,
uint32_t /*transactionId*/) {
return Result::BAD_PARAMS;
}
Return<Result> Contexthub::queryApps(uint32_t hubId) {
if (hubId == kMockHubId && mCallback != nullptr) {
std::vector<HubAppInfo> nanoapps;
mCallback->handleAppsInfo(nanoapps);
return Result::OK;
}
return Result::BAD_PARAMS;
}
Return<void> Contexthub::onSettingChanged(Setting /*setting*/, SettingValue /*newValue*/) {
return Void();
}

25
contexthub/1.1/default/Contexthub.h
View File

@@ -15,6 +15,8 @@
*/
#pragma once
#include "ContextHub.h"
#include <android/hardware/contexthub/1.1/IContexthub.h>
namespace android {
@@ -23,30 +25,11 @@ namespace contexthub {
namespace V1_1 {
namespace implementation {
class Contexthub : public V1_1::IContexthub {
using ContextHubMsg = ::android::hardware::contexthub::V1_0::ContextHubMsg;
using IContexthubCallback = ::android::hardware::contexthub::V1_0::IContexthubCallback;
using NanoAppBinary = ::android::hardware::contexthub::V1_0::NanoAppBinary;
using Result = ::android::hardware::contexthub::V1_0::Result;
class Contexthub
: public ::android::hardware::contexthub::V1_X::implementation::ContextHub<IContexthub> {
public:
// Methods from V1_0::IContexthub
Return<void> getHubs(getHubs_cb _hidl_cb) override;
Return<Result> registerCallback(uint32_t hubId,
const ::android::sp<IContexthubCallback>& cb) override;
Return<Result> sendMessageToHub(uint32_t hubId, const ContextHubMsg& msg) override;
Return<Result> loadNanoApp(uint32_t hubId, const NanoAppBinary& appBinary,
uint32_t transactionId) override;
Return<Result> unloadNanoApp(uint32_t hubId, uint64_t appId, uint32_t transactionId) override;
Return<Result> enableNanoApp(uint32_t hubId, uint64_t appId, uint32_t transactionId) override;
Return<Result> disableNanoApp(uint32_t hubId, uint64_t appId, uint32_t transactionId) override;
Return<Result> queryApps(uint32_t hubId) override;
// Methods from V1_1::IContexthub
Return<void> onSettingChanged(Setting setting, SettingValue newValue) override;
private:
sp<IContexthubCallback> mCallback;
};
} // namespace implementation

46
contexthub/1.2/default/Android.bp Normal file
View File

@@ -0,0 +1,46 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* 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.
*/
cc_binary {
name: "android.hardware.contexthub@1.2-service.mock",
defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
init_rc: ["android.hardware.contexthub@1.2-service.rc"],
srcs: [
"Contexthub.cpp",
"service.cpp",
],
cflags: [
"-Wall",
"-Werror",
],
shared_libs: [
"android.hardware.contexthub@1.0",
"android.hardware.contexthub@1.1",
"android.hardware.contexthub@1.2",
"libbase",
"libcutils",
"libhardware",
"libhidlbase",
"liblog",
"libutils",
],
header_libs: [
"android.hardware.contexthub@1.X-common-impl",
],
vintf_fragments: ["android.hardware.contexthub@1.2.xml"],
}

38
contexthub/1.2/default/Contexthub.cpp Normal file
View File

@@ -0,0 +1,38 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* 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.
*/
#include "Contexthub.h"
#include <vector>
namespace android {
namespace hardware {
namespace contexthub {
namespace V1_2 {
namespace implementation {
Return<void> Contexthub::onSettingChanged(SettingV1_1 /*setting*/, SettingValue /*newValue*/) {
return Void();
}
Return<void> Contexthub::onSettingChanged_1_2(Setting /*setting*/, SettingValue /*newValue*/) {
return Void();
}
} // namespace implementation
} // namespace V1_2
} // namespace contexthub
} // namespace hardware
} // namespace android

45
contexthub/1.2/default/Contexthub.h Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* 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.
*/
#pragma once
#include "ContextHub.h"
#include <android/hardware/contexthub/1.2/IContexthub.h>
namespace android {
namespace hardware {
namespace contexthub {
namespace V1_2 {
namespace implementation {
class Contexthub
: public ::android::hardware::contexthub::V1_X::implementation::ContextHub<IContexthub> {
using SettingValue = ::android::hardware::contexthub::V1_1::SettingValue;
using SettingV1_1 = ::android::hardware::contexthub::V1_1::Setting;
public:
// Methods from V1_1::IContexthub
Return<void> onSettingChanged(SettingV1_1 setting, SettingValue newValue) override;
// Methods from V1_2::IContexthub
Return<void> onSettingChanged_1_2(Setting setting, SettingValue newValue) override;
};
} // namespace implementation
} // namespace V1_2
} // namespace contexthub
} // namespace hardware
} // namespace android

3
contexthub/1.2/default/OWNERS Normal file
View File

@@ -0,0 +1,3 @@
arthuri@google.com
bduddie@google.com
stange@google.com

7
contexthub/1.2/default/android.hardware.contexthub@1.2-service.rc Normal file
View File

@@ -0,0 +1,7 @@
service vendor.contexthub-hal-1.2-mock /vendor/bin/hw/android.hardware.contexthub@1.2-service.mock
interface android.hardware.contexthub@1.0::IContexthub default
interface android.hardware.contexthub@1.1::IContexthub default
interface android.hardware.contexthub@1.2::IContexthub default
class hal
user context_hub
group context_hub

11
contexthub/1.2/default/android.hardware.contexthub@1.2.xml Normal file
View File

@@ -0,0 +1,11 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.contexthub</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>IContexthub</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

42
contexthub/1.2/default/service.cpp Normal file
View File

@@ -0,0 +1,42 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* 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.
*/
#define LOG_TAG "android.hardware.contexthub@1.2-service"
#include <android/hardware/contexthub/1.2/IContexthub.h>
#include <hidl/HidlTransportSupport.h>
#include <log/log.h>
#include <utils/StrongPointer.h>
#include "Contexthub.h"
using ::android::hardware::configureRpcThreadpool;
using ::android::hardware::joinRpcThreadpool;
using ::android::hardware::contexthub::V1_2::IContexthub;
using ::android::hardware::contexthub::V1_2::implementation::Contexthub;
int main() {
configureRpcThreadpool(1, true /* callerWillJoin */);
::android::sp<IContexthub> contexthub = new Contexthub();
if (contexthub->registerAsService() != ::android::OK) {
ALOGE("Failed to register Contexthub HAL instance");
return 1;
}
joinRpcThreadpool();
ALOGE("Service exited");
return 1;
}

28
contexthub/common/default/1.X/Android.bp Normal file
View File

@@ -0,0 +1,28 @@
//
// Copyright (C) 2020 The Android Open Source Project
//
// 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.
cc_library_headers {
name: "android.hardware.contexthub@1.X-common-impl",
vendor_available: true,
defaults: ["hidl_defaults"],
export_include_dirs: ["."],
shared_libs: [
"android.hardware.contexthub@1.0",
"libbinder",
"libcutils",
"libhidlbase",
"libutils",
],
}

117
contexthub/common/default/1.X/ContextHub.h Normal file
View File

@@ -0,0 +1,117 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* 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.
*/
#ifndef ANDROID_HARDWARE_CONTEXTHUB_V1_X_CONTEXTHUB_H
#define ANDROID_HARDWARE_CONTEXTHUB_V1_X_CONTEXTHUB_H
#include <android/hardware/contexthub/1.0/IContexthub.h>
#include <android/hardware/contexthub/1.0/types.h>
#include <hidl/Status.h>
namespace android {
namespace hardware {
namespace contexthub {
namespace V1_X {
namespace implementation {
template <class IContextHubInterface>
struct ContextHub : public IContextHubInterface {
using ContextHubMsg = ::android::hardware::contexthub::V1_0::ContextHubMsg;
using HubAppInfo = ::android::hardware::contexthub::V1_0::HubAppInfo;
using IContexthubCallback = ::android::hardware::contexthub::V1_0::IContexthubCallback;
using NanoAppBinary = ::android::hardware::contexthub::V1_0::NanoAppBinary;
using Result = ::android::hardware::contexthub::V1_0::Result;
using getHubs_cb = ::android::hardware::contexthub::V1_0::IContexthub::getHubs_cb;
public:
Return<void> getHubs(getHubs_cb _hidl_cb) override {
::android::hardware::contexthub::V1_0::ContextHub hub = {};
hub.name = "Mock Context Hub";
hub.vendor = "AOSP";
hub.toolchain = "n/a";
hub.platformVersion = 1;
hub.toolchainVersion = 1;
hub.hubId = kMockHubId;
hub.peakMips = 1;
hub.peakPowerDrawMw = 1;
hub.maxSupportedMsgLen = 4096;
hub.chrePlatformId = UINT64_C(0x476f6f6754000000);
hub.chreApiMajorVersion = 1;
hub.chreApiMinorVersion = 4;
// Report a single mock hub
std::vector<::android::hardware::contexthub::V1_0::ContextHub> hubs;
hubs.push_back(hub);
_hidl_cb(hubs);
return Void();
}
Return<Result> registerCallback(uint32_t hubId, const sp<IContexthubCallback>& cb) override {
if (hubId == kMockHubId) {
mCallback = cb;
return Result::OK;
}
return Result::BAD_PARAMS;
}
// We don't expose any nanoapps, therefore all nanoapp-related API calls return with BAD_PARAMS
Return<Result> sendMessageToHub(uint32_t /*hubId*/, const ContextHubMsg& /*msg*/) override {
return Result::BAD_PARAMS;
}
Return<Result> loadNanoApp(uint32_t /*hubId*/, const NanoAppBinary& /*appBinary*/,
uint32_t /*transactionId*/) override {
return Result::BAD_PARAMS;
}
Return<Result> unloadNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,
uint32_t /*transactionId*/) override {
return Result::BAD_PARAMS;
}
Return<Result> enableNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,
uint32_t /*transactionId*/) override {
return Result::BAD_PARAMS;
}
Return<Result> disableNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,
uint32_t /*transactionId*/) override {
return Result::BAD_PARAMS;
}
Return<Result> queryApps(uint32_t hubId) override {
if (hubId == kMockHubId && mCallback != nullptr) {
std::vector<HubAppInfo> nanoapps;
mCallback->handleAppsInfo(nanoapps);
return Result::OK;
}
return Result::BAD_PARAMS;
}
private:
static constexpr uint32_t kMockHubId = 0;
sp<IContexthubCallback> mCallback;
};
} // namespace implementation
} // namespace V1_X
} // namespace contexthub
} // namespace hardware
} // namespace android
#endif // ANDROID_HARDWARE_CONTEXTHUB_V1_X_CONTEXTHUB_H