Skip to content

Commit

Permalink
breeze: Add basic USB HAL that reports no status change
Browse files Browse the repository at this point in the history
Change-Id: I0f51179b6a3cedefcdfb3da6fb2a836d14c10102
Signed-off-by: Sarthak Roy <sarthakroy2002@gmail.com>
  • Loading branch information
intervigilium authored and Hadenix committed Oct 13, 2023
1 parent 8b3834c commit 522e21e
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Android.bp
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
soong_namespace {
}

subdirs = [
"usb",
]
2 changes: 1 addition & 1 deletion device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down
4 changes: 2 additions & 2 deletions manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,12 @@
<hal format="hidl">
<name>android.hardware.usb</name>
<transport>hwbinder</transport>
<version>1.1</version>
<version>1.0</version>
<interface>
<name>IUsb</name>
<instance>default</instance>
</interface>
<fqname>@1.1::IUsb/default</fqname>
<fqname>@1.0::IUsb/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.wifi</name>
Expand Down
2 changes: 0 additions & 2 deletions proprietary-files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -413,15 +413,13 @@ 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
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
Expand Down
29 changes: 29 additions & 0 deletions usb/Android.bp
Original file line number Diff line number Diff line change
@@ -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,
}
82 changes: 82 additions & 0 deletions usb/Usb.cpp
Original file line number Diff line number Diff line change
@@ -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 <pthread.h>
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>

#include <utils/Errors.h>
#include <utils/StrongPointer.h>

#include "Usb.h"

namespace android {
namespace hardware {
namespace usb {
namespace V1_0 {
namespace implementation {

Return<void> Usb::switchRole(const hidl_string &portName,
const PortRole &newRole) {
(void)portName;
(void)newRole;
ALOGE("%s: Not supported", __func__);
return Void();
}

Return<void> Usb::queryPortStatus() {
hidl_vec<PortStatus> 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<void> 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<void> Usb::setCallback(const sp<IUsbCallback> &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
52 changes: 52 additions & 0 deletions usb/Usb.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#ifndef ANDROID_HARDWARE_USB_V1_0_USB_H
#define ANDROID_HARDWARE_USB_V1_0_USB_H

#include <android/hardware/usb/1.0/IUsb.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <utils/Log.h>

#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<void> switchRole(const hidl_string& portName, const PortRole& role) override;
Return<void> setCallback(const sp<IUsbCallback>& callback) override;
Return<void> queryPortStatus() override;

sp<IUsbCallback> 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
4 changes: 4 additions & 0 deletions usb/android.hardware.usb@1.0-service.breeze.rc
Original file line number Diff line number Diff line change
@@ -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
49 changes: 49 additions & 0 deletions usb/service.cpp
Original file line number Diff line number Diff line change
@@ -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 <hidl/HidlTransportSupport.h>
#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<IUsb> 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;
}

0 comments on commit 522e21e

Please sign in to comment.