fix compile issue due to offmode charging in recobery

leo: amend this new branch to compile against aosp code
leo: touch-foxus not in main yet, and therefore this in does not compile
2011-10-24 13:38:05 +01:00 · 2011-10-21 01:38:55 +01:00 · 2011-10-18 15:58:56 +01:00 · 2011-10-18 09:39:31 +01:00 · 2011-10-17 03:03:32 +01:00 · 2011-10-16 20:40:56 +01:00
9 changed files with 97 additions and 76 deletions
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@ -97,10 +97,11 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common
 TARGET_PREBUILT_KERNEL := device/htc/leo/prebuilt/kernel

 # to enable the GPS HAL
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := htcleo
 # AMSS version to use for GPS
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200

 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel

-BOARD_USES_RECOVERY_CHARGEMODE := true
+#BOARD_USES_RECOVERY_CHARGEMODE := true
+BOARD_HAS_LARGE_FILESYSTEM := true
--- 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/ueventd.htcleo.rc:root/ueventd.htcleo.rc \

 # we have enough storage space to hold precise GC data
 PRODUCT_TAGS += dalvik.gc.type-precise
@ -85,7 +86,7 @@ PRODUCT_COPY_FILES += \

 #GSM APN LIST
 PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml


 PRODUCT_COPY_FILES += \
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@ -181,11 +181,13 @@
    <bool name="config_animateScreenLights">false</bool>

   <!-- Enable Tablet tweaks -->
+   <!--
    <bool name="cm_default_has_soft_buttons">true</bool>
    <bool name="cm_default_show_soft_home">false</bool>
    <bool name="cm_default_show_soft_menu">false</bool>
    <bool name="cm_default_show_soft_back">false</bool>
    <bool name="cm_default_show_soft_search">false</bool>
    <bool name="cm_default_show_soft_quick_na">false</bool>
+   -->

 </resources>
--- a/overlay/packages/apps/Camera/res/values/config.xml
+++ b/overlay/packages/apps/Camera/res/values/config.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The CyanogenMod 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+    <!-- Autofocus parameters -->
+    <!-- <string name="touchFocusParameter">touch-focus</string> -->
+</resources>
--- a/postrecoveryboot.sh
+++ b/postrecoveryboot.sh
@ -5,3 +5,16 @@ sleep 2
 if [[ "`grep clk= /proc/cmdline`" == "" ]]; then
 sed -i 's/\/boot\t\tmtd/\/boot\t\tyaffs2/g' /etc/recovery.fstab
 fi
+
+# Commented out as it may or may not require this
+#mount /dev/block/mmcblk0p2 /sd-ext | grep sd-ext | awk '{print $5}'
+#FS=`mount | grep sd-ext | awk '{print $5}'`
+#umount /sd-ext
+#sed -i 's/\/sd-ext\ \ \ \ \ auto/\/sd-ext\t\t'$FS'/g' /etc/recovery.fstab
+#cat >> /etc/fstab << EOF
+#/dev/block/mmcblk0p2 /sd-ext $FS rw
+#EOF
+<<<<<<< HEAD
+=======
+
+>>>>>>> 40364b7f71c1fadc944e913c7577b31132cf0a65
--- a/prebuilt/init.htcleo.rc
+++ b/prebuilt/init.htcleo.rc
@ -1,4 +1,6 @@
 on init
+    export TERMINFO /system/etc/terminfo
+
    symlink /dev/msm_camera/control0 /dev/msm_camera/control1
    symlink /dev/msm_camera/frame0 /dev/msm_camera/frame1
    symlink /dev/msm_camera/config0 /dev/msm_camera/config1
@ -8,6 +10,7 @@ on init
 on fs
    mount yaffs2 mtd@system /system remount
    mount rootfs rootfs / rw remount
+    mkdir /sd-ext 0771 system system

    # DRMv1 rights storage
    symlink /data/local /data/drm
@ -76,21 +79,26 @@ on boot
    setprop ro.ril.def.agps.mode 2

    # performance tweaks for flash
-    write /sys/block/mtdblock0/bdi/read_ahead_kb 4
-    write /sys/block/mtdblock1/bdi/read_ahead_kb 4
-    write /sys/block/mtdblock2/bdi/read_ahead_kb 4
-    write /sys/block/mtdblock4/bdi/read_ahead_kb 4
-    write /sys/block/mtdblock5/bdi/read_ahead_kb 4
+    write /sys/block/mtdblock3/bdi/read_ahead_kb 2048
+    write /sys/block/mtdblock4/bdi/read_ahead_kb 2048
+    write /sys/block/mtdblock5/bdi/read_ahead_kb 2048
+    # increase read throughput from sd card
+    write /sys/block/mmcblk0/bdi/read_ahead_kb 204

    # for wireless modem
    chown system system /sys/module/serial/parameters/modem_enabled
    chown system system /dev/ttyHSUSB0
    chown system system /dev/smd9
+    chown media media /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor

    # Power Management
-    chown media media /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 245000
    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq 998400
