summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsujin119.kim <sujin119.kim@samsung.com>2011-09-24 17:40:23 +0900
committerBenoit Goby <benoit@android.com>2011-09-24 17:57:05 -0700
commit7849c048417f7608f4aad577cc573b77e725b70b (patch)
tree687a95d6097bd168cf44f5c7017a633c718dac0f
parentdf8cc11d6150bbd87e6ad9c2e9512fa45afb035d (diff)
downloaddevice_samsung_maguro-7849c048417f7608f4aad577cc573b77e725b70b.zip
device_samsung_maguro-7849c048417f7608f4aad577cc573b77e725b70b.tar.gz
device_samsung_maguro-7849c048417f7608f4aad577cc573b77e725b70b.tar.bz2
maguro: usb: Update USB VID/PID pairs
Samsung VID/PID pairs will be used for both toro and maguro. This change moves the init.tuna.usb.rc from maguro to tuna in ordder to share it with toro. Change-Id: I336b0e1cb1101048e831cc7474f7bb725619ec9d Signed-off-by: sujin119.kim <sujin119.kim@samsung.com>
-rw-r--r--device.mk3
-rw-r--r--init.tuna.usb.rc71
2 files changed, 1 insertions, 73 deletions
diff --git a/device.mk b/device.mk
index 53ab58d..664ad2c 100644
--- a/device.mk
+++ b/device.mk
@@ -22,8 +22,7 @@ DEVICE_PACKAGE_OVERLAYS := device/samsung/maguro/overlay
# These are the hardware-specific features
PRODUCT_COPY_FILES := \
- frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
- device/samsung/maguro/init.tuna.usb.rc:root/init.tuna.usb.rc
+ frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
$(call inherit-product, device/samsung/tuna/device.mk)
$(call inherit-product-if-exists, vendor/samsung/maguro/device-vendor.mk)
diff --git a/init.tuna.usb.rc b/init.tuna.usb.rc
deleted file mode 100644
index 7233c7a..0000000
--- a/init.tuna.usb.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-on init
- write /sys/class/android_usb/android0/iSerial $ro.serialno
- write /sys/class/android_usb/android0/f_rndis/manufacturer Samsung
- write /sys/class/android_usb/android0/f_rndis/vendorID 18d1
- write /sys/class/android_usb/android0/f_rndis/wceis 1
-
-on boot
- write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
- write /sys/class/android_usb/android0/iProduct $ro.product.model
-
-on property:sys.usb.config=mtp
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct 4e31
- 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=mtp,adb
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct 4e32
- 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=rndis
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct 4e33
- 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/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct 4e34
- 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=ptp
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct 4e35
- 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=ptp,adb
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct 4e36
- 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
-
-# For RNDIS+DM composite, we will use SAMSUNG vendor and product IDs.
-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/functions $sys.usb.config
- write /sys/class/android_usb/android0/enable 1
- setprop sys.usb.state $sys.usb.config