xserver-kdrive-common: only consider Xw100/Ximageon if the device has such a chip

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
index b0c65f4..85ca584 100644 (file)
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -15,12 +15,6 @@ fi
 if [ -f /usr/bin/Xomap ]; then
   XSERVER=/usr/bin/Xomap
 fi
-if [ -f /usr/bin/Xw100 ]; then
-  XSERVER=/usr/bin/Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
-   XSERVER=/usr/bin/Ximageon
-fi
 
 . /etc/profile
 
@@ -64,7 +58,9 @@ case `module_id` in
         "HP iPAQ H5400" | "HP iPAQ H2200")
                 ARGS="$ARGS -dpi 100 -rgba rgb" ;;
         "HP iPAQ HX4700")
-                ARGS="$ARGS -dpi 200" ;;
+                ARGS="$ARGS -dpi 200"
+                IMAGEON="w3220"
+                ;;
         "Ramses")
                 # What is this "vt2" in aid of?
                 ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
@@ -74,7 +70,9 @@ case `module_id` in
         *Collie)
                 ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;;
         "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-                ARGS="$ARGS -dpi 200 -rgba rgb" ;;
+                ARGS="$ARGS -dpi 200 -rgba rgb"
+                IMAGEON="w100"
+                ;;
         "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
                 ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;;
         "Simpad")
@@ -106,6 +104,15 @@ case `module_id` in
                 ARGS="$ARGS -screen $S" ;;
 esac
 
+if [ ! -z "$IMAGEON" ]; then
+  if [ -f /usr/bin/Xw100 ]; then
+    XSERVER=/usr/bin/Xw100
+  fi
+  if [ -f /usr/bin/Ximageon ]; then
+    XSERVER=/usr/bin/Ximageon
+  fi
+fi
+
 DISPLAY=':0'
 
 exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index f6d3011..489010a 100644 (file)
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -15,12 +15,6 @@ fi
 if [ -f /usr/bin/Xomap ]; then
   XSERVER=/usr/bin/Xomap
 fi
-if [ -f /usr/bin/Xw100 ]; then
-  XSERVER=/usr/bin/Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
-   XSERVER=/usr/bin/Ximageon
-fi
 
 . /etc/profile
 
@@ -64,7 +58,9 @@ case `module_id` in
         "HP iPAQ H5400" | "HP iPAQ H2200")
                 ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
         "HP iPAQ HX4700")
-                ARGS="$ARGS -br -dpi 200" ;;
+                ARGS="$ARGS -br -dpi 200"
+                IMAGEON="w3220"
+                ;;
         "Ramses")
                 # What is this "vt2" in aid of?
                 ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
@@ -74,7 +70,9 @@ case `module_id` in
         *Collie)
                 ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;;
         "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-                ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+                ARGS="$ARGS -br -dpi 200 -rgba rgb"
+                IMAGEON="w100"
+                ;;
         "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
                 ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;;
         "Simpad")
@@ -106,6 +104,15 @@ case `module_id` in
                 ARGS="$ARGS -screen $S" ;;
 esac
 
+if [ ! -z "$IMAGEON" ]; then
+  if [ -f /usr/bin/Xw100 ]; then
+    XSERVER=/usr/bin/Xw100
+  fi
+  if [ -f /usr/bin/Ximageon ]; then
+    XSERVER=/usr/bin/Ximageon
+  fi
+fi
+
 DISPLAY=':0'
 
 exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*