commit ef1348f838a0e09c36a1f378a7f80e006dd62cbb
author Jean-Baptiste Queru <jbq@google.com> Fri Oct 05 11:03:21 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 05 11:03:22 2012 -0700
tree 1e8722920fd83189dfa199587349cfb8bf1839ef
parent a332e6c12521be10365ce7d07b32e5aeb4c5ab23
parent f46bbdb7cefdca873b540c4046d6586b51d2b519

Merge "usb: correct Product id"

config/init.semc.rc

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 @@
     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 @@
     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 @@
     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

config/init.semc.usb.rc

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 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,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=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,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=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,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=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,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}
-