Skip to content

Commit

Permalink
games-util/xpadneo: update ERTM messages for kernel 5.12
Browse files Browse the repository at this point in the history
The L2CAP patch is upstreamed in >=5.12, and ERTM is now instead
recommended by upstream to help with rumble stability:
atar-axis/xpadneo#272

For non-live, also install the L2CAP patch in docs/ as reference.

Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
  • Loading branch information
ionenwks committed Apr 30, 2021
1 parent 5e89a6c commit 5620ac7
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 26 deletions.
38 changes: 25 additions & 13 deletions games-util/xpadneo/xpadneo-0.9.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

EAPI=7

inherit linux-mod toolchain-funcs udev
inherit linux-info linux-mod toolchain-funcs udev

if [[ ${PV} == 9999 ]]; then
inherit git-r3
Expand Down Expand Up @@ -36,25 +36,37 @@ src_install() {
udev_dorules etc-udev-rules.d/60-${PN}.rules

dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
newdoc ../misc/kernel_patches/0001-fix_bluetooth_reconnect.patch \
L2CAP-fix-for-kernel-5.11-or-older.patch
}

pkg_postinst() {
linux-mod_pkg_postinst
udev_reload

local ertm=/sys/module/bluetooth/parameters/disable_ertm
if ! [[ ${REPLACING_VERSIONS} && $(<${ertm}) == Y ]]; then
local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
if kernel_is -ge 5 12; then
if [[ $(<${disable_ertm}) == Y ]]; then
elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is disabled."
elog "This is no longer recommended with kernel >=5.12 to use ${PN}."
elog "Can remove ${EROOT}/etc/modprobe.d/no-ertm.conf if it exists, and run:"
elog " echo N > ${disable_ertm}"
elog "After changing, may need to re-pair the gamepad with bluetooth."
fi
elif [[ $(<${disable_ertm}) == N ]]; then
elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is enabled."
elog "While keeping enabled is recommended for rumble usage stability, it can"
elog "cause connection issues without kernel >=5.12 or the L2CAP kernel patch"
elog "provided in ${EROOT}/usr/share/doc/${PF}/"
elog "If needed, this mode can be disabled by running:"
elog " echo Y > ${disable_ertm}"
elog " echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
elog "After changing, may need to re-pair the gamepad with bluetooth."
fi

if [[ ! ${REPLACING_VERSIONS} ]]; then
elog "To pair the gamepad and view module options, see documentation in:"
elog " ${EROOT}/usr/share/doc/${PF}"
elog
elog "Be warned that bluetooth's ERTM (Enhanced ReTransmission Mode) can"
elog "cause the gamepad to enter a re-connection loop."
elog "- To disable immediately:"
elog " echo Y > ${ertm}"
elog "- To disable for next and subsequent boot:"
elog " echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
elog "- Or, if bluetooth isn't a module, add to the kernel's command line:"
elog " bluetooth.disable_ertm=y"
elog " ${EROOT}/usr/share/doc/${PF}/"
fi
}

Expand Down
35 changes: 22 additions & 13 deletions games-util/xpadneo/xpadneo-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

EAPI=7

inherit linux-mod toolchain-funcs udev
inherit linux-info linux-mod toolchain-funcs udev

if [[ ${PV} == 9999 ]]; then
inherit git-r3
Expand Down Expand Up @@ -42,19 +42,28 @@ pkg_postinst() {
linux-mod_pkg_postinst
udev_reload

local ertm=/sys/module/bluetooth/parameters/disable_ertm
if ! [[ ${REPLACING_VERSIONS} && $(<${ertm}) == Y ]]; then
local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
if kernel_is -ge 5 12; then
if [[ $(<${disable_ertm}) == Y ]]; then
elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is disabled."
elog "This is no longer recommended with kernel >=5.12 to use ${PN}."
elog "Can remove ${EROOT}/etc/modprobe.d/no-ertm.conf if it exists, and run:"
elog " echo N > ${disable_ertm}"
elog "After changing, may need to re-pair the gamepad with bluetooth."
fi
elif [[ $(<${disable_ertm}) == N ]]; then
elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is enabled."
elog "While keeping enabled is recommended for rumble usage stability, it can"
elog "cause connection issues without a fix included in kernel >=5.12"
elog "If needed, this mode can be disabled by running:"
elog " echo Y > ${disable_ertm}"
elog " echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
elog "After changing, may need to re-pair the gamepad with bluetooth."
fi

if [[ ! ${REPLACING_VERSIONS} ]]; then
elog "To pair the gamepad and view module options, see documentation in:"
elog " ${EROOT}/usr/share/doc/${PF}"
elog
elog "Be warned that bluetooth's ERTM (Enhanced ReTransmission Mode) can"
elog "cause the gamepad to enter a re-connection loop."
elog "- To disable immediately:"
elog " echo Y > ${ertm}"
elog "- To disable for next and subsequent boot:"
elog " echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
elog "- Or, if bluetooth isn't a module, add to the kernel's command line:"
elog " bluetooth.disable_ertm=y"
elog " ${EROOT}/usr/share/doc/${PF}/"
fi
}

Expand Down

0 comments on commit 5620ac7

Please sign in to comment.