Config for USB gadget ported from 3.0 kernel

- fixes Native USB tethering
C3C0 · Dec 31, 2012 · 6524b52 · 6524b52
1 parent cd1a187
commit 6524b52
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 25 deletions.
diff --git a/init.skate.usb.rc b/init.skate.usb.rc
@@ -1,43 +1,74 @@
 on init
-    write /sys/module/g_android/parameters $ro.serialno
-    write /sys/module/g_android/parameters/product_id 1351
-    write /sys/devices/platform/android_usb/functions/cur_pid 1351
-    write /sys/devices/platform/android_usb/functions/enable_switch 0
+    write /sys/class/android_usb/android0/iSerial CM10-Skate
+    write /sys/class/android_usb/android0/f_rndis/manufacturer ZTE
+    write /sys/class/android_usb/android0/f_rndis/vendorID 19d2
+    write /sys/class/android_usb/android0/f_rndis/wceis 1
 
 on boot
-   start start_usb0
+    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
+    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
+    write /sys/class/android_usb/f_mass_storage/inquiry_string "ZTE"
 
 on property:sys.usb.config=adb
-    write /sys/module/g_android/parameters/product_id 1352
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1352
+    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}
 
 on property:sys.usb.config=mass_storage,adb
-    write /sys/module/g_android/parameters/product_id 1351
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1351
+    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}
 
 on property:sys.usb.config=mass_storage
-    write /sys/module/g_android/parameters/product_id 1353
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1353
+    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
-    write /sys/module/g_android/parameters/product_id 1365
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1365
+    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
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=rndis,adb
-    write /sys/module/g_android/parameters/product_id 1373
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1373
+    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
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 
-on property:sys.usb.config=mass_storage,rndis,adb
-    write /sys/module/g_android/parameters/product_id 1364
-    start adbd
+on property:sys.usb.config=mass_storage,rndis
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1364
+    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
     setprop sys.usb.state ${sys.usb.config}
 
-# Adding this in because adb is being removed from persist.sys.usb.config after booting
-on property:persist.service.adb.enable=1
+on property:sys.usb.config=mass_storage,rndis,adb
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 19d2
+    write /sys/class/android_usb/android0/idProduct 1364
+    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
     start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd
+    setprop sys.usb.state ${sys.usb.config}
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -33,7 +33,8 @@
     <bool name="config_wifiApStartInterface">true</bool>
 
     <string-array translatable="false" name="config_tether_usb_regexs">
-        <item>"usb0"</item>
+         <item>"rndis\\d"</item>
+         <item>"usb\\d"</item>
     </string-array>
 
     <string-array translatable="false" name="config_tether_bluetooth_regexs">
@@ -46,7 +47,8 @@
     <integer-array translatable="false" name="config_tether_upstream_types">
         <item>0</item>
         <item>1</item>
-        <item>4</item>
+        <item>5</item>
+        <item>7</item>
     </integer-array>
 
     <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
@@ -153,11 +155,6 @@
          Bluetooth Module -->
     <bool name="config_bluetooth_adapter_quick_switch">false</bool>
 
-    <!-- LUN file to be used by legacy USB manager.
-         The existence of this file will be used to determine in the
-         legacy USB manager should be started. -->
-    <string name="config_legacyUmsLunFile">/sys/devices/platform/msm_hsusb/gadget/lun0/file</string>
-
     <!-- Values greater or equal to 0 will enable electronbeam screen-on
          animation with the specified delay (in milliseconds), -1 will disable the animation -->
     <integer name="config_screenOnAnimation">250</integer>