From 83a81fc2096f890e711a89361f8448e4aeef2caf Mon Sep 17 00:00:00 2001 From: DidntRead <25854753+DidntRead@users.noreply.github.com> Date: Sun, 27 Jan 2019 08:28:45 +0200 Subject: [PATCH] update wifi hals --- usb/Android.mk | 22 ------ usb/Usb.cpp | 83 --------------------- usb/Usb.h | 52 ------------- usb/android.hardware.usb@1.0-service.mtk.rc | 4 - usb/service.cpp | 49 ------------ 5 files changed, 210 deletions(-) delete mode 100644 usb/Android.mk delete mode 100644 usb/Usb.cpp delete mode 100644 usb/Usb.h delete mode 100644 usb/android.hardware.usb@1.0-service.mtk.rc delete mode 100644 usb/service.cpp diff --git a/usb/Android.mk b/usb/Android.mk deleted file mode 100644 index ad4802b..0000000 --- a/usb/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.usb@1.0-service.mtk -LOCAL_INIT_RC := android.hardware.usb@1.0-service.mtk.rc -LOCAL_SRC_FILES := \ - service.cpp \ - Usb.cpp - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libhidlbase \ - libhidltransport \ - liblog \ - libutils \ - libhwbinder \ - libhardware \ - android.hardware.usb@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/usb/Usb.cpp b/usb/Usb.cpp deleted file mode 100644 index a7756c1..0000000 --- a/usb/Usb.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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 deleted file mode 100644 index 6f8740e..0000000 --- a/usb/Usb.h +++ /dev/null @@ -1,52 +0,0 @@ -#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.mtk" -#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.mtk.rc b/usb/android.hardware.usb@1.0-service.mtk.rc deleted file mode 100644 index 0c80bee..0000000 --- a/usb/android.hardware.usb@1.0-service.mtk.rc +++ /dev/null @@ -1,4 +0,0 @@ -service usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service.mtk - class hal - user system - group system diff --git a/usb/service.cpp b/usb/service.cpp deleted file mode 100644 index 4128097..0000000 --- a/usb/service.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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; -} -- GitLab