diff --git a/cm.mk b/cm.mk index 8f21c36..346450c 100644 --- a/cm.mk +++ b/cm.mk @@ -18,7 +18,7 @@ PRODUCT_DEVICE := leo PRODUCT_NAME := cm_leo #Set build fingerprint / ID / Prduct Name ect. -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=leo BUILD_ID=ITL41D BUILD_DISPLAY_ID=ITL41D BUILD_FINGERPRINT="google/htc_leo/leo:4.0.1/ITL41D/223971:user/release-keys" PRVIATE_BUILD_DESC="full_leo-user 4.0.1 ITL41D 223971 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=leo BUILD_ID=IML74K BUILD_DISPLAY_ID=IML74K BUILD_FINGERPRINT="google/htc_leo/leo:4.0.3/IML74K/239410:user/release-keys" PRVIATE_BUILD_DESC="full_leo-user 4.0.3 IML74K 239410 release-keys" PRODUCT_PACKAGES += \ diff --git a/leo.mk b/leo.mk index e4d4952..dc4544b 100755 --- a/leo.mk +++ b/leo.mk @@ -24,6 +24,7 @@ PRODUCT_COPY_FILES += \ device/htc/leo/prebuilt/init.htcleo.rc:root/init.htcleo.rc \ + device/htc/leo/prebuilt/init.htcleo.usb.rc:root/init.htcleo.usb.rc \ device/htc/leo/prebuilt/ueventd.htcleo.rc:root/ueventd.htcleo.rc \ device/htc/leo/prebuilt/logo.rle:root/logo.rle \ diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc index 3d6ea1f..795ed24 100644 --- a/prebuilt/init.htcleo.rc +++ b/prebuilt/init.htcleo.rc @@ -236,6 +236,10 @@ on boot chmod 755 /system/etc/init.d/02cachesd start sysinit + + +on property:cm.filesystem.ready=1 + class_start default service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm \ --baudrate 3000000 --patchram /etc/firmware/bcm4329.hcd /dev/ttyHS0 @@ -264,16 +268,41 @@ service dhcpcd_eth0 /system/bin/dhcpcd -ABKL disabled oneshot +service dhcpcd_p2p /system/bin/dhcpcd -aABKL + class main + disabled + oneshot + +service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL + class main + disabled + oneshot + service iprenew_eth0 /system/bin/dhcpcd -n class main disabled oneshot - -# for USB internet sharing -service udhcpd /system/bin/udhcpd + +service iprenew_p2p /system/bin/dhcpcd -n class main disabled oneshot + +service iprenew_bnep0 /system/bin/dhcpcd -n + class main + disabled + oneshot + +# bugreport is triggered by the KEY_VOLUMEUP and BTN_MOUSE keycodes +service bugreport /system/bin/dumpstate -d -v -o /sdcard/bugreports/bugrepo +rt + class main + disabled + oneshot + keycodes 115 272 + +service dspcrashd /system/bin/dspcrashd + class main # Execute files in /etc/init.d before booting service sysinit /system/bin/logwrapper /system/xbin/busybox run-parts /system/etc/init.d diff --git a/prebuilt/init.htcleo.usb.rc b/prebuilt/init.htcleo.usb.rc new file mode 100644 index 0000000..1aaca28 --- /dev/null +++ b/prebuilt/init.htcleo.usb.rc @@ -0,0 +1,32 @@ +on property:sys.usb.config=adb + write /sys/class/usb_composite/adb/enable 1 + start adbd + setprop sys.usb.state $sys.usb.config + +on property:sys.usb.config=mass_storage + write /sys/class/usb_composite/usb_mass_storage/enable 1 + start adbd + setprop sys.usb.state $sys.usb.config + +on property:sys.usb.config=mass_storage,adb + write /sys/class/usb_composite/usb_mass_storage/enable 1 + write /sys/class/usb_composite/adb/enable 1 + start adbd + setprop sys.usb.state $sys.usb.config + +on property:sys.usb.config=rndis + write /sys/class/usb_composite/rndis/enable 1 + setprop sys.usb.state $sys.usb.config + +on property:sys.usb.config=rndis,adb + write /sys/class/usb_composite/rndis/enable 1 + write /sys/class/usb_composite/adb/enable 1 + start adbd + setprop sys.usb.state $sys.usb.config + +on property:sys.usb.config=mass_storage,rndis,adb + write /sys/class/usb_composite/usb_mass_storage/enable 1 + write /sys/class/usb_composite/rndis/enable 1 + write /sys/class/usb_composite/adb/enable 1 + start adbd + setprop sys.usb.state $sys.usb.config diff --git a/prebuilt/init.htcleo.usb.rc.wip b/prebuilt/init.htcleo.usb.rc.wip new file mode 100644 index 0000000..8956f7a --- /dev/null +++ b/prebuilt/init.htcleo.usb.rc.wip @@ -0,0 +1,44 @@ +on boot + 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/android0/iSerial $ro.serialno + write /sys/class/android_usb/android0/f_mass_storage/inquiry_string "HTC HD2" + write /sys/class/android_usb/android0/f_rndis/manufacturer HTC + write /sys/class/android_usb/android0/f_rndis/vendorID 0bb4 + write /sys/class/android_usb/android0/f_rndis/wceis 1 + +on property:sys.usb.config=mass_storage + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/idVendor 0bb4 + write /sys/class/android_usb/android0/idProduct 4e21 + 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=mass_storage,adb + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/idVendor 0bb4 + write /sys/class/android_usb/android0/idProduct 4e22 + 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 0bb4 + write /sys/class/android_usb/android0/idProduct 4e23 + 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 0bb4 + write /sys/class/android_usb/android0/idProduct 0c02 + 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 diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index 47ceaf9..0000000 --- a/vendorsetup.sh +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This file is executed by build/envsetup.sh, and can use anything -# defined in envsetup.sh. -# -# In particular, you can add lunch options with the add_lunch_combo -# function: add_lunch_combo generic-eng - -add_lunch_combo htc_leo-userdebug -add_lunch_combo htc_leo-eng -add_lunch_combo full_leo-eng -add_lunch_combo cm_leo-userdebug