[oe-commits] org.oe.dev xserver-kdrive-common: only consider Xw100/Ximageon if the device has such a chip

[pH5 commit]

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

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 13230c328dd36efab674e56c004cc0813e282791
ViewMTN: http://monotone.openembedded.org/revision/info/13230c328dd36efab674e56c004cc0813e282791
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
Diffs:

#
# mt diff -rf6f643fc6383db49dbdf286395cc43933a270bcf -r13230c328dd36efab674e56c004cc0813e282791
#
# 
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
#  from [7f41f4641df1df19c9c01517c0e6a61e7fc82ac7]
#    to [6017bd2df863067517e85e25f563e54f38953bf2]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [384019d65a703db3d63011f5d17f8b81dab3d1cc]
#    to [1e3ac3df8b80313d192e4b3b31e1228b4154186f]
# 
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver	7f41f4641df1df19c9c01517c0e6a61e7fc82ac7
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver	6017bd2df863067517e85e25f563e54f38953bf2
@@ -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 at 90 vt2" ;;
@@ -74,7 +70,9 @@ case `module_id` in
         *Collie)
                 ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 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 at 270" ;;
         "Simpad")
@@ -106,6 +104,15 @@ esac
                 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 $*
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	384019d65a703db3d63011f5d17f8b81dab3d1cc
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	1e3ac3df8b80313d192e4b3b31e1228b4154186f
@@ -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 at 90 vt2" ;;
@@ -74,7 +70,9 @@ case `module_id` in
         *Collie)
                 ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 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 at 270" ;;
         "Simpad")
@@ -106,6 +104,15 @@ esac
                 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 $*