OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

device-generic-common: Commit

device/generic/common


Commit MetaInfo

Révision2cae43df47994631a340f415523f66f40be10733 (tree)
l'heure2018-03-05 13:03:06
AuteurChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Message de Log

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Change Summary

Modification

--- a/alsa/bytcrrt5640.state
+++ b/alsa/bytcrrt5640.state
@@ -1783,7 +1783,7 @@ state.bytcrrt5640 {
17831783 control.154 {
17841784 iface MIXER
17851785 name 'Headphone Switch'
1786- value false
1786+ value true
17871787 comment {
17881788 access 'read write'
17891789 type BOOLEAN
@@ -2504,7 +2504,7 @@ state.bytcrrt5640 {
25042504 control.224 {
25052505 iface MIXER
25062506 name 'HP L Playback Switch'
2507- value false
2507+ value true
25082508 comment {
25092509 access 'read write'
25102510 type BOOLEAN
@@ -2514,7 +2514,7 @@ state.bytcrrt5640 {
25142514 control.225 {
25152515 iface MIXER
25162516 name 'HP R Playback Switch'
2517- value false
2517+ value true
25182518 comment {
25192519 access 'read write'
25202520 type BOOLEAN
@@ -3178,7 +3178,7 @@ state.bytrt5640 {
31783178 control.25 {
31793179 iface MIXER
31803180 name 'Headphone Switch'
3181- value false
3181+ value true
31823182 comment {
31833183 access 'read write'
31843184 type BOOLEAN
--- a/fstab.x86
+++ b/fstab.x86
@@ -6,3 +6,4 @@ none /cache tmpfs nosuid,nodev,noatime defaults
66 /devices/*/*sdmmc*/* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
77 /devices/*/80860F14:01/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
88 /devices/*/80860F14:02/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
9+/devices/*/PNP0FFF:00/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
--- a/init.sh
+++ b/init.sh
@@ -1,5 +1,5 @@
11 #
2-# Copyright (C) 2013-2015 The Android-x86 Open Source Project
2+# Copyright (C) 2013-2018 The Android-x86 Open Source Project
33 #
44 # License: GNU Public License v2 or later
55 #
@@ -10,6 +10,11 @@ function set_property()
1010 [ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
1111 }
1212
13+function set_prop_if_empty()
14+{
15+ [ -z "$(getprop $1)" ] && set_property "$1" "$2"
16+}
17+
1318 function init_misc()
1419 {
1520 # device information
@@ -53,7 +58,6 @@ function init_hal_bluetooth()
5358 T10*TA|HP*Omni*)
5459 BTUART_PORT=/dev/ttyS1
5560 set_property hal.bluetooth.uart.proto bcm
56- [ -z "$(getprop sleep.state)" ] && set_property sleep.state none
5761 ;;
5862 MacBookPro8*)
5963 rmmod b43
@@ -142,6 +146,7 @@ function init_hal_gralloc()
142146 set_property ro.hardware.hwcomposer drm
143147 set_property ro.hardware.gralloc gbm
144148 fi
149+ set_prop_if_empty sleep.state none
145150 ;;
146151 0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
147152 if [ "$HWACCEL" != "0" ]; then
@@ -178,6 +183,9 @@ function init_hal_power()
178183
179184 # TODO
180185 case "$PRODUCT" in
186+ HP*Omni*|OEMB|Surface*3|T10*TA)
187+ set_prop_if_empty sleep.state none
188+ ;;
181189 *)
182190 ;;
183191 esac
@@ -249,20 +257,18 @@ function init_hal_sensors()
249257 hal_sensors=hdaps
250258 ;;
251259 *i7Stylus*)
252- set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
253- ;;
254- *ST70416-6*)
255- set_property hal.sensors.iio.accel.matrix 0,-1,0,-1,0,0,0,0,-1
260+ set_property ro.iio.accel.x.opt_scale -1
256261 ;;
257262 *ONDATablet*)
258- set_property hal.sensors.iio.accel.matrix 0,1,0,1,0,0,0,0,-1
259- ;;
260- *Surface.3*|*svnOEMB*)
263+ set_property ro.iio.accel.order 102
264+ set_property ro.iio.accel.x.opt_scale -1
261265 set_property ro.iio.accel.y.opt_scale -1
262- ;&
266+ ;;
267+ *ST70416-6*)
268+ set_property ro.iio.accel.order 102
269+ ;;
263270 *T10*TA*)
264- set_property ro.iio.accel.x.opt_scale -1
265- set_property ro.iio.accel.z.opt_scale -1
271+ set_property ro.iio.accel.y.opt_scale -1
266272 ;;
267273 *)
268274 has_sensors=false
@@ -272,13 +278,16 @@ function init_hal_sensors()
272278 # has iio sensor-hub?
273279 if [ -n "`ls /sys/bus/iio/devices/iio:device* 2> /dev/null`" ]; then
274280 busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device*/
281+ [ -n "`ls /sys/bus/iio/devices/iio:device*/in_accel_x_raw 2> /dev/null`" ] && has_sensors=true
275282 hal_sensors=iio
276283 elif lsmod | grep -q lis3lv02d_i2c; then
277284 hal_sensors=hdaps
285+ has_sensors=true
286+ elif [ "$hal_sensors" != "kbd" ]; then
287+ has_sensors=${HAS_SENSORS:-true}
278288 fi
279289
280290 set_property ro.hardware.sensors $hal_sensors
281- [ "$hal_sensors" != "kbd" ] && has_sensors=true
282291 set_property config.override_forced_orient $has_sensors
283292 }
284293
@@ -422,13 +431,13 @@ function do_bootcomplete()
422431 alsa_amixer -c $c set Headphone on
423432 alsa_amixer -c $c set Headphone 100%
424433 alsa_amixer -c $c set Speaker 100%
425- alsa_amixer -c $c set Capture 100%
434+ alsa_amixer -c $c set Capture 80%
426435 alsa_amixer -c $c set Capture cap
427436 alsa_amixer -c $c set PCM 100 unmute
428437 alsa_amixer -c $c set SPO unmute
429438 alsa_amixer -c $c set IEC958 on
430- alsa_amixer -c $c set 'Mic Boost' 3
431- alsa_amixer -c $c set 'Internal Mic Boost' 3
439+ alsa_amixer -c $c set 'Mic Boost' 1
440+ alsa_amixer -c $c set 'Internal Mic Boost' 1
432441 fi
433442 done
434443
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -64,7 +64,7 @@ service nativebridge /system/bin/enable_nativebridge
6464 disabled
6565 oneshot
6666
67-service logcat /system/bin/logcat -v threadtime -f /data/log.txt
67+service logcat /system/bin/logcat -b all -v threadtime -f /data/log.txt
6868 class debug
6969
7070 service btattach /system/bin/btattach
--- a/packages.mk
+++ b/packages.mk
@@ -98,3 +98,4 @@ PRODUCT_PACKAGES += \
9898 # Third party apps
9999 PRODUCT_PACKAGES += \
100100 Eleven \
101+ TSCalibration2 \
--- a/tp_smapi/hdaps.c
+++ b/tp_smapi/hdaps.c
@@ -779,8 +779,12 @@ static int __init hdaps_init(void)
779779 hdaps_invert = 0; /* default */
780780
781781 /* Init timer before platform_driver_register, in case of suspend */
782+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
783+ timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
784+#else
782785 init_timer(&hdaps_timer);
783786 hdaps_timer.function = hdaps_mousedev_poll;
787+#endif
784788 ret = platform_driver_register(&hdaps_driver);
785789 if (ret)
786790 goto out;
Afficher sur ancien navigateur de dépôt.