brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2025-01-21 10:50:07 +09:00
Code Issues Projects Releases Wiki Activity

Rename is_fkms to is_kms for accuracy

Browse Source
This commit is contained in:
Simon Long 2022-03-01 09:52:29 +00:00
parent 37333afc34
commit fe2e5cce4e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
raspi-config
View File

@ -73,7 +73,7 @@ is_ssh() {
fi fi
} }
is_fkms() { is_kms() {
if grep -s -q okay /proc/device-tree/soc/v3d@7ec00000/status \ if grep -s -q okay /proc/device-tree/soc/v3d@7ec00000/status \
/proc/device-tree/soc/firmwarekms@7e600000/status \ /proc/device-tree/soc/firmwarekms@7e600000/status \
/proc/device-tree/v3dbus/v3d@7ec04000/status; then /proc/device-tree/v3dbus/v3d@7ec04000/status; then
@ -436,7 +436,7 @@ do_blanking() {
} }
get_pixdub() { get_pixdub() {
if is_pi && ! is_fkms; then if is_pi && ! is_kms; then
FBW=$(get_config_var framebuffer_width $CONFIG) FBW=$(get_config_var framebuffer_width $CONFIG)
if [ $FBW -eq 0 ]; then if [ $FBW -eq 0 ]; then
echo 1 echo 1
@ -468,7 +468,7 @@ do_pixdub() {
else else
RET=$1 RET=$1
fi fi
if is_pi && ! is_fkms; then if is_pi && ! is_kms; then
if [ $RET -eq 0 ] ; then if [ $RET -eq 0 ] ; then
XVAL=$(xrandr 2>&1 | grep current | cut -f2 -d, | cut -f3 -d' ') XVAL=$(xrandr 2>&1 | grep current | cut -f2 -d, | cut -f3 -d' ')
YVAL=$(xrandr 2>&1 | grep current | cut -f2 -d, | cut -f5 -d' ') YVAL=$(xrandr 2>&1 | grep current | cut -f2 -d, | cut -f5 -d' ')
@ -2888,7 +2888,7 @@ do_system_menu() {
do_display_menu() { do_display_menu() {
if is_pi ; then if is_pi ; then
if is_fkms; then if is_kms; then
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \ FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"D2 Underscan" "Remove black border around screen" \ "D2 Underscan" "Remove black border around screen" \
"D4 Screen Blanking" "Enable/disable screen blanking" \ "D4 Screen Blanking" "Enable/disable screen blanking" \
@ -2917,10 +2917,10 @@ do_display_menu() {
elif [ $RET -eq 0 ]; then elif [ $RET -eq 0 ]; then
case "$FUN" in case "$FUN" in
D1\ *) do_resolution ;; D1\ *) do_resolution ;;
D2\ *) if is_fkms || ! is_pi ; then D2\ *) if is_pi && ! is_kms; then
do_overscan_kms
else
do_overscan do_overscan
else
do_overscan_kms
fi fi
;; ;;
D3\ *) do_pixdub ;; D3\ *) do_pixdub ;;