Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate IUsbGadget implementation to AIDL am: d6d0b7d2ca am: a912032b9d

Browse source 
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2361897

Change-Id: I49efae705114ff4145a8b3ab0c930c4fbc40e52f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ricky Niu 2023-01-12 07:50:02 +00:00 • committed by Automerger Merge Worker
commit 7d8c7aa768
6 changed files with 177 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

17
usb/gadget/Android.bp
View file

@ -27,26 +27,27 @@ package {
cc_binary { cc_binary {
name: "android.hardware.usb.gadget-service.gs101", name: "android.hardware.usb.gadget-service.gs101",
relative_install_path: "hw", relative_install_path: "hw",
init_rc: ["android.hardware.usb.gadget-service.gs101.rc"], init_rc: ["android.hardware.usb.gadget-service.rc"],
vintf_fragments: [ vintf_fragments: [
"android.hardware.usb.gadget@1.2-service.gs101.xml", "android.hardware.usb.gadget-service.xml",
], ],
vendor: true,
srcs: ["service_gadget.cpp", "UsbGadget.cpp"], srcs: ["service_gadget.cpp", "UsbGadget.cpp"],
cflags: ["-Wall", "-Werror"], cflags: ["-Wall", "-Werror"],
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder",
"libhidlbase",
"liblog", "liblog",
"libutils", "libutils",
"libhardware", "android.frameworks.stats-V1-ndk",
"android.hardware.usb.gadget@1.0", "android.hardware.usb.gadget-V1-ndk",
"android.hardware.usb.gadget@1.1",
"android.hardware.usb.gadget@1.2",
"libcutils", "libcutils",
"libbinder_ndk",
], ],
static_libs: [ static_libs: [
"libpixelusb", "libpixelusb",
], ],
proprietary: true, proprietary: true,
export_shared_lib_headers: [
"android.frameworks.stats-V1-ndk",
],
} }