+    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ondemand
+    write /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate 40000
+    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq

    # Wakelock debug
    write /sys/module/wakelock/parameters/debug_mask 7
@ -101,7 +109,7 @@ on boot
    setprop ro.ril.fd.scroff.timeout 3

    # GPRS class
-    setprop ro.ril.gprsclass 10
+    #setprop ro.ril.gprsclass 10

    chown root radio /proc/cmdline
    chown system system /dev/ttyHS0
@ -166,11 +174,14 @@ on boot
    chown system camera /sys/class/leds/flashlight/brightness
    chmod 0666          /sys/class/leds/flashlight/brightness
    chmod 0666          /sys/class/leds/flashlight/max_brightness
+    chown system camera /sys/devices/platform/flashlight.0/leds/flashlight/brightness
+    chmod 0660          /sys/devices/platform/flashlight.0/leds/flashlight/brightness
+

    #720p cam support
    symlink /dev/msm_camera/control0 /dev/msm_camera/control1
-    symlink /dev/msm_camera/frame0 /dev/msm_camera/frame1
-    symlink /dev/msm_camera/config0 /dev/msm_camera/config1
+    symlink /dev/msm_camera/frame0   /dev/msm_camera/frame1
+    symlink /dev/msm_camera/config0  /dev/msm_camera/config1

    chmod 666 /sys/class/i2c-adapter/i2c-0/0-0018/enable
    chmod 666 /sys/class/i2c-adapter/i2c-0/0-0019/enable
@ -208,18 +219,18 @@ on boot
      write /proc/sys/vm/min_free_kbytes 8192
    fi
 
-service hciattach /system/bin/brcm_patchram_plus --enable_hci \
+service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm \
     --baudrate 3000000 --patchram /etc/firmware/bcm4329.hcd /dev/ttyHS0
    user bluetooth                
    group bluetooth net_bt_admin
-    disabled    
- 
-service btld /system/bin/logwrapper /system/bin/btld -lpm 1 -hb 3000000
-    user root                                              
-    group bluetooth net_bt_admin                            
-    disabled                                                
-    oneshot
+    disabled

+#service btld /system/bin/logwrapper /system/bin/btld -lpm 1 -hb 3000000
+#    user root
+#    group bluetooth net_bt_admin
+#    disabled
+#    oneshot
+ 
 # compass/accelerometer daemon
 service akmd /system/bin/akmd
    user compass
--- a/prebuilt/media_profiles.xml
+++ b/prebuilt/media_profiles.xml
@ -22,7 +22,7 @@
                         AudioDecoderCap)>
 <!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
 <!ELEMENT EncoderProfile (Video, Audio)>
-<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
+<!ATTLIST EncoderProfile quality (hd|high|low) #REQUIRED>
 <!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
 <!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
 <!ELEMENT Video EMPTY>
@ -77,10 +77,10 @@
 -->
 <MediaSettings>
    <!-- Each camcorder profile defines a set of predefined configuration parameters -->
-    <CamcorderProfiles cameraId="0">
-        <!--
+    <CamcorderProfiles>
+
        <EncoderProfile quality="hd" fileFormat="mp4" duration="60">
-            <Video codec="m4v"
+            <Video codec="h264"
                   bitRate="6000000"
                   width="1280"
                   height="720"
@ -88,55 +88,21 @@

            <Audio codec="aac"
                    bitRate="96000"
-                    sampleRate="16000"
+                    sampleRate="48000"
                    channels="1" />
        </EncoderProfile>
-        -->
+        
        <EncoderProfile quality="high" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="3000000"
-                   width="720"
-                   height="480"
-                   frameRate="24" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="16000"
-                   channels="1" />
-        </EncoderProfile>
-
-        <EncoderProfile quality="low" fileFormat="3gp" duration="30">
-            <Video codec="h263"
-                   bitRate="256000"
-                   width="176"
-                   height="144"
-                   frameRate="15" />
-
-            <Audio codec="amrnb"
-                   bitRate="12200"
-                   sampleRate="8000"
-                   channels="1" />
-
-        </EncoderProfile>
-
-        <ImageEncoding quality="90" />
-        <ImageEncoding quality="80" />
-        <ImageEncoding quality="70" />
-    </CamcorderProfiles>
-
-    <CamcorderProfiles cameraId="1">
-        <EncoderProfile quality="high" fileFormat="mp4" duration="60">
-            <Video codec="h264"
+            <Video codec="m4v"
                   bitRate="2000000"
-                   width="640"
+                   width="800"
                   height="480"
-                   frameRate="24" />
+                   frameRate="30" />

            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="16000"
+                   bitRate="48000"
+                   sampleRate="22050"
                   channels="1" />
-
        </EncoderProfile>

        <EncoderProfile quality="low" fileFormat="3gp" duration="30">
@ -150,17 +116,17 @@
                   bitRate="12200"
                   sampleRate="8000"
                   channels="1" />
+
        </EncoderProfile>

        <ImageEncoding quality="90" />
        <ImageEncoding quality="80" />
        <ImageEncoding quality="70" />
+        <ImageDecoding memCap="20000000" />

