blade2: don't use faggot usb and other updates

BoardConfig.mk

@@ -14,10 +14,9 @@
 # limitations under the License.
 #
 
--include device/zte/msm7x27-common/BoardConfigCommon.mk
--include vendor/zte/blade2/BoardConfigVendor.mk
+include device/zte/msm7x27-common/BoardConfigCommon.mk
+include vendor/zte/blade2/BoardConfigVendor.mk
 
-TARGET_PREBUILT_RECOVERY_KERNEL := device/zte/blade2/prebuilt/recovery_kernel
 TARGET_RECOVERY_INITRC := device/zte/blade2/recovery/recovery.rc
 
 # Kernel
@@ -44,9 +43,6 @@ WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/fw_4330b1.bin nvram_path=/s
 WIFI_DRIVER_MODULE_NAME := "dhd"
 WIFI_BAND := 802_11_ABG
 
-# Touchscreen
-BOARD_USE_LEGACY_TOUCHSCREEN := true
-
 # Bluetooth
 BOARD_HAVE_BLUETOOTH_BCM := true
 BOARD_BLUEDROID_VENDOR_CONF := device/zte/blade2/bluetooth/libbt_vndcfg.txt

ramdisk/init.blade2.rc

@@ -44,10 +44,6 @@ on boot
     chmod 0777 /dev/akm8962_aot
     chmod 0777 /dev/akm8962_dev
 
-# Setup android gadget
-    write /sys/module/g_android/parameters/serial_number CM10.1-Crescent
-    write /sys/module/g_android/parameters/product_id 0x1351
-
 # WIFI filesystem structure
     mkdir /data/misc 01771 system misc
     mkdir /data/misc/wifi 0770 system wifi

ramdisk/init.blade2.usb.rc

@@ -1,43 +1,55 @@
 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.1-Crescent
+    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
-    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
-    start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd

recovery/recovery.rc

@@ -1,10 +1,6 @@
 on early-init
     start ueventd
 
-# Setup android gadget
-   write /sys/module/g_android/parameters/serial_number CWM-Blade2
-   write /sys/module/g_android/parameters/product_id 0x1354
-
 on init
     export PATH /sbin
     export ANDROID_ROOT /system

system.prop

@@ -19,7 +19,7 @@ debug.hwui.disable_vsync=true
 debug.gr.numframebuffers=3
 
 # USB Mass Storage
-persist.sys.usb.config=adb,mass_storage
+persist.sys.usb.config=mass_storage,adb
 persist.service.adb.enable=1
 # Don't set /proc/sys/vm/dirty_ratio to 0 when USB mounting
 ro.vold.umsdirtyratio=20