From f46bbdb7cefdca873b540c4046d6586b51d2b519 Mon Sep 17 00:00:00 2001 From: Giulio Cervera Date: Thu, 6 Sep 2012 15:06:35 +0200 Subject: usb: correct Product id The value found in stock rom is just a default value, and is updated in runtime based on "ro.usb.pid_suffix". This will change the Product id to match the stock value. Also rename SEMC to Sony and remove redundant usb settings from init.semc.rc Change-Id: I60ba88b9911d9ed41ae8621d83456f1a86cf08f3 --- config/init.semc.rc | 10 +--------- config/init.semc.usb.rc | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/config/init.semc.rc b/config/init.semc.rc index 4e3edf8..5fe60c0 100644 --- a/config/init.semc.rc +++ b/config/init.semc.rc @@ -118,9 +118,6 @@ on boot mkdir /dev/bus 0711 system system mkdir /dev/bus/usb 0711 system system - write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer - write /sys/class/android_usb/android0/iProduct $ro.product.model - setprop ro.wifi.wps_enable true write /proc/sys/kernel/sysrq 0 @@ -217,11 +214,6 @@ on boot insmod /system/lib/modules/bcmdhd.ko nvram_path=/system/etc/wifi/calibration iface_name=wlan0 on init - write /sys/class/android_usb/android0/iSerial $ro.serialno - write /sys/class/android_usb/android0/f_rndis/manufacturer $ro.product.manufacturer - write /sys/class/android_usb/android0/f_rndis/vendorID 0fce - write /sys/class/android_usb/android0/f_rndis/wceis 1 - # create mountpoint mkdir /storage/usbdisk 0000 system system @@ -242,7 +234,7 @@ on post-fs-data chmod 0660 /sys/devices/platform/msm_hsusb/gadget/lun1/file write /sys/class/android_usb/f_mass_storage/inquiry_string "SONY Mass Storage 0100" write /sys/class/android_usb/f_cdrom/cdrom_inquiry_string "SONY CD-ROM 0100" - write /sys/class/android_usb/f_mass_storage/serial_number $ro.serialno + write /sys/class/android_usb/f_mass_storage/serial_number ${ro.serialno} write /sys/class/android_usb/f_mass_storage/eui64_id 000AD90000000000 write /sys/devices/platform/msm_hsusb/gadget/lun0/nofua 1 write /sys/devices/platform/msm_hsusb/gadget/lun1/nofua 1 diff --git a/config/init.semc.usb.rc b/config/init.semc.usb.rc index 45f5071..681f71c 100644 --- a/config/init.semc.usb.rc +++ b/config/init.semc.usb.rc @@ -1,6 +1,6 @@ on init - write /sys/class/android_usb/android0/iSerial $ro.serialno - write /sys/class/android_usb/android0/f_rndis/manufacturer SEMC + write /sys/class/android_usb/android0/iSerial ${ro.serialno} + write /sys/class/android_usb/android0/f_rndis/manufacturer Sony write /sys/class/android_usb/android0/f_rndis/vendorID 0FCE write /sys/class/android_usb/android0/f_rndis/wceis 1 @@ -11,7 +11,7 @@ on boot on property:sys.usb.config=mass_storage write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct E146 + write /sys/class/android_usb/android0/idProduct E169 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} @@ -19,7 +19,7 @@ on property:sys.usb.config=mass_storage on property:sys.usb.config=mass_storage,adb write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 6146 + write /sys/class/android_usb/android0/idProduct 6169 write /sys/class/android_usb/android0/functions ${sys.usb.config} write /sys/class/android_usb/android0/enable 1 start adbd @@ -28,7 +28,7 @@ on property:sys.usb.config=mass_storage,adb on property:sys.usb.config=mtp write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 0146 + write /sys/class/android_usb/android0/idProduct 0169 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} @@ -36,7 +36,7 @@ on property:sys.usb.config=mtp on property:sys.usb.config=mtp,adb write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 5146 + write /sys/class/android_usb/android0/idProduct 5169 write /sys/class/android_usb/android0/functions ${sys.usb.config} write /sys/class/android_usb/android0/enable 1 start adbd @@ -45,7 +45,7 @@ on property:sys.usb.config=mtp,adb on property:sys.usb.config=rndis write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 7146 + write /sys/class/android_usb/android0/idProduct 7169 write /sys/class/android_usb/android0/functions ${sys.usb.config} write /sys/class/android_usb/android0/bDeviceClass 224 write /sys/class/android_usb/android0/enable 1 @@ -54,7 +54,7 @@ on property:sys.usb.config=rndis on property:sys.usb.config=rndis,adb write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 8146 + write /sys/class/android_usb/android0/idProduct 8169 write /sys/class/android_usb/android0/functions ${sys.usb.config} write /sys/class/android_usb/android0/bDeviceClass 224 write /sys/class/android_usb/android0/enable 1 @@ -64,7 +64,7 @@ on property:sys.usb.config=rndis,adb on property:sys.usb.config=ptp write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 6846 + write /sys/class/android_usb/android0/idProduct 9169 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} @@ -72,9 +72,8 @@ on property:sys.usb.config=ptp on property:sys.usb.config=ptp,adb write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 0FCE - write /sys/class/android_usb/android0/idProduct 6846 + write /sys/class/android_usb/android0/idProduct A169 write /sys/class/android_usb/android0/functions ${sys.usb.config} write /sys/class/android_usb/android0/enable 1 start adbd setprop sys.usb.state ${sys.usb.config} - -- cgit v1.2.3