OSDN Git Service
(root)
/
android-x86
/
device-generic-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: Only tell Android we have a ril when we have one
[android-x86/device-generic-common.git]
/
init.sh
diff --git
a/init.sh
b/init.sh
index
4cc2354
..
caec377
100644
(file)
--- a/
init.sh
+++ b/
init.sh
@@
-6,8
+6,8
@@
function set_property()
{
function set_property()
{
- # this must be run before post-fs stage
-
echo $1=$2 >>
/x86.prop
+ setprop "$1" "$2"
+
[ -n "$DEBUG" ] && echo "$1"="$2" >> /dev
/x86.prop
}
function init_misc()
}
function init_misc()
@@
-42,17
+42,24
@@
function init_hal_bluetooth()
done
case "$PRODUCT" in
done
case "$PRODUCT" in
- T10*TA)
- modprobe ak8975
- modprobe hci-uart
+ T10*TA|HP*Omni*)
BTUART_PORT=/dev/ttyS1
BTUART_PORT=/dev/ttyS1
- brcm_patchram_plus -d --no2bytes --enable_hci --patchram /system/lib/firmware/brcm/bcm43241b4.hcd $BTUART_PORT
;;
MacBookPro8*)
rmmod b43
modprobe b43 btcoex=0
modprobe btusb
;;
;;
MacBookPro8*)
rmmod b43
modprobe b43 btcoex=0
modprobe btusb
;;
+ # FIXME
+ # Fix MacBook 2013-2015 (Air6/7&Pro11/12) BCM4360 ssb&wl conflict.
+ MacBookPro11* | MacBookPro12* | MacBookAir6* | MacBookAir7*)
+ rmmod b43
+ rmmod ssb
+ rmmod bcma
+ rmmod wl
+ modprobe wl
+ modprobe btusb
+ ;;
*)
for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
chown 1002.1002 $bt && chmod 660 $bt
*)
for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
chown 1002.1002 $bt && chmod 660 $bt
@@
-64,13
+71,14
@@
function init_hal_bluetooth()
if [ -n "$BTUART_PORT" ]; then
set_property hal.bluetooth.uart $BTUART_PORT
chown bluetooth.bluetooth $BTUART_PORT
if [ -n "$BTUART_PORT" ]; then
set_property hal.bluetooth.uart $BTUART_PORT
chown bluetooth.bluetooth $BTUART_PORT
+ start btattach:-B$BTUART_PORT
log -t hciconfig -p i "`hciconfig`"
fi
}
function init_hal_camera()
{
log -t hciconfig -p i "`hciconfig`"
fi
}
function init_hal_camera()
{
- [ -c /dev/video0 ] || modprobe vivi
+ return
}
function init_hal_gps()
}
function init_hal_gps()
@@
-95,40
+103,35
@@
function set_drm_mode()
function init_uvesafb()
{
case "$PRODUCT" in
function init_uvesafb()
{
case "$PRODUCT" in
- *Q550)
- UVESA_MODE=${UVESA_MODE:-1280x800}
- ;;
ET2002*)
UVESA_MODE=${UVESA_MODE:-1600x900}
;;
ET2002*)
UVESA_MODE=${UVESA_MODE:-1600x900}
;;
- T91*)
- UVESA_MODE=${UVESA_MODE:-1024x600}
- ;;
- VirtualBox*|Bochs*)
- UVESA_MODE=${UVESA_MODE:-1024x768}
- ;;
*)
;;
esac
*)
;;
esac
- modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-16 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+ [ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
+ modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
}
function init_hal_gralloc()
{
case "$(cat /proc/fb | head -1)" in
}
function init_hal_gralloc()
{
case "$(cat /proc/fb | head -1)" in
+ *virtiodrmfb)
+# set_property ro.hardware.hwcomposer drm
+ ;&
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
set_property ro.hardware.gralloc drm
set_drm_mode
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
set_property ro.hardware.gralloc drm
set_drm_mode
- [ -n "$DEBUG" ] && set_property debug.egl.trace error
;;
"")
init_uvesafb
;&
0*)
;;
"")
init_uvesafb
;&
0*)
- [ "$HWACCEL" = "1" ] || set_property debug.egl.hw 0
;;
esac
;;
esac
+
+ [ -n "$DEBUG" ] && set_property debug.egl.trace error
}
function init_hal_hwcomposer()
}
function init_hal_hwcomposer()
@@
-157,6
+160,10
@@
function init_hal_power()
function init_hal_sensors()
{
function init_hal_sensors()
{
+ # if we have sensor module for our hardware, use it
+ ro_hardware=$(getprop ro.hardware)
+ [ -f /system/lib/hw/sensors.${ro_hardware}.so ] && return 0
+
local hal_sensors=kbd
case "$(cat $DMIPATH/uevent)" in
*Lucid-MWE*)
local hal_sensors=kbd
case "$(cat $DMIPATH/uevent)" in
*Lucid-MWE*)
@@
-209,13
+216,15
@@
function init_hal_sensors()
;;
*Aspire1*25*)
modprobe lis3lv02d_i2c
;;
*Aspire1*25*)
modprobe lis3lv02d_i2c
- hal_sensors=hdaps
echo -n "enabled" > /sys/class/thermal/thermal_zone0/mode
;;
*ThinkPad*Tablet*)
modprobe hdaps
hal_sensors=hdaps
;;
echo -n "enabled" > /sys/class/thermal/thermal_zone0/mode
;;
*ThinkPad*Tablet*)
modprobe hdaps
hal_sensors=hdaps
;;
+ *i7Stylus*)
+ set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
+ ;;
*)
;;
esac
*)
;;
esac
@@
-224,6
+233,8
@@
function init_hal_sensors()
if [ -n "`ls /sys/bus/iio/devices/iio:device* 2> /dev/null`" ]; then
busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device*/
lsmod | grep -q hid_sensor_accel_3d && hal_sensors=hsb || hal_sensors=iio
if [ -n "`ls /sys/bus/iio/devices/iio:device* 2> /dev/null`" ]; then
busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device*/
lsmod | grep -q hid_sensor_accel_3d && hal_sensors=hsb || hal_sensors=iio
+ elif lsmod | grep -q lis3lv02d_i2c; then
+ hal_sensors=hdaps
fi
set_property ro.hardware.sensors $hal_sensors
fi
set_property ro.hardware.sensors $hal_sensors
@@
-243,6
+254,9
@@
function create_pointercal()
function init_tscal()
{
case "$PRODUCT" in
function init_tscal()
{
case "$PRODUCT" in
+ ST70416-6*)
+ modprobe gslx680_ts_acpi
+ ;&
T91|T101|ET2002|74499FU|945GSE-ITE8712|CF-19[CDYFGKLP]*)
create_pointercal
return
T91|T101|ET2002|74499FU|945GSE-ITE8712|CF-19[CDYFGKLP]*)
create_pointercal
return
@@
-269,8
+283,10
@@
function init_ril()
*TEGA*|*2010:svnIntel:*|*Lucid-MWE*)
set_property rild.libpath /system/lib/libhuaweigeneric-ril.so
set_property rild.libargs "-d /dev/ttyUSB2 -v /dev/ttyUSB1"
*TEGA*|*2010:svnIntel:*|*Lucid-MWE*)
set_property rild.libpath /system/lib/libhuaweigeneric-ril.so
set_property rild.libargs "-d /dev/ttyUSB2 -v /dev/ttyUSB1"
+ set_property ro.radio.noril no
;;
*)
;;
*)
+ set_property ro.radio.noril yes
;;
esac
}
;;
esac
}
@@
-300,7
+316,6
@@
function do_init()
init_hal_sensors
init_tscal
init_ril
init_hal_sensors
init_tscal
init_ril
- chmod 640 /x86.prop
post_init
}
post_init
}
@@
-397,18
+412,20
@@
PRODUCT=$(cat $DMIPATH/product_name)
# import cmdline variables
for c in `cat /proc/cmdline`; do
case $c in
# import cmdline variables
for c in `cat /proc/cmdline`; do
case $c in
-
androidboot.hardware
=*)
+
BOOT_IMAGE=*|iso-scan/*|*.*
=*)
;;
*=*)
eval $c
;;
*=*)
eval $c
- case $c in
- HWACCEL=*)
- set_property debug.egl.hw $HWACCEL
- ;;
- DEBUG=*)
- set_property debug.logcat 1
- ;;
- esac
+ if [ -z "$1" ]; then
+ case $c in
+ HWACCEL=*)
+ set_property debug.egl.hw $HWACCEL
+ ;;
+ DEBUG=*)
+ [ -n "$DEBUG" ] && set_property debug.logcat 1
+ ;;
+ esac
+ fi
;;
esac
done
;;
esac
done