diff --git a/Android.bp b/Android.bp index 9515b25..8490765 100644 --- a/Android.bp +++ b/Android.bp @@ -1,2 +1,6 @@ soong_namespace { } + +subdirs = [ + "usb", +] diff --git a/device.mk b/device.mk index 28ff58c..9745655 100644 --- a/device.mk +++ b/device.mk @@ -224,7 +224,7 @@ PRODUCT_PACKAGES += \ # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.1.vendor + android.hardware.usb@1.0-service.breeze # Vibrator PRODUCT_PACKAGES += \ diff --git a/manifest.xml b/manifest.xml index e316bad..e3f6ac9 100644 --- a/manifest.xml +++ b/manifest.xml @@ -206,12 +206,12 @@ android.hardware.usb hwbinder - 1.1 + 1.0 IUsb default - @1.1::IUsb/default + @1.0::IUsb/default android.hardware.wifi diff --git a/proprietary-files.txt b/proprietary-files.txt index 0af53ad..8038990 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -413,7 +413,6 @@ vendor/lib64/libstagefrighthw.so # Mediatek vendor/bin/hw/android.hardware.sensors@1.0-service-mediatek -vendor/bin/hw/android.hardware.usb@1.1-service-mediatek vendor/bin/hw/vendor.mediatek.hardware.dfps@1.0-service vendor/bin/hw/vendor.mediatek.hardware.log@1.0-service vendor/bin/hw/vendor.mediatek.hardware.mms@1.1-service @@ -421,7 +420,6 @@ vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service vendor/bin/hw/vendor.mediatek.hardware.power@2.0-service vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service vendor/etc/init/android.hardware.sensors@1.0-service-mediatek.rc -vendor/etc/init/android.hardware.usb@1.1-service-mediatek.rc vendor/etc/init/vendor.mediatek.hardware.dfps@1.0-service.rc vendor/etc/init/vendor.mediatek.hardware.log@1.0-service.rc vendor/etc/init/vendor.mediatek.hardware.mms@1.1-service.rc diff --git a/usb/Android.bp b/usb/Android.bp new file mode 100644 index 0000000..fbec409 --- /dev/null +++ b/usb/Android.bp @@ -0,0 +1,29 @@ +// +// Copyright (C) 2017 The LineageOS 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.usb@1.0-service.breeze", + relative_install_path: "hw", + init_rc: ["android.hardware.usb@1.0-service.breeze.rc"], + srcs: ["service.cpp", "Usb.cpp"], + shared_libs: [ + "libcutils", + "libhidlbase", + "liblog", + "libutils", + "libhardware", + "android.hardware.usb@1.0", + ], + proprietary: true, +} diff --git a/usb/Usb.cpp b/usb/Usb.cpp new file mode 100644 index 0000000..c4141b8 --- /dev/null +++ b/usb/Usb.cpp @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2017 The LineageOS 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 +#include +#include +#include + +#include +#include + +#include "Usb.h" + +namespace android { +namespace hardware { +namespace usb { +namespace V1_0 { +namespace implementation { + +Return Usb::switchRole(const hidl_string &portName, + const PortRole &newRole) { + (void)portName; + (void)newRole; + ALOGE("%s: Not supported", __func__); + return Void(); +} + +Return Usb::queryPortStatus() { + hidl_vec currentPortStatus; + currentPortStatus.resize(1); + + /* this device is not type C and can only be a sink */ + currentPortStatus[0].portName = "otg_default"; + currentPortStatus[0].currentDataRole = PortDataRole::DEVICE; + currentPortStatus[0].currentPowerRole = PortPowerRole::SINK; + currentPortStatus[0].currentMode = PortMode::UFP; + currentPortStatus[0].canChangeMode = false; + currentPortStatus[0].canChangeDataRole = false; + currentPortStatus[0].canChangePowerRole = false; + currentPortStatus[0].supportedModes = PortMode::UFP; + + pthread_mutex_lock(&mLock); + if (mCallback != NULL) { + Return ret = + mCallback->notifyPortStatusChange(currentPortStatus, Status::SUCCESS); + if (!ret.isOk()) + ALOGE("queryPortStatus error %s", ret.description().c_str()); + } else { + ALOGI("Notifying userspace skipped. Callback is NULL"); + } + pthread_mutex_unlock(&mLock); + + return Void(); +} + +Return Usb::setCallback(const sp &callback) { + pthread_mutex_lock(&mLock); + + mCallback = callback; + ALOGI("registering callback"); + + pthread_mutex_unlock(&mLock); + return Void(); +} + +} // namespace implementation +} // namespace V1_0 +} // namespace usb +} // namespace hardware +} // namespace android diff --git a/usb/Usb.h b/usb/Usb.h new file mode 100644 index 0000000..71051ef --- /dev/null +++ b/usb/Usb.h @@ -0,0 +1,52 @@ +#ifndef ANDROID_HARDWARE_USB_V1_0_USB_H +#define ANDROID_HARDWARE_USB_V1_0_USB_H + +#include +#include +#include +#include + +#ifdef LOG_TAG +#undef LOG_TAG +#endif + +#define LOG_TAG "android.hardware.usb@1.0-service.breeze" +#define UEVENT_MSG_LEN 2048 + +namespace android { +namespace hardware { +namespace usb { +namespace V1_0 { +namespace implementation { + +using ::android::hardware::usb::V1_0::IUsb; +using ::android::hardware::usb::V1_0::IUsbCallback; +using ::android::hardware::usb::V1_0::PortRole; +using ::android::hidl::base::V1_0::IBase; +using ::android::hardware::hidl_array; +using ::android::hardware::hidl_memory; +using ::android::hardware::hidl_string; +using ::android::hardware::hidl_vec; +using ::android::hardware::Return; +using ::android::hardware::Void; +using ::android::sp; + +struct Usb : public IUsb { + Return switchRole(const hidl_string& portName, const PortRole& role) override; + Return setCallback(const sp& callback) override; + Return queryPortStatus() override; + + sp mCallback; + pthread_mutex_t mLock = PTHREAD_MUTEX_INITIALIZER; + + private: + pthread_t mPoll; +}; + +} // namespace implementation +} // namespace V1_0 +} // namespace usb +} // namespace hardware +} // namespace android + +#endif // ANDROID_HARDWARE_USB_V1_0_USB_H diff --git a/usb/android.hardware.usb@1.0-service.breeze.rc b/usb/android.hardware.usb@1.0-service.breeze.rc new file mode 100644 index 0000000..fa3f721 --- /dev/null +++ b/usb/android.hardware.usb@1.0-service.breeze.rc @@ -0,0 +1,4 @@ +service usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service.breeze + class hal + user system + group system diff --git a/usb/service.cpp b/usb/service.cpp new file mode 100644 index 0000000..4128097 --- /dev/null +++ b/usb/service.cpp @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2017 The LineageOS jProject + * + * 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 +#include "Usb.h" + +using android::sp; + +// libhwbinder: +using android::hardware::configureRpcThreadpool; +using android::hardware::joinRpcThreadpool; + +// Generated HIDL files +using android::hardware::usb::V1_0::IUsb; +using android::hardware::usb::V1_0::implementation::Usb; + +using android::status_t; +using android::OK; + +int main() { + android::sp service = new Usb(); + + configureRpcThreadpool(1, true /*callerWillJoin*/); + status_t status = service->registerAsService(); + + if (status != OK) { + ALOGE("Cannot register USB HAL service"); + return 1; + } + + ALOGI("USB HAL Ready."); + joinRpcThreadpool(); + // Under noraml cases, execution will not reach this line. + ALOGI("USB HAL failed to join thread pool."); + return 1; +}