xserver-kdrive-common: simplify cmdline generation for GTA0(1|2), use DPI=280 also...

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
index 1317313..386d285 100644 (file)
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -110,44 +110,25 @@ case `module_id` in
         "Compulab CM-x270")
                 modprobe mbxfb
                 ARGS="$ARGS -fb /dev/fb1" ;;
-        "GTA01")
+        "GTA01" | "GTA02")
                 if [ `screen_width` -gt 330 ] ; then
                      if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
                           PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
                      fi
-                     DPI=285
+                     DPI=280
                 else
                      if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
                           PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
                      fi
                      DPI=142
                 fi 
-                ARGS="$ARGS -dpi ${DPI} vt1"
-               ;;
-       "GTA02")
-                if [ `screen_width` -gt 330 ] ; then
-                     if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
-                          PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
-                     fi
-                     DPI=285
-                else 
-                     if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
-                          PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
-                     fi
-                     DPI=142
-                fi 
-
                 if [ "$XSERVER" = "/usr/bin/Xorg" ]; then
-                     if [ "$DPI" = "285" ]; then
-                         # Fix for only 3 columns of icons in illume desktop
-                         DPI=280
-                     fi
                      if [ -z "${USB_MOUSE}" ]; then
                          # Fix for segfault while typing on illume keyboard
                          ARGS="$ARGS -nocursor"
                      fi
                      ARGS="$ARGS -dpi ${DPI} vt1"
-                else
+                elif [ `module_id` == "GTA02" ] ; then
                      ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" 
                      XSERVER=/usr/bin/Xglamo 
                 fi

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 8e27c01..3812d2f 100644 (file)
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-PR = "r43"
+PR = "r44"
 
 SRC_URI = "\
   file://Xdefaults \