diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-03-01 12:18:17 -0800 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2018-03-05 14:22:36 -0800 |
| commit | fd8844183f7d8082d2910dcc1e6bb0e8c0fc6915 (patch) | |
| tree | 1a5f590fd2166e02fbaf294f11c686f306552e84 | |
| parent | 2ab599f5bc798ffbaf82d6a6a12c9ba310b81cce (diff) | |
| download | hikey-fd8844183f7d8082d2910dcc1e6bb0e8c0fc6915.tar.gz | |
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: Ib81b63831f8898ddd9f73848b77b7c83edce4d11
| -rw-r--r-- | init.common.usb.rc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/init.common.usb.rc b/init.common.usb.rc index 5d6986b3..f198a8b5 100644 --- a/init.common.usb.rc +++ b/init.common.usb.rc @@ -13,6 +13,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/configs/b.1 0770 shell shell mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1 @@ -22,7 +23,9 @@ 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 + 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.ffs.aio_compat 1 @@ -31,12 +34,12 @@ on boot on property:sys.usb.config=none && property:sys.usb.configfs=1 write /config/usb_gadget/g1/os_desc/use 0 -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 write /config/usb_gadget/g1/os_desc/use 1 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 write /config/usb_gadget/g1/os_desc/use 1 symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1 @@ -47,15 +50,15 @@ on property:sys.usb.config=rndis && property:sys.usb.configfs=1 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/idProduct 0x4ee4 -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 write /config/usb_gadget/g1/os_desc/use 1 - 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 write /config/usb_gadget/g1/os_desc/use 1 - 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 |