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
07d463e
..
867ae57
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
@@
-33,13
+38,10
@@
function init_hal_audio()
VirtualBox*|Bochs*)
[ -d /proc/asound/card0 ] || modprobe snd-sb16 isapnp=0 irq=5
;;
VirtualBox*|Bochs*)
[ -d /proc/asound/card0 ] || modprobe snd-sb16 isapnp=0 irq=5
;;
- *)
+ TS10*)
+ set_prop_if_empty hal.audio.out pcmC0D2p
;;
esac
;;
esac
-
- if grep -qi "IntelHDMI" /proc/asound/card0/id; then
- [ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
- fi
}
function init_hal_bluetooth()
}
function init_hal_bluetooth()
@@
-50,10
+52,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
@@
-111,10
+115,8
@@
function set_drm_mode()
ET1602*)
drm_mode=1366x768
;;
ET1602*)
drm_mode=1366x768
;;
- VMware*)
- [ -n "$video" ] && drm_mode=$video
- ;;
*)
*)
+ [ -n "$video" ] && drm_mode=$video
;;
esac
;;
esac
@@
-123,6
+125,8
@@
function set_drm_mode()
function init_uvesafb()
{
function init_uvesafb()
{
+ UVESA_MODE=${UVESA_MODE:-${video%@*}}
+
case "$PRODUCT" in
ET2002*)
UVESA_MODE=${UVESA_MODE:-1600x900}
case "$PRODUCT" in
ET2002*)
UVESA_MODE=${UVESA_MODE:-1600x900}
@@
-136,16
+140,19
@@
function init_uvesafb()
function init_hal_gralloc()
{
function init_hal_gralloc()
{
+ [ "$VULKAN" = "1" ] && GRALLOC=gbm
+
case "$(cat /proc/fb | head -1)" in
*virtiodrmfb)
if [ "$HWACCEL" != "0" ]; then
case "$(cat /proc/fb | head -1)" in
*virtiodrmfb)
if [ "$HWACCEL" != "0" ]; then
- set_property ro.hardware.hwcomposer drm
- set_property ro.hardware.gralloc gbm
+ set_property ro.hardware.hwcomposer ${HWC:-drm}
+ set_property ro.hardware.gralloc ${GRALLOC:-gbm}
+ set_property debug.drm.mode.force ${video:-1280x800}
fi
;;
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
if [ "$HWACCEL" != "0" ]; then
fi
;;
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
if [ "$HWACCEL" != "0" ]; then
- set_property ro.hardware.gralloc
drm
+ set_property ro.hardware.gralloc
${GRALLOC:-drm}
set_drm_mode
fi
;;
set_drm_mode
fi
;;
@@
-165,6
+172,20
@@
function init_hal_hwcomposer()
return
}
return
}
+function init_hal_vulkan()
+{
+ case "$(cat /proc/fb | head -1)" in
+ 0*inteldrmfb)
+ set_property ro.hardware.vulkan android-x86
+ ;;
+ 0*amdgpudrmfb)
+ set_property ro.hardware.vulkan radv
+ ;;
+ *)
+ ;;
+ esac
+}
+
function init_hal_lights()
{
chown 1000.1000 /sys/class/backlight/*/brightness
function init_hal_lights()
{
chown 1000.1000 /sys/class/backlight/*/brightness
@@
-178,6
+199,12
@@
function init_hal_power()
# TODO
case "$PRODUCT" in
# TODO
case "$PRODUCT" in
+ HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA|VMware*)
+ set_prop_if_empty sleep.state none
+ ;;
+ e-tab*Pro)
+ set_prop_if_empty sleep.state force
+ ;;
*)
;;
esac
*)
;;
esac
@@
-248,22
+275,25
@@
function init_hal_sensors()
modprobe hdaps
hal_sensors=hdaps
;;
modprobe hdaps
hal_sensors=hdaps
;;
- *i7Stylus*)
- set_property ro.iio.accel.y.opt_scale -1
- set_property ro.iio.accel.z.opt_scale -1
+ *e-tabPro*)
+ set_property ro.iio.accel.quirks no-trig
+ ;&
+ *i7Stylus*|*M80TA*)
+ set_property ro.iio.accel.x.opt_scale -1
;;
*ONDATablet*)
set_property ro.iio.accel.order 102
;;
*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*)
set_property ro.iio.accel.order 102
;;
*ST70416-6*)
set_property ro.iio.accel.order 102
+ ;;
+ *pnEZpad*)
+ set_property ro.iio.accel.quirks no-trig
;&
;&
- *
Surface.3*|*svnOEMB*|*T305C
A*)
+ *
T*0*T
A*)
set_property ro.iio.accel.y.opt_scale -1
set_property ro.iio.accel.y.opt_scale -1
- ;&
- *T10*TA*)
- set_property ro.iio.accel.x.opt_scale -1
- set_property ro.iio.accel.z.opt_scale -1
;;
*)
has_sensors=false
;;
*)
has_sensors=false
@@
-279,11
+309,11
@@
function init_hal_sensors()
hal_sensors=hdaps
has_sensors=true
elif [ "$hal_sensors" != "kbd" ]; then
hal_sensors=hdaps
has_sensors=true
elif [ "$hal_sensors" != "kbd" ]; then
- has_sensors=
${HAS_SENSORS:-true}
+ has_sensors=
true
fi
set_property ro.hardware.sensors $hal_sensors
fi
set_property ro.hardware.sensors $hal_sensors
- set_property config.override_forced_orient $
has_sensors
+ set_property config.override_forced_orient $
{HAS_SENSORS:-$has_sensors}
}
function create_pointercal()
}
function create_pointercal()
@@
-357,6
+387,7
@@
function do_init()
init_hal_gps
init_hal_gralloc
init_hal_hwcomposer
init_hal_gps
init_hal_gralloc
init_hal_hwcomposer
+ init_hal_vulkan
init_hal_lights
init_hal_power
init_hal_sensors
init_hal_lights
init_hal_power
init_hal_sensors
@@
-372,6
+403,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
@@
-410,6
+443,12
@@
function do_bootcomplete()
setkeycodes 0x66 172
setkeycodes 0x6b 127
;;
setkeycodes 0x66 172
setkeycodes 0x6b 127
;;
+ Surface*Go)
+ echo on > /sys/devices/pci0000:00/0000:00:15.1/i2c_designware.1/power/control
+ ;;
+ VMware*)
+ pm disable com.android.bluetooth
+ ;;
*)
;;
esac
*)
;;
esac
@@
-426,13
+465,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