|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-armani-0.0.4.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/droid-hcismd-up.service
^
|
| -(symlink to ../droid-hcismd-up.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-armani-0.0.4.tar.bz2/sparse/lib/systemd/system/droid-hcismd-up.service
^
|
| @@ -1,13 +0,0 @@
-[Unit]
-Description=Enable Bluetooth HCI over SMD
-After=droid-late-start.target
-Before=bluetooth.service
-Conflicts=shutdown.target actdead.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh /usr/bin/droid/droid-hcismd-up.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=bluetooth.service
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-armani-0.0.4.tar.bz2/sparse/usr/bin/droid/droid-hcismd-up.sh
^
|
| @@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Maximum number of attempts to enable hcismd to try to get
-# hci0 to come online. Writing to sysfs too early seems to
-# not work, so we loop.
-MAXTRIES=15
-
-#setprop bluetooth.hciattach true
-i=1
-while [ ! $i -gt $MAXTRIES ] ; do
- echo 1 > /sys/module/hci_smd/parameters/hcismd_set
- if [ -e /sys/class/bluetooth/hci0 ] ; then
- # found hci0, exit successfully
- echo 0 > /sys/module/hci_smd/parameters/hcismd_set
- bt_mac=$(/system/bin/hci_qcomm_init -e -p 2 -P 2 -d /dev/ttyHSL0 2>1 | grep -oP '([0-9a-f]{2}:){5}([0-9a-f]{2})')
- echo "BT MAC: $bt_mac"
- if [ ! -z "$bt_mac" ] ; then
- echo $bt_mac > /var/lib/bluetooth/board-address
- echo "BT MAC: $bt_mac"
- fi
- echo 1 > /sys/module/hci_smd/parameters/hcismd_set
- exit 0
- fi
- sleep 1
- if [ $i == $MAXTRIES ] ; then
- # must have gotten through all our retries, fail
- exit 1
- fi
-done
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -429,6 +429,8 @@
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/usr/share/package-groups/*
+sed --in-place 's|@DEVICE@|%{rpm_device}|' %{buildroot}/etc/zypp/systemCheck.d/*.check
+
# SSU board mapping for hardware adaptation
%if 0%{!?provides_own_board_mapping:1}
mkdir -p $RPM_BUILD_ROOT/%{board_mapping_dir}
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -0,0 +1,6 @@
+requires:droid-hal-@DEVICE@
+requires:droid-config-@DEVICE@
+requires:droid-hal-version-@DEVICE@
+requires:libhybris-libEGL
+requires:libhybris-libGLESv2
+requires:libhybris-libwayland-egl
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/etc/mce/60-input-policy-armani.conf
^
|
| @@ -0,0 +1 @@
+/system/osso/dsm/event_input/input_grab_allowed=2
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/etc/pulse/arm_msm8226_xiaomi-armani.pa
^
|
| @@ -29,7 +29,14 @@
load-module module-meego-mainvolume virtual_stream=true
### Automatically restore the volume of streams
-load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table
+# load configuration based on bluez version
+.ifexists /etc/pulse/bluez4_stream_restore.pa
+.include /etc/pulse/bluez4_stream_restore.pa
+.endif
+
+.ifexists /etc/pulse/bluez5_stream_restore.pa
+.include /etc/pulse/bluez5_stream_restore.pa
+.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -50,6 +57,8 @@
load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
load-module module-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco
+load-module module-combine-sink sink_name=sink.primaryandbluez resample_method=trivial rate=48000 channels=2 ignore=sink.low_latency
+
load-module module-policy-enforcement
load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
@@ -104,7 +113,7 @@
load-module module-dbus-protocol
.endif
-load-module module-switch-on-port-available
+load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
### Make some devices default
set-default-sink sink.primary
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/hcismd.service
^
|
| +(symlink to ../hcismd.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/iris-module-load.service
^
|
| +(symlink to ../iris-module-load.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/lib/systemd/system/hcismd.service
^
|
| @@ -0,0 +1,25 @@
+[Unit]
+Description=Enable Bluetooth HCI over SMD
+After=dev-wcnss_ctrl.device local-fs.target
+Before=bluetooth.service
+Conflicts=shutdown.target actdead.target
+
+[Service]
+Environment=WCNSS_READY=/sys/devices/fb000000.qcom,wcnss-wlan/wcnss_ready
+Environment=HCISMD_SET=/sys/module/hci_smd/parameters/hcismd_set
+Environment=BOARD_ADDRESS=/var/lib/bluetooth/board-address
+
+Type=forking
+RemainAfterExit=yes
+ExecStartPre=/bin/sh -c "[ $(cat $WCNSS_READY) -eq '1' ]"
+ExecStartPre=/bin/sh -c "echo 0 > $HCISMD_SET"
+ExecStart=/bin/sh -c "/system/bin/hci_qcomm_init -e 2>&1 | grep -oP '([0-9a-f]{2}:){5}([0-9a-f]{2})' | awk '{split($0,i,\":\"); print i[6]\":\"i[5]\":\"i[4]\":\"i[3]\":\"i[2]\":\"i[1]}' > $BOARD_ADDRESS"
+ExecStartPost=/bin/sh -c "echo 1 > $HCISMD_SET"
+ExecStop=/bin/sh -c "echo 0 > $HCISMD_SET"
+Restart=on-failure
+RestartSec=5
+StartLimitBurst=12
+
+[Install]
+WantedBy=bluetooth.service
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/lib/systemd/system/iris-module-load.service
^
|
| @@ -0,0 +1,16 @@
+[Unit]
+Description=Load FM-radio module
+After=hcismd.service
+Conflicts=shutdown.target actdead.target
+
+[Service]
+Type=forking
+RemainAfterExit=yes
+ExecStart=/sbin/modprobe radio-iris-transport
+Restart=on-failure
+RestartSec=2
+StartLimitBurst=15
+
+[Install]
+WantedBy=bluetooth.service
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/lib/systemd/system/wlan-module-load.service
^
|
| @@ -1,15 +1,20 @@
[Unit]
Description=Load wifi module
+After=dev-wcnss_wlan.device init-done.service
Conflicts=shutdown.target actdead.target
[Service]
-Type=simple
+Environment=WCNSS_READY=/sys/devices/fb000000.qcom,wcnss-wlan/wcnss_ready
+
+Type=forking
RemainAfterExit=yes
-ExecStartPre=/bin/sleep 5s
+ExecStartPre=/bin/sh -c "[ $(cat $WCNSS_READY) -eq '1' ]"
ExecStart=/sbin/modprobe wlan
ExecStop=/sbin/modprobe -r wlan
Restart=on-failure
RestartSec=2
+StartLimitBurst=15
[Install]
WantedBy=basic.target
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.5.tar.bz2/sparse/lib/udev/rules.d/999-droid-wcnss.rules
^
|
| @@ -0,0 +1,3 @@
+KERNEL=="wcnss_ctrl", SYMLINK="wcnss_ctrl", TAG+="systemd"
+KERNEL=="wcnss_wlan", SYMLINK="wcnss_wlan", TAG+="systemd"
+
|
