diff options
| author | Benoit Goby <benoit@android.com> | 2012-01-18 15:32:51 -0800 |
|---|---|---|
| committer | Benoit Goby <benoit@android.com> | 2012-01-18 15:32:51 -0800 |
| commit | 6c5dc352f7e580c01b217f049d6d56dc7f0098cc (patch) | |
| tree | c1bd0dba4f522fdf804e4984d9d06b77f9d16cec | |
| parent | 85b8c2381ba1907c87785a040c7dcc06e42b88de (diff) | |
| parent | 7e5c4af7a68997bfd96d9a70fa0471a01a11c914 (diff) | |
| download | device_samsung_tuna-6c5dc352f7e580c01b217f049d6d56dc7f0098cc.zip device_samsung_tuna-6c5dc352f7e580c01b217f049d6d56dc7f0098cc.tar.gz device_samsung_tuna-6c5dc352f7e580c01b217f049d6d56dc7f0098cc.tar.bz2 | |
resolved conflicts for merge of 7e5c4af7 to master
Change-Id: I2aaed3c8b7e32b33beca0632eb4313894666195b
| -rwxr-xr-x | init.tuna.usb.rc | 11 | ||||
| -rw-r--r-- | ueventd.tuna.rc | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/init.tuna.usb.rc b/init.tuna.usb.rc index 19a5f8f..e86a7bd 100755 --- a/init.tuna.usb.rc +++ b/init.tuna.usb.rc @@ -64,7 +64,16 @@ on property:sys.usb.config=ptp,adb on property:sys.usb.config=rndis,dm write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 04e8 - write /sys/class/android_usb/android0/idProduct 6862 + write /sys/class/android_usb/android0/idProduct 6864 + write /sys/class/android_usb/android0/functions ${sys.usb.config} + write /sys/class/android_usb/android0/enable 1 + setprop sys.usb.state ${sys.usb.config} + +on property:sys.usb.config=rndis,acm,dm + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/idVendor 04e8 + write /sys/class/android_usb/android0/idProduct 6864 write /sys/class/android_usb/android0/functions ${sys.usb.config} + write /sys/class/android_usb/android0/f_acm/instances 1 write /sys/class/android_usb/android0/enable 1 setprop sys.usb.state ${sys.usb.config} diff --git a/ueventd.tuna.rc b/ueventd.tuna.rc index 3fa9fe2..d1a8b47 100644 --- a/ueventd.tuna.rc +++ b/ueventd.tuna.rc @@ -38,7 +38,8 @@ /dev/cdma_rmnet5 0660 radio radio /dev/cdma_rmnet6 0660 radio radio /dev/lte_rmnet4 0660 radio radio -/dev/ttyGS1 0660 radio radio +/dev/ttyGS0 0660 radio radio +/dev/ttyGS1 0660 radio radio /dev/block/mmcblk0p4 0660 radio radio /dev/modem_br 0660 radio radio /dev/cdma_ramdump0 0660 radio radio |