209
usb/gadget/UsbGadget.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "android.hardware.usb.gadget@1.2-service.gs101" #define LOG_TAG "android.hardware.usb.gadget.aidl-service"
#include "UsbGadget.h" #include "UsbGadget.h"
#include <dirent.h> #include <dirent.h>
@ -26,12 +26,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <aidl/android/frameworks/stats/IStats.h>
namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace usb { namespace usb {
namespace gadget { namespace gadget {
namespace V1_2 {
namespace implementation {
string enabledPath; string enabledPath;
constexpr char kHsi2cPath[] = "/sys/devices/platform/10d50000.hsi2c"; constexpr char kHsi2cPath[] = "/sys/devices/platform/10d50000.hsi2c";
@ -46,7 +47,7 @@ UsbGadget::UsbGadget() : mGadgetIrqPath("") {
} }
} }
V1_0::Status UsbGadget::getUsbGadgetIrqPath() { Status UsbGadget::getUsbGadgetIrqPath() {
std::string irqs; std::string irqs;
size_t read_pos = 0; size_t read_pos = 0;
size_t found_pos = 0; size_t found_pos = 0;
@ -93,17 +94,20 @@ void currentFunctionsAppliedCallback(bool functionsApplied, void *payload) {
gadget->mCurrentUsbFunctionsApplied = functionsApplied; gadget->mCurrentUsbFunctionsApplied = functionsApplied;
} }
Return<void> UsbGadget::getCurrentUsbFunctions(const sp<V1_0::IUsbGadgetCallback> &callback) { ScopedAStatus UsbGadget::getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback> &callback,
Return<void> ret = callback->getCurrentUsbFunctionsCb( int64_t in_transactionId) {
ScopedAStatus ret = callback->getCurrentUsbFunctionsCb(
mCurrentUsbFunctions, mCurrentUsbFunctions,
mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED); mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED,
in_transactionId);
if (!ret.isOk()) 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; std::string current_speed;
if (ReadFileToString(SPEED_PATH, &current_speed)) { if (ReadFileToString(SPEED_PATH, &current_speed)) {
current_speed = Trim(current_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") else if (current_speed == "UNKNOWN")
mUsbSpeed = UsbSpeed::UNKNOWN; mUsbSpeed = UsbSpeed::UNKNOWN;
else else
mUsbSpeed = UsbSpeed::RESERVED_SPEED; mUsbSpeed = UsbSpeed::UNKNOWN;
} else { } else {
ALOGE("Fail to read current speed"); ALOGE("Fail to read current speed");
mUsbSpeed = UsbSpeed::UNKNOWN; mUsbSpeed = UsbSpeed::UNKNOWN;
} }
if (callback) { if (callback) {
Return<void> ret = callback->getUsbSpeedCb(mUsbSpeed); ScopedAStatus ret = callback->getUsbSpeedCb(mUsbSpeed, in_transactionId);
if (!ret.isOk()) 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() { Status UsbGadget::tearDownGadget() {
if (resetGadget() != Status::SUCCESS) if (Status(resetGadget()) != Status::SUCCESS){
return Status::ERROR; return Status::ERROR;
}
if (monitorFfs.isMonitorRunning()) { if (monitorFfs.isMonitorRunning()) {
monitorFfs.reset(); monitorFfs.reset();
@ -149,139 +154,152 @@ V1_0::Status UsbGadget::tearDownGadget() {
return Status::SUCCESS; return Status::SUCCESS;
} }
static V1_0::Status validateAndSetVidPid(uint64_t functions) { static Status validateAndSetVidPid(uint64_t functions) {
V1_0::Status ret = Status::SUCCESS; Status ret = Status::SUCCESS;
std::string vendorFunctions = getVendorFunctions(); std::string vendorFunctions = getVendorFunctions();
switch (functions) { switch (functions) {
case static_cast<uint64_t>(GadgetFunction::MTP): case GadgetFunction::MTP:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee1"); ret = Status(setVidPid("0x18d1", "0x4ee1"));
} }
break; break;
case GadgetFunction::ADB | GadgetFunction::MTP: case GadgetFunction::ADB |
GadgetFunction::MTP:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee2"); ret = Status(setVidPid("0x18d1", "0x4ee2"));
} }
break; break;
case static_cast<uint64_t>(GadgetFunction::RNDIS): case GadgetFunction::RNDIS:
case GadgetFunction::RNDIS | GadgetFunction::NCM: case GadgetFunction::RNDIS |
GadgetFunction::NCM:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee3"); ret = Status(setVidPid("0x18d1", "0x4ee3"));
} }
break; break;
case GadgetFunction::ADB | GadgetFunction::RNDIS: case GadgetFunction::ADB |
case GadgetFunction::ADB | GadgetFunction::RNDIS | GadgetFunction::NCM: GadgetFunction::RNDIS:
case GadgetFunction::ADB |
GadgetFunction::RNDIS |
GadgetFunction::NCM:
if (vendorFunctions == "dm") { if (vendorFunctions == "dm") {
ret = setVidPid("0x04e8", "0x6862"); ret = Status(setVidPid("0x04e8", "0x6862"));
} else { } else {
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee4"); ret = Status(setVidPid("0x18d1", "0x4ee4"));
} }
} }
break; break;
case static_cast<uint64_t>(GadgetFunction::PTP): case GadgetFunction::PTP:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee5"); ret = Status(setVidPid("0x18d1", "0x4ee5"));
} }
break; break;
case GadgetFunction::ADB | GadgetFunction::PTP: case GadgetFunction::ADB |
GadgetFunction::PTP:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee6"); ret = Status(setVidPid("0x18d1", "0x4ee6"));
} }
break; break;
case static_cast<uint64_t>(GadgetFunction::ADB): case GadgetFunction::ADB:
if (vendorFunctions == "dm") { if (vendorFunctions == "dm") {
ret = setVidPid("0x04e8", "0x6862"); ret = Status(setVidPid("0x04e8", "0x6862"));
} else if (vendorFunctions == "etr_miu") { } else if (vendorFunctions == "etr_miu") {
ret = setVidPid("0x18d1", "0x4ee2"); ret = Status(setVidPid("0x18d1", "0x4ee2"));
} else if (vendorFunctions == "uwb_acm"){ } else if (vendorFunctions == "uwb_acm"){
ret = setVidPid("0x18d1", "0x4ee2"); ret = Status(setVidPid("0x18d1", "0x4ee2"));
} else { } else {
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee7"); ret = Status(setVidPid("0x18d1", "0x4ee7"));
} }
} }
break; break;
case static_cast<uint64_t>(GadgetFunction::MIDI): case GadgetFunction::MIDI:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee8"); ret = Status(setVidPid("0x18d1", "0x4ee8"));
} }
break; break;
case GadgetFunction::ADB | GadgetFunction::MIDI: case GadgetFunction::ADB |
GadgetFunction::MIDI:
if (!(vendorFunctions == "user" || vendorFunctions == "")) { if (!(vendorFunctions == "user" || vendorFunctions == "")) {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = Status::CONFIGURATION_NOT_SUPPORTED; ret = Status::CONFIGURATION_NOT_SUPPORTED;
} else { } else {
ret = setVidPid("0x18d1", "0x4ee9"); ret = Status(setVidPid("0x18d1", "0x4ee9"));
} }
break; break;
case static_cast<uint64_t>(GadgetFunction::ACCESSORY): case GadgetFunction::ACCESSORY:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x2d00"); ret = Status(setVidPid("0x18d1", "0x2d00"));
break; break;
case GadgetFunction::ADB | GadgetFunction::ACCESSORY: case GadgetFunction::ADB |
GadgetFunction::ACCESSORY:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x2d01"); ret = Status(setVidPid("0x18d1", "0x2d01"));
break; break;
case static_cast<uint64_t>(GadgetFunction::AUDIO_SOURCE): case GadgetFunction::AUDIO_SOURCE:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x2d02"); ret = Status(setVidPid("0x18d1", "0x2d02"));
break; break;
case GadgetFunction::ADB | GadgetFunction::AUDIO_SOURCE: case GadgetFunction::ADB |
GadgetFunction::AUDIO_SOURCE:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x2d03"); ret = Status(setVidPid("0x18d1", "0x2d03"));
break; break;
case GadgetFunction::ACCESSORY | GadgetFunction::AUDIO_SOURCE: case GadgetFunction::ACCESSORY |
GadgetFunction::AUDIO_SOURCE:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x2d04"); ret = Status(setVidPid("0x18d1", "0x2d04"));
break; break;
case GadgetFunction::ADB | GadgetFunction::ACCESSORY | GadgetFunction::AUDIO_SOURCE: case GadgetFunction::ADB |
GadgetFunction::ACCESSORY |
GadgetFunction::AUDIO_SOURCE:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x2d05"); ret = Status(setVidPid("0x18d1", "0x2d05"));
break; break;
case static_cast<uint64_t>(GadgetFunction::NCM): case GadgetFunction::NCM:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x4eeb"); ret = Status(setVidPid("0x18d1", "0x4eeb"));
break; break;
case GadgetFunction::ADB | GadgetFunction::NCM: case GadgetFunction::ADB |
GadgetFunction::NCM:
if (vendorFunctions == "dm") { if (vendorFunctions == "dm") {
ret = setVidPid("0x04e8", "0x6862"); ret = Status(setVidPid("0x04e8", "0x6862"));
} else { } else {
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x4eec"); ret = Status(setVidPid("0x18d1", "0x4eec"));
} }
break; break;
default: default:
@ -291,31 +309,33 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
return ret; return ret;
} }
Return<Status> UsbGadget::reset() { ScopedAStatus UsbGadget::reset() {
ALOGI("USB Gadget reset"); ALOGI("USB Gadget reset");
if (!WriteStringToFile("none", PULLUP_PATH)) { if (!WriteStringToFile("none", PULLUP_PATH)) {
ALOGI("Gadget cannot be pulled down"); ALOGI("Gadget cannot be pulled down");
return Status::ERROR; return ScopedAStatus::fromServiceSpecificErrorWithMessage(
-1, "Gadget cannot be pulled down");
} }
usleep(kDisconnectWaitUs); usleep(kDisconnectWaitUs);
if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) { if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
ALOGI("Gadget cannot be pulled up"); 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, Status UsbGadget::setupFunctions(long functions,
const sp<V1_0::IUsbGadgetCallback> &callback, const shared_ptr<IUsbGadgetCallback> &callback, uint64_t timeout,
uint64_t timeout) { int64_t in_transactionId) {
bool ffsEnabled = false; bool ffsEnabled = false;
int i = 0; int i = 0;
if (addGenericAndroidFunctions(&monitorFfs, functions, &ffsEnabled, &i) != if (Status(addGenericAndroidFunctions(&monitorFfs, functions, &ffsEnabled, &i)) !=
Status::SUCCESS) Status::SUCCESS)
return Status::ERROR; return Status::ERROR;
@ -346,7 +366,7 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions,
if ((functions & GadgetFunction::ADB) != 0) { if ((functions & GadgetFunction::ADB) != 0) {
ffsEnabled = true; ffsEnabled = true;
if (addAdb(&monitorFfs, &i) != Status::SUCCESS) if (Status(addAdb(&monitorFfs, &i)) != Status::SUCCESS)
return Status::ERROR; return Status::ERROR;
} }
@ -362,7 +382,7 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions,
return Status::ERROR; return Status::ERROR;
mCurrentUsbFunctionsApplied = true; mCurrentUsbFunctionsApplied = true;
if (callback) if (callback)
callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS); callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS, in_transactionId);
return Status::SUCCESS; return Status::SUCCESS;
} }
@ -377,12 +397,13 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions,
if (callback) { if (callback) {
bool pullup = monitorFfs.waitForPullUp(timeout); bool pullup = monitorFfs.waitForPullUp(timeout);
Return<void> ret = callback->setCurrentUsbFunctionsCb( ScopedAStatus ret = callback->setCurrentUsbFunctionsCb(
functions, pullup ? Status::SUCCESS : Status::ERROR); functions, pullup ? Status::SUCCESS : Status::ERROR, in_transactionId);
if (!ret.isOk()) if (!ret.isOk()) {
ALOGE("setCurrentUsbFunctionsCb error %s", ret.description().c_str()); ALOGE("setCurrentUsbFunctionsCb error %s", ret.getDescription().c_str());
return Status::ERROR;
}
} }
return Status::SUCCESS; return Status::SUCCESS;
} }
@ -409,9 +430,10 @@ Status getI2cBusHelper(string *name) {
return Status::ERROR; return Status::ERROR;
} }
Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions, ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions,
const sp<V1_0::IUsbGadgetCallback> &callback, const shared_ptr<IUsbGadgetCallback> &callback,
uint64_t timeout) { int64_t timeout,
int64_t in_transactionId) {
std::unique_lock<std::mutex> lk(mLockSetCurrentFunction); std::unique_lock<std::mutex> lk(mLockSetCurrentFunction);
std::string current_usb_power_operation_mode, current_usb_type; std::string current_usb_power_operation_mode, current_usb_type;
std::string usb_limit_sink_enable; std::string usb_limit_sink_enable;
@ -430,7 +452,7 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions,
getUsbGadgetIrqPath(); getUsbGadgetIrqPath();
// Unlink the gadget and stop the monitor if running. // Unlink the gadget and stop the monitor if running.
V1_0::Status status = tearDownGadget(); Status status = tearDownGadget();
if (status != Status::SUCCESS) { if (status != Status::SUCCESS) {
goto error; goto error;
} }
@ -440,13 +462,15 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions,
// Leave the gadget pulled down to give time for the host to sense disconnect. // Leave the gadget pulled down to give time for the host to sense disconnect.
usleep(kDisconnectWaitUs); usleep(kDisconnectWaitUs);
if (functions == static_cast<uint64_t>(GadgetFunction::NONE)) { if (functions == GadgetFunction::NONE) {
if (callback == NULL) if (callback == NULL)
return Void(); return ScopedAStatus::fromServiceSpecificErrorWithMessage(
Return<void> ret = callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS); -1, "callback == NULL");
ScopedAStatus ret = callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS, in_transactionId);
if (!ret.isOk()) if (!ret.isOk())
ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.description().c_str()); ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.getDescription().c_str());
return Void(); return ScopedAStatus::fromServiceSpecificErrorWithMessage(
-1, "Error while calling setCurrentUsbFunctionsCb");
} }
status = validateAndSetVidPid(functions); status = validateAndSetVidPid(functions);
@ -455,7 +479,7 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions,
goto error; goto error;
} }
status = setupFunctions(functions, callback, timeout); status = setupFunctions(functions, callback, timeout, in_transactionId);
if (status != Status::SUCCESS) { if (status != Status::SUCCESS) {
goto error; goto error;
} }
@ -495,20 +519,23 @@ Return<void> UsbGadget::setCurrentUsbFunctions(uint64_t functions,
} }
ALOGI("Usb Gadget setcurrent functions called successfully"); ALOGI("Usb Gadget setcurrent functions called successfully");
return Void(); return ScopedAStatus::fromServiceSpecificErrorWithMessage(
-1, "Usb Gadget setcurrent functions called successfully");
error: error:
ALOGI("Usb Gadget setcurrent functions failed"); ALOGI("Usb Gadget setcurrent functions failed");
if (callback == NULL) if (callback == NULL)
return Void(); return ScopedAStatus::fromServiceSpecificErrorWithMessage(
Return<void> ret = callback->setCurrentUsbFunctionsCb(functions, status); -1, "Usb Gadget setcurrent functions failed");
ScopedAStatus ret = callback->setCurrentUsbFunctionsCb(functions, status, in_transactionId);
if (!ret.isOk()) if (!ret.isOk())
ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.description().c_str()); ALOGE("Error while calling setCurrentUsbFunctionsCb %s", ret.getDescription().c_str());
return Void(); return ScopedAStatus::fromServiceSpecificErrorWithMessage(
-1, "Error while calling setCurrentUsbFunctionsCb");
} }
} // namespace implementation
} // namespace V1_2
} // namespace gadget } // namespace gadget
} // namespace usb } // namespace usb
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
} // aidl

