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.sh: change uvesafb default mode to 1024x768
[android-x86/device-generic-common.git]
/
init.sh
diff --git
a/init.sh
b/init.sh
index
20161d6
..
2755a58
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()
@@
-50,6
+50,16
@@
function init_hal_bluetooth()
modprobe b43 btcoex=0
modprobe btusb
;;
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
@@
-93,31
+103,22
@@
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
[ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
*)
;;
esac
[ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
- modprobe uvesafb mode_option=${UVESA_MODE:-
800x600
}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+ 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
*virtiodrmfb)
}
function init_hal_gralloc()
{
case "$(cat /proc/fb | head -1)" in
*virtiodrmfb)
-
set_property ro.hardware.hwcomposer drm
+
#
set_property ro.hardware.hwcomposer drm
;&
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
set_property ro.hardware.gralloc drm
;&
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
set_property ro.hardware.gralloc drm
@@
-159,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*)
@@
-211,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
@@
-226,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
@@
-305,7
+314,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
}