diff options
author | Avichal Rakesh <arakesh@google.com> | 2023-01-19 17:47:38 -0800 |
---|---|---|
committer | Avichal Rakesh <arakesh@google.com> | 2023-01-26 20:18:09 +0000 |
commit | 9ba92eed602f3f0237908df2485524c594b6d46b (patch) | |
tree | d93e15d5c179addb852ef3585d23154d99e4b06c | |
parent | 7e9ed22e6abc4fa2576d6bc9881b31bac94a1de9 (diff) | |
download | gs201-9ba92eed602f3f0237908df2485524c594b6d46b.tar.gz |
Migrate IUsbGadget implementation to AIDL
This change migrates IUsbGadget implementation to AIDL.
Port of commit <d6d0b7d2ca5066988ee90889dccd00c06d64b694>.
Bug: 218791946
Test: USB function switch success and AIDL service is running.
Change-Id: I9613178d3cd2f9abd5396e4af763a257a8ef62a7
-rw-r--r-- | usb/gadget/Android.bp | 14 | ||||
-rw-r--r-- | usb/gadget/UsbGadget.cpp | 213 | ||||
-rw-r--r-- | usb/gadget/UsbGadget.h | 60 | ||||
-rw-r--r-- | usb/gadget/android.hardware.usb.gadget-service.rc | 5 | ||||
-rw-r--r-- | usb/gadget/android.hardware.usb.gadget-service.xml | 5 | ||||
-rw-r--r-- | usb/gadget/service_gadget.cpp | 38 | ||||
-rw-r--r-- | usb/usb/Android.bp | 7 | ||||
-rw-r--r-- | usb/usb/Usb.cpp | 2 |
8 files changed, 184 insertions, 160 deletions
diff --git a/usb/gadget/Android.bp b/usb/gadget/Android.bp index 502c339..518a735 100644 --- a/usb/gadget/Android.bp +++ b/usb/gadget/Android.bp @@ -29,19 +29,21 @@ cc_binary { vintf_fragments: [ "android.hardware.usb.gadget-service.xml", ], + vendor: true, srcs: ["service_gadget.cpp", "UsbGadget.cpp"], cflags: ["-Wall", "-Werror"], shared_libs: [ "libbase", - "libhidlbase", "liblog", "libutils", - "libhardware", - "android.hardware.usb.gadget@1.0", - "android.hardware.usb.gadget@1.1", - "android.hardware.usb.gadget@1.2", + "android.frameworks.stats-V1-ndk", + "android.hardware.usb.gadget-V1-ndk", "libcutils", + "libbinder_ndk", ], - static_libs: ["libpixelusb"], + static_libs: ["libpixelusb-aidl"], proprietary: true, + export_shared_lib_headers: [ + "android.frameworks.stats-V1-ndk", + ], } diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index fed3a56..7e0b3bd 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.usb.gadget@1.2-service.gs201" +#define LOG_TAG "android.hardware.usb.gadget.aidl-service" #include "UsbGadget.h" #include <dirent.h> @@ -26,12 +26,13 @@ #include <sys/types.h> #include <unistd.h> +#include <aidl/android/frameworks/stats/IStats.h> + +namespace aidl { namespace android { namespace hardware { namespace usb { namespace gadget { -namespace V1_2 { -namespace implementation { string enabledPath; constexpr char kHsi2cPath[] = "/sys/devices/platform/10d60000.hsi2c"; @@ -46,7 +47,7 @@ UsbGadget::UsbGadget() : mGadgetIrqPath("") { } } -V1_0::Status UsbGadget::getUsbGadgetIrqPath() { +Status UsbGadget::getUsbGadgetIrqPath() { std::string irqs; size_t read_pos = 0; size_t found_pos = 0; @@ -93,17 +94,20 @@ void currentFunctionsAppliedCallback(bool functionsApplied, void *payload) { gadget->mCurrentUsbFunctionsApplied = functionsApplied; } -Return<void> UsbGadget::getCurrentUsbFunctions(const sp<V1_0::IUsbGadgetCallback> &callback) { - Return<void> ret = callback->getCurrentUsbFunctionsCb( +ScopedAStatus UsbGadget::getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback> &callback, + int64_t in_transactionId) { + ScopedAStatus ret = callback->getCurrentUsbFunctionsCb( mCurrentUsbFunctions, - mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED); + mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED, + in_transactionId); if (!ret.isOk()) - ALOGE("Call to getCurrentUsbFunctionsCb failed %s", ret.description().c_str()); + ALOGE("Call to getCurrentUsbFunctionsCb failed %s", ret.getDescription().c_str()); - return Void(); + return ScopedAStatus::ok(); } -Return<void> UsbGadget::getUsbSpeed(const sp<V1_2::IUsbGadgetCallback> &callback) { +ScopedAStatus UsbGadget::getUsbSpeed(const shared_ptr<IUsbGadgetCallback> &callback, + int64_t in_transactionId) { std::string current_speed; if (ReadFileToString(SPEED_PATH, ¤t_speed)) { current_speed = Trim(current_speed); @@ -121,25 +125,26 @@ Return<void> UsbGadget::getUsbSpeed(const sp<V1_2::IUsbGadgetCallback> &callback else if (current_speed == "UNKNOWN") mUsbSpeed = UsbSpeed::UNKNOWN; else - mUsbSpeed = UsbSpeed::RESERVED_SPEED; + mUsbSpeed = UsbSpeed::UNKNOWN; } else { ALOGE("Fail to read current speed"); mUsbSpeed = UsbSpeed::UNKNOWN; } if (callback) { - Return<void> ret = callback->getUsbSpeedCb(mUsbSpeed); + ScopedAStatus ret = callback->getUsbSpeedCb(mUsbSpeed, in_transactionId); if (!ret.isOk()) - ALOGE("Call to getUsbSpeedCb failed %s", ret.description().c_str()); + ALOGE("Call to getUsbSpeedCb failed %s", ret.getDescription().c_str()); } - return Void(); + return ScopedAStatus::ok(); } -V1_0::Status UsbGadget::tearDownGadget() { - if (resetGadget() != Status::SUCCESS) +Status UsbGadget::tearDownGadget() { + if (Status(resetGadget()) != Status::SUCCESS){ return Status::ERROR; + } if (monitorFfs.isMonitorRunning()) { monitorFfs.reset(); @@ -149,137 +154,152 @@ V1_0::Status UsbGadget::tearDownGadget() { return Status::SUCCESS; } -static V1_0::Status validateAndSetVidPid(uint64_t functions) { - V1_0::Status ret = Status::SUCCESS; +static Status validateAndSetVidPid(uint64_t functions) { + Status ret = Status::SUCCESS; std::string vendorFunctions = getVendorFunctions(); switch (functions) { - case static_cast<uint64_t>(GadgetFunction::MTP): + case GadgetFunction::MTP: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee1"); + ret = Status(setVidPid("0x18d1", "0x4ee1")); } break; - case GadgetFunction::ADB | GadgetFunction::MTP: + case GadgetFunction::ADB | + GadgetFunction::MTP: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee2"); + ret = Status(setVidPid("0x18d1", "0x4ee2")); } break; - case static_cast<uint64_t>(GadgetFunction::RNDIS): + case GadgetFunction::RNDIS: + case GadgetFunction::RNDIS | + GadgetFunction::NCM: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee3"); + ret = Status(setVidPid("0x18d1", "0x4ee3")); } break; - case GadgetFunction::ADB | GadgetFunction::RNDIS: + case GadgetFunction::ADB | + GadgetFunction::RNDIS: + case GadgetFunction::ADB | + GadgetFunction::RNDIS | + GadgetFunction::NCM: if (vendorFunctions == "dm") { - ret = setVidPid("0x04e8", "0x6862"); + ret = Status(setVidPid("0x04e8", "0x6862")); } else { if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee4"); + ret = Status(setVidPid("0x18d1", "0x4ee4")); } } break; - case static_cast<uint64_t>(GadgetFunction::PTP): + case GadgetFunction::PTP: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee5"); + ret = Status(setVidPid("0x18d1", "0x4ee5")); } break; - case GadgetFunction::ADB | GadgetFunction::PTP: + case GadgetFunction::ADB | + GadgetFunction::PTP: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee6"); + ret = Status(setVidPid("0x18d1", "0x4ee6")); } break; - case static_cast<uint64_t>(GadgetFunction::ADB): + case GadgetFunction::ADB: if (vendorFunctions == "dm") { - ret = setVidPid("0x04e8", "0x6862"); + ret = Status(setVidPid("0x04e8", "0x6862")); } else if (vendorFunctions == "etr_miu") { - ret = setVidPid("0x18d1", "0x4ee2"); - } else if (vendorFunctions == "uwb_acm") { - ret = setVidPid("0x18d1", "0x4ee2"); + ret = Status(setVidPid("0x18d1", "0x4ee2")); + } else if (vendorFunctions == "uwb_acm"){ + ret = Status(setVidPid("0x18d1", "0x4ee2")); } else { if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee7"); + ret = Status(setVidPid("0x18d1", "0x4ee7")); } } break; - case static_cast<uint64_t>(GadgetFunction::MIDI): + case GadgetFunction::MIDI: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee8"); + ret = Status(setVidPid("0x18d1", "0x4ee8")); } break; - case GadgetFunction::ADB | GadgetFunction::MIDI: + case GadgetFunction::ADB | + GadgetFunction::MIDI: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; } else { - ret = setVidPid("0x18d1", "0x4ee9"); + ret = Status(setVidPid("0x18d1", "0x4ee9")); } break; - case static_cast<uint64_t>(GadgetFunction::ACCESSORY): + case GadgetFunction::ACCESSORY: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x2d00"); + ret = Status(setVidPid("0x18d1", "0x2d00")); break; - case GadgetFunction::ADB | GadgetFunction::ACCESSORY: + case GadgetFunction::ADB | + GadgetFunction::ACCESSORY: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x2d01"); + ret = Status(setVidPid("0x18d1", "0x2d01")); break; - case static_cast<uint64_t>(GadgetFunction::AUDIO_SOURCE): + case GadgetFunction::AUDIO_SOURCE: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x2d02"); + ret = Status(setVidPid("0x18d1", "0x2d02")); break; - case GadgetFunction::ADB | GadgetFunction::AUDIO_SOURCE: + case GadgetFunction::ADB | + GadgetFunction::AUDIO_SOURCE: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x2d03"); + ret = Status(setVidPid("0x18d1", "0x2d03")); break; - case GadgetFunction::ACCESSORY | GadgetFunction::AUDIO_SOURCE: + case GadgetFunction::ACCESSORY | + GadgetFunction::AUDIO_SOURCE: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x2d04"); + ret = Status(setVidPid("0x18d1", "0x2d04")); break; - case GadgetFunction::ADB | GadgetFunction::ACCESSORY | GadgetFunction::AUDIO_SOURCE: + case GadgetFunction::ADB | + GadgetFunction::ACCESSORY | + GadgetFunction::AUDIO_SOURCE: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x2d05"); + ret = Status(setVidPid("0x18d1", "0x2d05")); break; - case static_cast<uint64_t>(GadgetFunction::NCM): + case GadgetFunction::NCM: if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x4eeb"); + ret = Status(setVidPid("0x18d1", "0x4eeb")); break; - case GadgetFunction::ADB | GadgetFunction::NCM: + case GadgetFunction::ADB | + GadgetFunction::NCM: if (vendorFunctions == "dm") { - ret = setVidPid("0x04e8", "0x6862"); + ret = Status(setVidPid("0x04e8", "0x6862")); } else { if (!(vendorFunctions == "user" || vendorFunctions == "")) ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x4eec"); + ret = Status(setVidPid("0x18d1", "0x4eec")); } break; default: @@ -289,31 +309,33 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) { return ret; } -Return<Status> UsbGadget::reset() { +ScopedAStatus UsbGadget::reset() { ALOGI("USB Gadget reset"); if (!WriteStringToFile("none", PULLUP_PATH)) { ALOGI("Gadget cannot be pulled down"); - return Status::ERROR; + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "Gadget cannot be pulled down"); } usleep(kDisconnectWaitUs); if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) { ALOGI("Gadget cannot be pulled up"); - return Status::ERROR; + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "Gadget cannot be pulled up"); } - return Status::SUCCESS; + return ScopedAStatus::ok(); } -V1_0::Status UsbGadget::setupFunctions(uint64_t functions, - const sp<V1_0::IUsbGadgetCallback> &callback, - uint64_t timeout) { +Status UsbGadget::setupFunctions(long functions, + const shared_ptr<IUsbGadgetCallback> &callback, uint64_t timeout, + int64_t in_transactionId) { bool ffsEnabled = false; int i = 0; - if (addGenericAndroidFunctions(&monitorFfs, functions, &ffsEnabled, &i) != + if (Status(addGenericAndroidFunctions(&monitorFfs, functions, &ffsEnabled, &i)) != Status::SUCCESS) return Status::ERROR; @@ -328,7 +350,7 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, ALOGI("enable usbradio debug functions"); if ((functions & GadgetFunction::RNDIS) != 0) { if (linkFunction("acm.gs6", i++)) - return Status::ERROR; + return Status::ERROR; if (linkFunction("dm.gs7", i++)) return Status::ERROR; } else { @@ -336,7 +358,7 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, return Status::ERROR; if (linkFunction("acm.gs6", i++)) return Status::ERROR; - } + } } else if (vendorFunctions == "etr_miu") { ALOGI("enable etr_miu functions"); if (linkFunction("etr_miu.gs11", i++)) @@ -349,7 +371,7 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, if ((functions & GadgetFunction::ADB) != 0) { ffsEnabled = true; - if (addAdb(&monitorFfs, &i) != Status::SUCCESS) + if (Status(addAdb(&monitorFfs, &i)) != Status::SUCCESS) return Status::ERROR; } @@ -364,7 +386,7 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, return Status::ERROR; mCurrentUsbFunctionsApplied = true; if (callback) - callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS); + callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS, in_transactionId); return Status::SUCCESS; } @@ -379,12 +401,13 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, if (callback) { bool pullup = monitorFfs.waitForPullUp(timeout); - Return<void> ret = callback->setCurrentUsbFunctionsCb( - functions, pullup ? Status::SUCCESS : Status::ERROR); - if (!ret.isOk()) - ALOGE("setCurrentUsbFunctionsCb error %s", ret.description().c_str()); + ScopedAStatus ret = callback->setCurrentUsbFunctionsCb( + functions, pullup ? Status::SUCCESS : Status::ERROR, in_transactionId); + if (!ret.isOk()) { + ALOGE("setCurrentUsbFunctionsCb error %s", ret.getDescription().c_str()); + return Status::ERROR; + } } - return Status::SUCCESS; } @@ -411,9 +434,10 @@ Status getI2cBusHelper(string *name) { return Status::ERROR; } -Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions, - const sp<V1_0::IUsbGadgetCallback> &callback, - uint64_t timeout) { +ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, + const shared_ptr<IUsbGadgetCallback> &callback, + int64_t timeout, + int64_t in_transactionId) { std::unique_lock<std::mutex> lk(mLockSetCurrentFunction); std::string current_usb_power_operation_mode, current_usb_type; std::string usb_limit_sink_enable; @@ -432,7 +456,7 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions, getUsbGadgetIrqPath(); // Unlink the gadget and stop the monitor if running. - V1_0::Status status = tearDownGadget(); + Status status = tearDownGadget(); if (status != Status::SUCCESS) { goto error; } @@ -442,13 +466,15 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions, // Leave the gadget pulled down to give time for the host to sense disconnect. usleep(kDisconnectWaitUs); - if (functions == static_cast<uint64_t>(GadgetFunction::NONE)) { + if (functions == GadgetFunction::NONE) { if (callback == NULL) - return Void(); - Return<void> ret = callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS); + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "callback == NULL"); + ScopedAStatus ret = callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS, in_transactionId); if (!ret.isOk()) - ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.description().c_str()); - return Void(); + ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.getDescription().c_str()); + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "Error while calling setCurrentUsbFunctionsCb"); } status = validateAndSetVidPid(functions); @@ -457,7 +483,7 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions, goto error; } - status = setupFunctions(functions, callback, timeout); + status = setupFunctions(functions, callback, timeout, in_transactionId); if (status != Status::SUCCESS) { goto error; } @@ -497,20 +523,23 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions, } ALOGI("Usb Gadget setcurrent functions called successfully"); - return Void(); + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "Usb Gadget setcurrent functions called successfully"); + error: ALOGI("Usb Gadget setcurrent functions failed"); if (callback == NULL) - return Void(); - Return<void> ret = callback->setCurrentUsbFunctionsCb(functions, status); + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "Usb Gadget setcurrent functions failed"); + ScopedAStatus ret = callback->setCurrentUsbFunctionsCb(functions, status, in_transactionId); if (!ret.isOk()) - ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.description().c_str()); - return Void(); + ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.getDescription().c_str()); + return ScopedAStatus::fromServiceSpecificErrorWithMessage( + -1, "Error while calling setCurrentUsbFunctionsCb"); } -} // namespace implementation -} // namespace V1_2 } // namespace gadget } // namespace usb } // namespace hardware } // namespace android +} // aidl diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index 61e6e79..1254c8f 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -21,11 +21,13 @@ #include <android-base/unique_fd.h> #include <android-base/parseint.h> #include <android-base/strings.h> -#include <android/hardware/usb/gadget/1.2/IUsbGadget.h> -#include <android/hardware/usb/gadget/1.2/types.h> -#include <hidl/MQDescriptor.h> -#include <hidl/Status.h> -#include <pixelusb/UsbGadgetCommon.h> +#include <aidl/android/hardware/usb/gadget/BnUsbGadget.h> +#include <aidl/android/hardware/usb/gadget/BnUsbGadgetCallback.h> +#include <aidl/android/hardware/usb/gadget/GadgetFunction.h> +#include <aidl/android/hardware/usb/gadget/IUsbGadget.h> +#include <aidl/android/hardware/usb/gadget/IUsbGadgetCallback.h> +#include <pixelusb/UsbGadgetAidlCommon.h> +#include <sched.h> #include <sys/epoll.h> #include <sys/eventfd.h> #include <utils/Log.h> @@ -35,14 +37,17 @@ #include <string> #include <thread> +namespace aidl { namespace android { namespace hardware { namespace usb { namespace gadget { -namespace V1_2 { -namespace implementation { -using ::android::sp; +using ::aidl::android::hardware::usb::gadget::GadgetFunction; +using ::aidl::android::hardware::usb::gadget::IUsbGadgetCallback; +using ::aidl::android::hardware::usb::gadget::IUsbGadget; +using ::aidl::android::hardware::usb::gadget::Status; +using ::aidl::android::hardware::usb::gadget::UsbSpeed; using ::android::base::GetProperty; using ::android::base::SetProperty; using ::android::base::ParseUint; @@ -50,12 +55,6 @@ using ::android::base::unique_fd; using ::android::base::ReadFileToString; using ::android::base::Trim; using ::android::base::WriteStringToFile; -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::hardware::google::pixel::usb::addAdb; using ::android::hardware::google::pixel::usb::addEpollFd; using ::android::hardware::google::pixel::usb::getVendorFunctions; @@ -66,10 +65,8 @@ using ::android::hardware::google::pixel::usb::MonitorFfs; using ::android::hardware::google::pixel::usb::resetGadget; using ::android::hardware::google::pixel::usb::setVidPid; using ::android::hardware::google::pixel::usb::unlinkFunctions; -using ::android::hardware::usb::gadget::V1_0::Status; -using ::android::hardware::usb::gadget::V1_0::IUsbGadgetCallback; -using ::android::hardware::usb::gadget::V1_2::IUsbGadget; -using ::android::hardware::usb::gadget::V1_2::GadgetFunction; +using ::ndk::ScopedAStatus; +using ::std::shared_ptr; using ::std::string; constexpr char kGadgetName[] = "11210000.dwc3"; @@ -93,36 +90,39 @@ static MonitorFfs monitorFfs(kGadgetName); #define CURRENT_USB_TYPE_PATH POWER_SUPPLY_PATH "usb_type" #define CURRENT_USB_POWER_OPERATION_MODE_PATH USB_PORT0_PATH "power_operation_mode" -struct UsbGadget : public IUsbGadget { +struct UsbGadget : public BnUsbGadget { UsbGadget(); // Makes sure that only one request is processed at a time. std::mutex mLockSetCurrentFunction; std::string mGadgetIrqPath; - uint64_t mCurrentUsbFunctions; + long mCurrentUsbFunctions; bool mCurrentUsbFunctionsApplied; UsbSpeed mUsbSpeed; - Return<void> setCurrentUsbFunctions(uint64_t functions, - const sp<V1_0::IUsbGadgetCallback> &callback, - uint64_t timeout) override; + ScopedAStatus setCurrentUsbFunctions(long functions, + const shared_ptr<IUsbGadgetCallback> &callback, + int64_t timeout, int64_t in_transactionId) override; - Return<void> getCurrentUsbFunctions(const sp<V1_0::IUsbGadgetCallback> &callback) override; + ScopedAStatus getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback> &callback, + int64_t in_transactionId) override; - Return<Status> reset() override; + ScopedAStatus reset() override; - Return<void> getUsbSpeed(const sp<V1_2::IUsbGadgetCallback> &callback) override; + ScopedAStatus getUsbSpeed(const shared_ptr<IUsbGadgetCallback> &callback, + int64_t in_transactionId) override; + + ScopedAStatus setVidPid(const char *vid,const char *pid); private: Status tearDownGadget(); Status getUsbGadgetIrqPath(); - Status setupFunctions(uint64_t functions, const sp<V1_0::IUsbGadgetCallback> &callback, - uint64_t timeout); + Status setupFunctions(long functions, const shared_ptr<IUsbGadgetCallback> &callback, + uint64_t timeout, int64_t in_transactionId); }; -} // namespace implementation -} // namespace V1_2 } // namespace gadget } // namespace usb } // namespace hardware } // namespace android +} // aidl diff --git a/usb/gadget/android.hardware.usb.gadget-service.rc b/usb/gadget/android.hardware.usb.gadget-service.rc index e3c3b0d..bcedcc6 100644 --- a/usb/gadget/android.hardware.usb.gadget-service.rc +++ b/usb/gadget/android.hardware.usb.gadget-service.rc @@ -1,7 +1,8 @@ -service vendor.usb-gadget-hal-1-2 /vendor/bin/hw/android.hardware.usb.gadget-service +service vendor.usb-gadget-hal /vendor/bin/hw/android.hardware.usb.gadget-service class hal user system - group system shell mtp + group system shell mtp wakelock + capabilities WAKE_ALARM BLOCK_SUSPEND on post-fs chown root system /sys/class/typec/port0/power_role diff --git a/usb/gadget/android.hardware.usb.gadget-service.xml b/usb/gadget/android.hardware.usb.gadget-service.xml index 8557f6f..e7eebc3 100644 --- a/usb/gadget/android.hardware.usb.gadget-service.xml +++ b/usb/gadget/android.hardware.usb.gadget-service.xml @@ -1,8 +1,7 @@ <manifest version="1.0" type="device"> - <hal format="hidl"> + <hal format="aidl"> <name>android.hardware.usb.gadget</name> - <transport>hwbinder</transport> - <version>1.2</version> + <version>1</version> <interface> <name>IUsbGadget</name> <instance>default</instance> diff --git a/usb/gadget/service_gadget.cpp b/usb/gadget/service_gadget.cpp index 6339ebf..3634b5d 100644 --- a/usb/gadget/service_gadget.cpp +++ b/usb/gadget/service_gadget.cpp @@ -16,35 +16,27 @@ #define LOG_TAG "android.hardware.usb.gadget-service" -#include <hidl/HidlTransportSupport.h> +#include <android-base/logging.h> +#include <android/binder_manager.h> +#include <android/binder_process.h> +#include <utils/Log.h> #include "UsbGadget.h" -using android::sp; - -// libhwbinder: -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -// Generated HIDL files -using android::hardware::usb::gadget::V1_2::IUsbGadget; -using android::hardware::usb::gadget::V1_2::implementation::UsbGadget; - using android::OK; +using android::sp; using android::status_t; +using aidl::android::hardware::usb::gadget::UsbGadget; + int main() { - android::sp<IUsbGadget> service = new UsbGadget(); - configureRpcThreadpool(2, true /*callerWillJoin*/); - status_t status = service->registerAsService(); + ABinderProcess_setThreadPoolMaxThreadCount(0); + std::shared_ptr<UsbGadget> usbgadget = ndk::SharedRefBase::make<UsbGadget>(); - if (status != OK) { - ALOGE("Cannot register USB Gadget HAL service"); - return 1; - } + const std::string instance = std::string() + UsbGadget::descriptor + "/default"; + binder_status_t status = AServiceManager_addService(usbgadget->asBinder().get(), instance.c_str()); + CHECK(status == STATUS_OK); - ALOGI("USB gadget HAL Ready."); - joinRpcThreadpool(); - // Under noraml cases, execution will not reach this line. - ALOGI("USB gadget HAL failed to join thread pool."); - return 1; + ALOGV("AIDL USB Gadget HAL about to start"); + ABinderProcess_joinThreadPool(); + return -1; // Should never be reached } diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 961079d..6817e87 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -44,8 +44,9 @@ cc_binary { "libhardware", "android.hardware.thermal@1.0", "android.hardware.thermal@2.0", - "android.hardware.usb.gadget@1.0", - "android.hardware.usb-V1-ndk", + "android.hardware.usb.gadget@1.0", + "android.hardware.usb-V1-ndk", + "android.hardware.usb.gadget-V1-ndk", "libcutils", "android.frameworks.stats-V1-ndk", "pixelatoms-cpp", @@ -53,7 +54,7 @@ cc_binary { ], static_libs: [ - "libpixelusb", + "libpixelusb-aidl", "libpixelstats", ], export_shared_lib_headers: [ diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index f25ee34..8ba4a74 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -39,7 +39,7 @@ #include "Usb.h" #include <aidl/android/frameworks/stats/IStats.h> -#include <pixelusb/UsbGadgetCommon.h> +#include <pixelusb/UsbGadgetAidlCommon.h> #include <pixelstats/StatsHelper.h> using aidl::android::frameworks::stats::IStats; |