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
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
[android-x86/device-generic-common.git]
/
init.sh
diff --git
a/init.sh
b/init.sh
index
7e85495
..
5f367db
100644
(file)
--- a/
init.sh
+++ b/
init.sh
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2013-201
5
The Android-x86 Open Source Project
+# Copyright (C) 2013-201
8
The Android-x86 Open Source Project
#
# License: GNU Public License v2 or later
#
#
# License: GNU Public License v2 or later
#
@@
-10,6
+10,11
@@
function set_property()
[ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
}
[ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
}
+function set_prop_if_empty()
+{
+ [ -z "$(getprop $1)" ] && set_property "$1" "$2"
+}
+
function init_misc()
{
# device information
function init_misc()
{
# device information
@@
-21,6
+26,10
@@
function init_misc()
# in case no cpu governor driver autoloads
[ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
# in case no cpu governor driver autoloads
[ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
+
+ # enable sdcardfs if /data is not mounted on tmpfs or 9p
+ mount | grep /data\ | grep -qE 'tmpfs|9p'
+ [ $? -ne 0 ] && modprobe sdcardfs
}
function init_hal_audio()
}
function init_hal_audio()
@@
-46,10
+55,12
@@
function init_hal_bluetooth()
done
case "$PRODUCT" in
done
case "$PRODUCT" in
- T10*TA|HP*Omni*)
+ T100TAF)
+ set_property bluetooth.interface hci1
+ ;;
+ T10*TA|M80TA|HP*Omni*)
BTUART_PORT=/dev/ttyS1
set_property hal.bluetooth.uart.proto bcm
BTUART_PORT=/dev/ttyS1
set_property hal.bluetooth.uart.proto bcm
- [ -z "$(getprop sleep.state)" ] && set_property sleep.state none
;;
MacBookPro8*)
rmmod b43
;;
MacBookPro8*)
rmmod b43
@@
-127,20
+138,24
@@
function init_uvesafb()
;;
esac
;;
esac
- [ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
- modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+ modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-32 ${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.gralloc gbm
+ if [ "$HWACCEL" != "0" ]; then
+ set_property ro.hardware.hwcomposer drm
+ set_property ro.hardware.gralloc gbm
+ fi
+ set_prop_if_empty sleep.state none
;;
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
;;
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
- set_property ro.hardware.gralloc drm
- set_drm_mode
+ if [ "$HWACCEL" != "0" ]; then
+ set_property ro.hardware.gralloc drm
+ set_drm_mode
+ fi
;;
"")
init_uvesafb
;;
"")
init_uvesafb
@@
-171,6
+186,9
@@
function init_hal_power()
# TODO
case "$PRODUCT" in
# TODO
case "$PRODUCT" in
+ HP*Omni*|OEMB|Surface*3|T10*TA)
+ set_prop_if_empty sleep.state none
+ ;;
*)
;;
esac
*)
;;
esac
@@
-241,14
+259,19
@@
function init_hal_sensors()
modprobe hdaps
hal_sensors=hdaps
;;
modprobe hdaps
hal_sensors=hdaps
;;
- *i7Stylus*)
- set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
+ *i7Stylus*|*M80TA*)
+ set_property ro.iio.accel.x.opt_scale -1
+ ;;
+ *ONDATablet*)
+ set_property ro.iio.accel.order 102
+ set_property ro.iio.accel.x.opt_scale -1
+ set_property ro.iio.accel.y.opt_scale -1
;;
*ST70416-6*)
;;
*ST70416-6*)
- set_property
hal.sensors.iio.accel.matrix 0,-1,0,-1,0,0,0,0,-1
+ set_property
ro.iio.accel.order 102
;;
;;
- *
ONDATablet
*)
- set_property
hal.sensors.iio.accel.matrix 0,1,0,1,0,0,0,0,
-1
+ *
T*0*TA*|*pnEZpad
*)
+ set_property
ro.iio.accel.y.opt_scale
-1
;;
*)
has_sensors=false
;;
*)
has_sensors=false
@@
-258,14
+281,17
@@
function init_hal_sensors()
# has iio sensor-hub?
if [ -n "`ls /sys/bus/iio/devices/iio:device* 2> /dev/null`" ]; then
busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device*/
# has iio sensor-hub?
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
+ [ -n "`ls /sys/bus/iio/devices/iio:device*/in_accel_x_raw 2> /dev/null`" ] && has_sensors=true
+ hal_sensors=iio
elif lsmod | grep -q lis3lv02d_i2c; then
hal_sensors=hdaps
elif lsmod | grep -q lis3lv02d_i2c; then
hal_sensors=hdaps
+ has_sensors=true
+ elif [ "$hal_sensors" != "kbd" ]; then
+ has_sensors=true
fi
set_property ro.hardware.sensors $hal_sensors
fi
set_property ro.hardware.sensors $hal_sensors
- [ "$hal_sensors" != "kbd" ] && has_sensors=true
- set_property config.override_forced_orient $has_sensors
+ set_property config.override_forced_orient ${HAS_SENSORS:-$has_sensors}
}
function create_pointercal()
}
function create_pointercal()
@@
-354,6
+380,8
@@
function do_netconsole()
function do_bootcomplete()
{
function do_bootcomplete()
{
+ hciconfig | grep -q hci || pm disable com.android.bluetooth
+
init_cpu_governor
[ -z "$(getprop persist.sys.root_access)" ] && setprop persist.sys.root_access 3
init_cpu_governor
[ -z "$(getprop persist.sys.root_access)" ] && setprop persist.sys.root_access 3
@@
-392,6
+420,9
@@
function do_bootcomplete()
setkeycodes 0x66 172
setkeycodes 0x6b 127
;;
setkeycodes 0x66 172
setkeycodes 0x6b 127
;;
+ VMware*)
+ pm disable com.android.bluetooth
+ ;;
*)
;;
esac
*)
;;
esac
@@
-408,13
+439,13
@@
function do_bootcomplete()
alsa_amixer -c $c set Headphone on
alsa_amixer -c $c set Headphone 100%
alsa_amixer -c $c set Speaker 100%
alsa_amixer -c $c set Headphone on
alsa_amixer -c $c set Headphone 100%
alsa_amixer -c $c set Speaker 100%
- alsa_amixer -c $c set Capture
10
0%
+ alsa_amixer -c $c set Capture
8
0%
alsa_amixer -c $c set Capture cap
alsa_amixer -c $c set PCM 100 unmute
alsa_amixer -c $c set SPO unmute
alsa_amixer -c $c set IEC958 on
alsa_amixer -c $c set Capture cap
alsa_amixer -c $c set PCM 100 unmute
alsa_amixer -c $c set SPO unmute
alsa_amixer -c $c set IEC958 on
- alsa_amixer -c $c set 'Mic Boost'
3
- alsa_amixer -c $c set 'Internal Mic Boost'
3
+ alsa_amixer -c $c set 'Mic Boost'
1
+ alsa_amixer -c $c set 'Internal Mic Boost'
1
fi
done
fi
done
@@
-436,9
+467,6
@@
for c in `cat /proc/cmdline`; do
eval $c
if [ -z "$1" ]; then
case $c in
eval $c
if [ -z "$1" ]; then
case $c in
- HWACCEL=*)
- set_property debug.egl.hw $HWACCEL
- ;;
DEBUG=*)
[ -n "$DEBUG" ] && set_property debug.logcat 1
;;
DEBUG=*)
[ -n "$DEBUG" ] && set_property debug.logcat 1
;;