60
usb/gadget/UsbGadget.h
View file

@ -21,11 +21,13 @@
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <android-base/parseint.h> #include <android-base/parseint.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android/hardware/usb/gadget/1.2/IUsbGadget.h> #include <aidl/android/hardware/usb/gadget/BnUsbGadget.h>
#include <android/hardware/usb/gadget/1.2/types.h> #include <aidl/android/hardware/usb/gadget/BnUsbGadgetCallback.h>
#include <hidl/MQDescriptor.h> #include <aidl/android/hardware/usb/gadget/GadgetFunction.h>
#include <hidl/Status.h> #include <aidl/android/hardware/usb/gadget/IUsbGadget.h>
#include <pixelusb/UsbGadgetCommon.h> #include <aidl/android/hardware/usb/gadget/IUsbGadgetCallback.h>
#include <pixelusb/UsbGadgetAidlCommon.h>
#include <sched.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <utils/Log.h> #include <utils/Log.h>
@ -35,14 +37,17 @@
#include <string> #include <string>
#include <thread> #include <thread>
namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace usb { namespace usb {
namespace gadget { 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::GetProperty;
using ::android::base::SetProperty; using ::android::base::SetProperty;
using ::android::base::ParseUint; using ::android::base::ParseUint;
@ -50,12 +55,6 @@ using ::android::base::unique_fd;
using ::android::base::ReadFileToString; using ::android::base::ReadFileToString;
using ::android::base::Trim; using ::android::base::Trim;
using ::android::base::WriteStringToFile; 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::addAdb;
using ::android::hardware::google::pixel::usb::addEpollFd; using ::android::hardware::google::pixel::usb::addEpollFd;
using ::android::hardware::google::pixel::usb::getVendorFunctions; 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::resetGadget;
using ::android::hardware::google::pixel::usb::setVidPid; using ::android::hardware::google::pixel::usb::setVidPid;
using ::android::hardware::google::pixel::usb::unlinkFunctions; using ::android::hardware::google::pixel::usb::unlinkFunctions;
using ::android::hardware::usb::gadget::V1_0::Status; using ::ndk::ScopedAStatus;
using ::android::hardware::usb::gadget::V1_0::IUsbGadgetCallback; using ::std::shared_ptr;
using ::android::hardware::usb::gadget::V1_2::IUsbGadget;
using ::android::hardware::usb::gadget::V1_2::GadgetFunction;
using ::std::string; using ::std::string;
constexpr char kGadgetName[] = "11110000.dwc3"; constexpr char kGadgetName[] = "11110000.dwc3";
@ -93,36 +90,39 @@ static MonitorFfs monitorFfs(kGadgetName);
#define CURRENT_USB_TYPE_PATH POWER_SUPPLY_PATH "usb_type" #define CURRENT_USB_TYPE_PATH POWER_SUPPLY_PATH "usb_type"
#define CURRENT_USB_POWER_OPERATION_MODE_PATH USB_PORT0_PATH "power_operation_mode" #define CURRENT_USB_POWER_OPERATION_MODE_PATH USB_PORT0_PATH "power_operation_mode"
struct UsbGadget : public IUsbGadget { struct UsbGadget : public BnUsbGadget {
UsbGadget(); UsbGadget();
// Makes sure that only one request is processed at a time. // Makes sure that only one request is processed at a time.
std::mutex mLockSetCurrentFunction; std::mutex mLockSetCurrentFunction;
std::string mGadgetIrqPath; std::string mGadgetIrqPath;
uint64_t mCurrentUsbFunctions; long mCurrentUsbFunctions;
bool mCurrentUsbFunctionsApplied; bool mCurrentUsbFunctionsApplied;
UsbSpeed mUsbSpeed; UsbSpeed mUsbSpeed;
Return<void> setCurrentUsbFunctions(uint64_t functions, ScopedAStatus setCurrentUsbFunctions(long functions,
const sp<V1_0::IUsbGadgetCallback> &callback, const shared_ptr<IUsbGadgetCallback> &callback,
uint64_t timeout) override; 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: private:
Status tearDownGadget(); Status tearDownGadget();
Status getUsbGadgetIrqPath(); Status getUsbGadgetIrqPath();
Status setupFunctions(uint64_t functions, const sp<V1_0::IUsbGadgetCallback> &callback, Status setupFunctions(long functions, const shared_ptr<IUsbGadgetCallback> &callback,
uint64_t timeout); uint64_t timeout, int64_t in_transactionId);
}; };
} // namespace implementation
} // namespace V1_2
} // namespace gadget } // namespace gadget
} // namespace usb } // namespace usb
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
} // aidl

