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
a59ac18
..
867ae57
100644
(file)
--- a/
init.sh
+++ b/
init.sh
@@
-38,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()
@@
-55,6
+52,9
@@
function init_hal_bluetooth()
done
case "$PRODUCT" in
done
case "$PRODUCT" in
+ T100TAF)
+ set_property bluetooth.interface hci1
+ ;;
T10*TA|M80TA|HP*Omni*)
BTUART_PORT=/dev/ttyS1
set_property hal.bluetooth.uart.proto bcm
T10*TA|M80TA|HP*Omni*)
BTUART_PORT=/dev/ttyS1
set_property hal.bluetooth.uart.proto bcm
@@
-115,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
@@
-127,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}
@@
-140,17
+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
fi
- set_prop_if_empty sleep.state none
;;
0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
if [ "$HWACCEL" != "0" ]; then
;;
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
;;
@@
-170,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
@@
-183,9
+199,12
@@
function init_hal_power()
# TODO
case "$PRODUCT" in
# TODO
case "$PRODUCT" in
- HP*Omni*|OEMB|S
urface*3|T10*TA
)
+ HP*Omni*|OEMB|S
tandard*PC*|Surface*3|T10*TA|VMware*
)
set_prop_if_empty sleep.state none
;;
set_prop_if_empty sleep.state none
;;
+ e-tab*Pro)
+ set_prop_if_empty sleep.state force
+ ;;
*)
;;
esac
*)
;;
esac
@@
-256,6
+275,9
@@
function init_hal_sensors()
modprobe hdaps
hal_sensors=hdaps
;;
modprobe hdaps
hal_sensors=hdaps
;;
+ *e-tabPro*)
+ set_property ro.iio.accel.quirks no-trig
+ ;&
*i7Stylus*|*M80TA*)
set_property ro.iio.accel.x.opt_scale -1
;;
*i7Stylus*|*M80TA*)
set_property ro.iio.accel.x.opt_scale -1
;;
@@
-267,7
+289,10
@@
function init_hal_sensors()
*ST70416-6*)
set_property ro.iio.accel.order 102
;;
*ST70416-6*)
set_property ro.iio.accel.order 102
;;
- *T10*TA*|*pnEZpad*)
+ *pnEZpad*)
+ set_property ro.iio.accel.quirks no-trig
+ ;&
+ *T*0*TA*)
set_property ro.iio.accel.y.opt_scale -1
;;
*)
set_property ro.iio.accel.y.opt_scale -1
;;
*)
@@
-362,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
@@
-417,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