diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-03-01 13:57:15 -0800 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2018-03-05 14:17:07 -0800 |
| commit | 577fc6f2c848338702f3b0fde24842e560f3850e (patch) | |
| tree | 589e549c312ff539810d0b2f1ea8fe830bfbb1ad /init.hardware.usb.rc | |
| parent | c390010a2e23ae8489fa5cd802e3c8cc9d46dd35 (diff) | |
Mount ptp separately from mtp
Ptp is now mounted in its own directory so the
mtp endpoint does not need to be closed to write
the ptp descriptors.
sys.usb.ffs.mtp.ready is also now not needed.
Bug: 72877174
Test: switch config to mtp/ptp
Change-Id: I25bb33d628f93d2779c44ac22b6219a8ec3c4608
Diffstat (limited to 'init.hardware.usb.rc')
| -rw-r--r-- | init.hardware.usb.rc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/init.hardware.usb.rc b/init.hardware.usb.rc index 21d8b8f5..fc98ee2c 100644 --- a/init.hardware.usb.rc +++ b/init.hardware.usb.rc @@ -29,6 +29,7 @@ on boot mkdir /config/usb_gadget/g1/functions/midi.gs5 mkdir /config/usb_gadget/g1/functions/ffs.adb mkdir /config/usb_gadget/g1/functions/ffs.mtp + mkdir /config/usb_gadget/g1/functions/ffs.ptp mkdir /config/usb_gadget/g1/functions/diag.diag mkdir /config/usb_gadget/g1/functions/cser.dun.0 mkdir /config/usb_gadget/g1/functions/cser.nmea.1 @@ -42,18 +43,18 @@ on boot mkdir /dev/usb-ffs/adb 0770 shell shell mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000 mkdir /dev/usb-ffs/mtp 0770 mtp mtp + mkdir /dev/usb-ffs/ptp 0770 mtp mtp mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1 - setprop sys.usb.ffs.max_write 524288 - setprop sys.usb.ffs.max_read 524288 + mount functionfs ptp /dev/usb-ffs/ptp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1 setprop sys.usb.mtp.device_type 3 setprop sys.usb.configfs 1 setprop sys.usb.controller "a600000.dwc3" -on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp && property:sys.usb.configfs=1 +on property:sys.usb.config=mtp && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee1 symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 -on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 +on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee2 symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 @@ -65,13 +66,13 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,adb && property write /config/usb_gadget/g1/idProduct 0x4ee4 symlink /config/usb_gadget/g1/functions/gsi.rndis /config/usb_gadget/g1/configs/b.1/f1 -on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp && property:sys.usb.configfs=1 +on property:sys.usb.config=ptp && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee5 - symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 + symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1 -on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 +on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee6 - symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 + symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1 on property:sys.usb.config=adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee7 |