2
usb/gadget/android.hardware.usb.gadget-service.gs101.rc → usb/gadget/android.hardware.usb.gadget-service.rc
View file

@ -1,4 +1,4 @@
service vendor.usb-gadget-hal-1-2 /vendor/bin/hw/android.hardware.usb.gadget-service.gs101 service vendor.usb-gadget-hal /vendor/bin/hw/android.hardware.usb.gadget-service.gs101
class hal class hal
user system user system
group system shell mtp wakelock group system shell mtp wakelock

5
usb/gadget/android.hardware.usb.gadget@1.2-service.gs101.xml → usb/gadget/android.hardware.usb.gadget-service.xml
View file

@ -1,8 +1,7 @@
<manifest version="1.0" type="device"> <manifest version="1.0" type="device">
<hal format="hidl"> <hal format="aidl">
<name>android.hardware.usb.gadget</name> <name>android.hardware.usb.gadget</name>
<transport>hwbinder</transport> <version>1</version>
<version>1.2</version>
<interface> <interface>
<name>IUsbGadget</name> <name>IUsbGadget</name>
<instance>default</instance> <instance>default</instance>

38
usb/gadget/service_gadget.cpp
View file

@ -16,35 +16,27 @@
#define LOG_TAG "android.hardware.usb.gadget-service.gs101" #define LOG_TAG "android.hardware.usb.gadget-service.gs101"
#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" #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::OK;
using android::sp;
using android::status_t; using android::status_t;
using aidl::android::hardware::usb::gadget::UsbGadget;
int main() { int main() {
android::sp<IUsbGadget> service = new UsbGadget(); ABinderProcess_setThreadPoolMaxThreadCount(0);
configureRpcThreadpool(2, true /*callerWillJoin*/); std::shared_ptr<UsbGadget> usbgadget = ndk::SharedRefBase::make<UsbGadget>();
status_t status = service->registerAsService();
if (status != OK) { const std::string instance = std::string() + UsbGadget::descriptor + "/default";
ALOGE("Cannot register USB Gadget HAL service"); binder_status_t status = AServiceManager_addService(usbgadget->asBinder().get(), instance.c_str());
return 1; CHECK(status == STATUS_OK);
}
ALOGI("USB gadget HAL Ready."); ALOGV("AIDL USB Gadget HAL about to start");
joinRpcThreadpool(); ABinderProcess_joinThreadPool();
// Under noraml cases, execution will not reach this line. return -1; // Should never be reached
ALOGI("USB gadget HAL failed to join thread pool.");
return 1;
} }