Skip to content

Commit

Permalink
Fixed camera preview + video camera. Many other fixes too
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacob Crawley committed Feb 12, 2011
1 parent c09aa94 commit 0e7f9ed
Show file tree
Hide file tree
Showing 71 changed files with 501 additions and 666 deletions.
Empty file modified AndroidBoard.mk 100644 → 100755
Empty file.
Empty file modified AndroidProducts.mk 100644 → 100755
Empty file.
Empty file modified AudioFilter.csv 100644 → 100755
Empty file.
Empty file modified AutoVolumeControl.txt 100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion BoardConfig.mk 100644 → 100755
Expand Up @@ -50,7 +50,6 @@ JS_ENGINE := v8

TARGET_PROVIDES_LIBAUDIO := true

# Use 2G VMSPLIT. I plan to get rid of the need for this soon.
TARGET_USES_2G_VM_SPLIT := true

TARGET_USES_OLD_LIBSENSORS_HAL:=true
Expand Down
Binary file added ar6000.ko
Binary file not shown.
2 changes: 1 addition & 1 deletion copy-files.sh
Expand Up @@ -81,7 +81,7 @@ lib/liboncrpc.so
lib/libpbmlib.so
lib/libqmi.so
lib/libqueue.so
lib/libril.so
lib/librpc.so
lib/libril-qc-1.so
lib/libril-qcril-hook-oem.so
lib/libril.so
Expand Down
6 changes: 4 additions & 2 deletions device_blade.mk 100644 → 100755
Expand Up @@ -50,7 +50,7 @@ PRODUCT_COPY_FILES += \

# Board-specific init
PRODUCT_COPY_FILES += \
device/zte/blade/init.blade.rc:root/init.blade.rc \
device/zte/blade/init.qcom.rc:root/init.qcom.rc \
device/zte/blade/ueventd.blade.rc:root/ueventd.blade.rc

## RIL related stuff
Expand Down Expand Up @@ -110,7 +110,7 @@ PRODUCT_COPY_FILES += \
frameworks/base/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml

PRODUCT_COPY_FILES += \
device/zte/blade/prebuilt/librpc.so:system/lib/librpc.so
vendor/zte/blade/proprietary/lib/librpc.so:system/lib/librpc.so

## Camera proprietaries
PRODUCT_COPY_FILES += \
Expand Down Expand Up @@ -147,6 +147,8 @@ PRODUCT_COPY_FILES += \
device/zte/blade/media_profiles.xml:system/etc/media_profiles.xml \
device/zte/blade/dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf \
device/zte/blade/vold.fstab:system/etc/vold.fstab \
device/zte/blade/init.bt.sh:system/etc/init.bt.sh \
device/zte/blade/ar6000.ko:system/wifi/ar6000.ko \
device/zte/blade/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
device/zte/blade/qwerty.kl:system/usr/keylayout/qwerty.kl

Expand Down
Empty file modified dhcpcd.conf 100644 → 100755
Empty file.
Empty file modified hostapd.conf 100644 → 100755
Empty file.
Empty file modified hwprops/Android.mk 100644 → 100755
Empty file.
Empty file modified hwprops/hwprops.c 100644 → 100755
Empty file.
189 changes: 0 additions & 189 deletions init.blade.rc

This file was deleted.

104 changes: 104 additions & 0 deletions init.bt.sh
@@ -0,0 +1,104 @@
#!/system/bin/sh
# Copyright (c) 2009, Code Aurora Forum. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Code Aurora nor
# the names of its contributors may be used to endorse or promote
# products derived from this software without specific prior written
# permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

BLUETOOTH_SLEEP_PATH=/proc/bluetooth/sleep/proto
LOG_TAG="qcom-bluetooth"
LOG_NAME="${0}:"

hciattach_pid=""

loge ()
{
/system/bin/log -t $LOG_TAG -p e "$LOG_NAME $@"
}

logi ()
{
/system/bin/log -t $LOG_TAG -p i "$LOG_NAME $@"
}

failed ()
{
loge "$1: exit code $2"
exit $2
}

start_hciattach ()
{
echo 1 > $BLUETOOTH_SLEEP_PATH
/system/bin/hciattach -n $QSOC_DEVICE $QSOC_TYPE $QSOC_BAUD &
hciattach_pid=$!
logi "start_hciattach: pid = $hciattach_pid"
}

kill_hciattach ()
{
logi "kill_hciattach: pid = $hciattach_pid"
## careful not to kill zero or null!
kill -TERM $hciattach_pid
echo 0 > $BLUETOOTH_SLEEP_PATH
# this shell doesn't exit now -- wait returns for normal exit
}

# mimic hciattach options parsing -- maybe a waste of effort
USAGE="hciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]"

while getopts "blnpt:s:" f
do
case $f in
b | l | n | p) opt_flags="$opt_flags -$f" ;;
t) timeout=$OPTARG;;
s) initial_speed=$OPTARG;;
\?) echo $USAGE; exit 1;;
esac
done
shift $(($OPTIND-1))

QSOC_DEVICE=${1:-"/dev/ttyHS0"}
QSOC_TYPE=${2:-"any"}
QSOC_BAUD=${3:-"3000000"}

/system/bin/hci_qcomm_init -d $QSOC_DEVICE -s $QSOC_BAUD

exit_code_hci_qcomm_init=$?

case $exit_code_hci_qcomm_init in
0) logi "Bluetooth QSoC firmware download succeeded";;
*) failed "Bluetooth QSoC firmware download failed" $exit_code_hci_qcomm_init;;
esac

# init does SIGTERM on ctl.stop for service
trap "kill_hciattach" TERM INT

start_hciattach

wait $hciattach_pid

logi "Bluetooth stopped"

exit 0

0 comments on commit 0e7f9ed

Please sign in to comment.