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

usb: support both rndis and ncm, but not rndis + ncm

Browse source 
A cherry pick from 49a13bf for gs101

Bug: 199252036
Test: Boot to home and usb hal bring up normally
Change-Id: Ia4e344aa9cf7762b71cbfe35ff9cbcccb4474b11
This commit is contained in:
Albert Wang 2021-09-23 14:42:20 +08:00
parent 210475ce59
commit 3773ce8687
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conf/init.gs201.usb.rc
View file

@ -43,8 +43,9 @@ on early-boot
write /config/usb_gadget/g1/functions/rndis.gs4/class e0 write /config/usb_gadget/g1/functions/rndis.gs4/class e0
write /config/usb_gadget/g1/functions/rndis.gs4/subclass 01 write /config/usb_gadget/g1/functions/rndis.gs4/subclass 01
write /config/usb_gadget/g1/functions/rndis.gs4/protocol 03 write /config/usb_gadget/g1/functions/rndis.gs4/protocol 03
write /config/usb_gadget/g1/functions/rndis.gs4/os_desc/interface.ncm/compatible_id RNDIS
write /config/usb_gadget/g1/functions/rndis.gs4/ifname rndis%d write /config/usb_gadget/g1/functions/rndis.gs4/ifname rndis%d
setprop vendor.usb.rndis.config ncm.gs9 setprop vendor.usb.rndis.config rndis.gs4
# midi function # midi function
mkdir /config/usb_gadget/g1/functions/midi.gs5 mkdir /config/usb_gadget/g1/functions/midi.gs5
@ -61,6 +62,7 @@ on early-boot
# ncm function # ncm function
mkdir /config/usb_gadget/g1/functions/ncm.gs9 mkdir /config/usb_gadget/g1/functions/ncm.gs9
write /config/usb_gadget/g1/functions/ncm.gs9/os_desc/interface.ncm/compatible_id WINNCM write /config/usb_gadget/g1/functions/ncm.gs9/os_desc/interface.ncm/compatible_id WINNCM
write /config/usb_gadget/g1/functions/ncm.gs9/ifname ncm%d
# etr_miu function # etr_miu function
mkdir /config/usb_gadget/g1/functions/etr_miu.gs11 mkdir /config/usb_gadget/g1/functions/etr_miu.gs11

6
usb/UsbGadget.cpp
View file

@ -223,14 +223,12 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
case static_cast<uint64_t>(GadgetFunction::NCM): case static_cast<uint64_t>(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());
// TODO(b/170953147): need to request a new PID. Sharing PID of rndis now. ret = setVidPid("0x18d1", "0x4eeb");
ret = setVidPid("0x18d1", "0x4ee3");
break; break;
case GadgetFunction::ADB | GadgetFunction::NCM: case GadgetFunction::ADB | 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());
// TODO(b/170953147): need to request a new PID. Sharing PID of rndis+adb now. ret = setVidPid("0x18d1", "0x4eec");
ret = setVidPid("0x18d1", "0x4ee4");
break; break;
default: default:
ALOGE("Combination not supported"); ALOGE("Combination not supported");