-        <ImageDecoding memCap="10000000" />
-
-        <Camera previewFrameRate="0" />
    </CamcorderProfiles>

+
    <EncoderOutputFileFormat name="3gp" />
    <EncoderOutputFileFormat name="mp4" />

@ -171,25 +137,25 @@
    -->
    <VideoEncoderCap name="h264" enabled="true"
        minBitRate="64000" maxBitRate="6000000"
-        minFrameWidth="176" maxFrameWidth="800"
-        minFrameHeight="144" maxFrameHeight="480"
+        minFrameWidth="176" maxFrameWidth="1280"
+        minFrameHeight="144" maxFrameHeight="720"
        minFrameRate="1" maxFrameRate="30" />

    <VideoEncoderCap name="h263" enabled="true"
-        minBitRate="64000" maxBitRate="6000000"
+        minBitRate="64000" maxBitRate="2000000"
        minFrameWidth="176" maxFrameWidth="800"
        minFrameHeight="144" maxFrameHeight="480"
        minFrameRate="1" maxFrameRate="30" />

    <VideoEncoderCap name="m4v" enabled="true"
-        minBitRate="64000" maxBitRate="8000000"
-        minFrameWidth="176" maxFrameWidth="1280"
-        minFrameHeight="144" maxFrameHeight="720"
+        minBitRate="64000" maxBitRate="2000000"
+        minFrameWidth="176" maxFrameWidth="800"
+        minFrameHeight="144" maxFrameHeight="480"
        minFrameRate="1" maxFrameRate="30" />

    <AudioEncoderCap name="aac" enabled="true"
        minBitRate="8192" maxBitRate="96000"
-        minSampleRate="8000" maxSampleRate="16000"
+        minSampleRate="8000" maxSampleRate="48000"
        minChannels="1" maxChannels="1" />

    <AudioEncoderCap name="amrwb" enabled="true"
@ -211,4 +177,4 @@
    -->
    <VideoDecoderCap name="wmv" enabled="false"/>
    <AudioDecoderCap name="wma" enabled="false"/>
-</MediaSettings>
+</MediaSettings>
--- a/prebuilt/ueventd.leo.rc
+++ b/prebuilt/ueventd.leo.rc
@ -0,0 +1 @@
+ueventd.htcleo.rc
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@ -22,3 +22,4 @@

 add_lunch_combo htc_leo-userdebug
 add_lunch_combo htc_leo-eng
+add_lunch_combo full_leo-eng
Author	SHA1	Message	Date
Arif Ali	1a52a2ba51	fix compile issue due to offmode charging in recobery	2011-10-24 13:38:05 +01:00
Arif Ali	f5b0bae7ce	leo: amend this new branch to compile against aosp code	2011-10-21 01:38:55 +01:00
Arif Ali	765f5cc47d	leo: touch-foxus not in main yet, and therefore this in does not compile	2011-10-18 15:58:56 +01:00
Arif Ali	3a1eed1381	leo: update media_profiles.xml from AmerCanAndroid	2011-10-18 09:39:31 +01:00
Arif Ali	e65656ca7a	leo: fix recovery compile issue	2011-10-17 03:03:32 +01:00
Arif Ali	d421b05c0d	leo: updated postrecoveryboot.sh with comments if we want dynamic change of recovery.fstab for sd-ext	2011-10-16 20:40:56 +01:00
Arif Ali	40364b7f71	leo: updated work * removed btld service from init.htcleo.rc * updated modules, that had never been done before * Added the LICENSE for the wrapper Change-Id: I449a6be198610220c42721de91bbac798cc29a81	2011-10-16 20:38:01 +01:00
Arif Ali	452d319c9a	leo: added ueventd.htcleo.rc	2011-10-16 13:22:55 +01:00
Diogo Ferreira	13798da15e	Merge "leo: update code" into gingerbread	2011-10-15 16:11:55 +04:00
Diogo Ferreira	4bdea2329c	Merge "leo: Support new touch to focus overlay" into gingerbread	2011-10-15 16:08:01 +04:00
Arif Ali	09a19f5d7c	leo: removed btld again	2011-10-13 19:14:51 +01:00
Arif Ali	77ea40b3e8	leo: update code * move all prebuilt stuff into the prebuild folder * Create the system.prop so that we can have spaces in the rild.args * moved the LEOUPDATE stuff so now uses squisher * changed the initrd.gz creating, so that everything is in init.htcleo.rc * 01modules is now moved here, rather than cyanogen vendor files Change-Id: I7fb7d87503e46f6a11a8228ae29b3f50187d5634	2011-10-12 11:46:10 +01:00
Arif Ali	a6b56391f1	leo: fix bluetooth, and some minor tweaks	2011-10-11 23:10:56 +01:00
Arif Ali	69ecd93377	leo: removed the btld service	2011-10-08 11:51:57 +01:00
Emilio López	0515d0fe93	leo: Support new touch to focus overlay Change-Id: Ic9449cfdf7fd0be4296ab1cf0133eaeda9d77ae2	2011-09-26 04:20:09 +00:00