diff --git a/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf b/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf index 09d884c45a..fc76b6fe8d 100644 --- a/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf +++ b/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf @@ -502,7 +502,7 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # CONFIG_ARM64_PTR_AUTH=y -CONFIG_ARM64_PTR_AUTH_KERNEL=y +# CONFIG_ARM64_PTR_AUTH_KERNEL is not set CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features @@ -705,7 +705,7 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y -CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_FILTER is not set # CONFIG_SECCOMP_CACHE_DEBUG is not set CONFIG_HAVE_ARCH_KSTACK_ERASE=y CONFIG_HAVE_STACKPROTECTOR=y @@ -751,7 +751,7 @@ CONFIG_ARCH_SUPPORTS_RT=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y -CONFIG_RANDOMIZE_KSTACK_OFFSET=y +# CONFIG_RANDOMIZE_KSTACK_OFFSET is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y diff --git a/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/package.mk b/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/package.mk index 47bf6d1b46..6ef4987000 100644 --- a/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/package.mk +++ b/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/package.mk @@ -23,7 +23,6 @@ makeinstall_target() { mkdir -p ${INSTALL}/usr/bin cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin chmod +x ${INSTALL}/usr/bin/start_drastic.sh - chmod +x ${INSTALL}/usr/bin/drastic_sense.sh mkdir -p ${INSTALL}/usr/lib cp -f ${PKG_BUILD}/libdrastouch.so ${INSTALL}/usr/lib/ diff --git a/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/drastic_sense.sh b/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/drastic_sense.sh deleted file mode 100644 index 9674e80d11..0000000000 --- a/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/drastic_sense.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023 ROCKNIX (https://github.com/ROCKNIX) -# 2021-present pkegg - -. /etc/profile - -set -e -set -o pipefail - -### Enable logging -case $(get_setting system.loglevel) in - verbose) - DEBUG=true - ;; - *) - DEBUG=false - ;; -esac -DEBUG=true -### Define static values for dpad buttons and as a hat. -L2_RELEASED_EVENT="*(BTN_TL2), value 0*" -R2_RELEASED_EVENT="*(BTN_TR2), value 0*" - -# strings to match errors -CONTROLLER_DISCONNECTED="*error reading: No such device" -DEVICE_DISCONNECTED="*error reading: No such device" - -get_devices() { - KJDEVS=false - FOUNDKEYS=false - FOUNDJOY=false - RETRY=5 - while [ ${KJDEVS} = false ] - do - # Detect input devices automatically - for DEV in /dev/input/ev* - do - unset SUPPORTS - SUPPORTS=$(udevadm info ${DEV} | awk '/ID_INPUT_KEY=|ID_INPUT_JOYSTICK=/ {print $2}') - if [ -n "${SUPPORTS}" ] - then - DEVICE=$(udevadm info ${DEV} | awk 'BEGIN {FS="="} /DEVNAME=/ {print $2}') - INPUT_DEVICES+=("${DEVICE}") - if [[ "${SUPPORTS}" =~ ID_INPUT_KEY ]] - then - ${DEBUG} && log $0 "Found Keyboard: ${DEVICE}" - FOUNDKEYS=true - elif [[ "${SUPPORTS}" =~ ID_INPUT_JOYSTICK ]] - then - ${DEBUG} && log $0 "Found Joystick: ${DEVICE}" - FOUNDJOY=true - fi - fi - done - if [ "${FOUNDKEYS}" = "true" ] && - [ "${FOUNDJOY}" = "true" ] - then - ${DEBUG} && log $0 "Found all of the needed devices." - KJDEVS=true - break - fi - if [ "${RETRY}" -ge 5 ] - then - ${DEBUG} && log $0 "Did not find all of the needed devices, but that may be OK. Breaking." - break - else - RETRY=$(( ${RETRY} + 1 )) - fi - sleep 1 - done -} - -get_devices - -### Go into a cpu friendly loop that idles until a key is pressed. Take action when a known pattern of keys are pressed together. -( - for INPUT_DEVICE in ${INPUT_DEVICES[@]} - do - evtest "${INPUT_DEVICE}" 2>&1 & - done - wait -) | while read line; do - case ${line} in - (${CONTROLLER_DISCONNECTED}) - ${DEBUG} && log $0 "Reloading due to ${CONTROLLER_DEVICE} reattach..." - get_devices - ;; - (${DEVICE_DISCONNECTED}) - ${DEBUG} && log $0 "Reloading due to ${DEVICE} reattach..." - get_devices - ;; - (${L2_RELEASED_EVENT}) - swaymsg floating enable - ;; - (${R2_RELEASED_EVENT}) - swaymsg floating enable - ;; - esac -done diff --git a/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh b/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh index e0142b280b..8dcc55df7e 100644 --- a/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh +++ b/projects/ROCKNIX/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh @@ -78,12 +78,6 @@ else sed -i 's/^fix_main_2d_screen = .*/fix_main_2d_screen = 0/' /storage/.config/drastic/config/drastic.cfg fi -if [ ! "${QUIRK_DEVICE}" = "Anbernic RG DS" ]; then - if echo "${UI_SERVICE}" | grep "sway"; then - /usr/bin/drastic_sense.sh & - fi -fi - cd /storage/.config/drastic/ @HOTKEY@ diff --git a/projects/ROCKNIX/packages/hardware/quirks/platforms/RK3566/050-audio_path b/projects/ROCKNIX/packages/hardware/quirks/platforms/RK3566/050-audio_path index b904ac6d44..b93c7a7507 100755 --- a/projects/ROCKNIX/packages/hardware/quirks/platforms/RK3566/050-audio_path +++ b/projects/ROCKNIX/packages/hardware/quirks/platforms/RK3566/050-audio_path @@ -4,7 +4,7 @@ cat </storage/.config/profile.d/002-audio_path ALSA_PRIMARY_CARD=1 -DEVICE_PLAYBACK_PATH_SPK="SPK" +DEVICE_PLAYBACK_PATH_SPK="HP" DEVICE_PLAYBACK_PATH_HP="HP" DEVICE_PLAYBACK_PATH="Playback Mux" EOF diff --git a/projects/ROCKNIX/packages/rocknix/autostart/050-audio b/projects/ROCKNIX/packages/rocknix/autostart/050-audio index c2ad6ba48c..48c94cd3f5 100755 --- a/projects/ROCKNIX/packages/rocknix/autostart/050-audio +++ b/projects/ROCKNIX/packages/rocknix/autostart/050-audio @@ -26,7 +26,7 @@ then then export DEVICE_PLAYBACK_PATH="Playback Path" fi - amixer -c 0 cset name="${DEVICE_PLAYBACK_PATH}" ${DEVICE_PLAYBACK_PATH_SPK} 2>/dev/null + amixer -c ${ALSA_PRIMARY_CARD:-0} cset name="${DEVICE_PLAYBACK_PATH}" ${DEVICE_PLAYBACK_PATH_SPK} 2>/dev/null fi VOLUME=$(get_setting audio.volume) @@ -40,12 +40,8 @@ fi ### Set the primary card volume to 100% ### to eliminate low audio on some devices. -if [ -n "${ALSA_PRIMARY_CARD}" ] -then - amixer -c ${ALSA_PRIMARY_CARD} -q sset "Master" 100% -else - amixer -c 0 -q sset "Master" 100% -fi + amixer -c ${ALSA_PRIMARY_CARD:-0} -q sset "Master" 100% + ### Now set the pipewire mixer volume /usr/bin/volume ${VOLUME}