# HG changeset patch
# User gthomas
# Date 1062501857 0
# Node ID 66e039e7871e7989368106af78a83f6d62b6abc6
# Parent  d53522870fc0854159b76028344a39369b5fa71c
Avoid iPAQ setups when using VNC

diff --git a/packages/services/gfx/mw/current/ChangeLog b/packages/services/gfx/mw/current/ChangeLog
--- a/packages/services/gfx/mw/current/ChangeLog
+++ b/packages/services/gfx/mw/current/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-01  Chris Garry <cgarry@sweeneydesign.co.uk>
+
+    * src/ecos/ecos_app.c:
+    * src/ecos/ecos_init.c:
+    Do not use ARM display hardware setup routines when VNC server
+    drivers are used.
+
 2003-09-01  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/nanox/client.c: 
diff --git a/packages/services/gfx/mw/current/src/ecos/ecos_app.c b/packages/services/gfx/mw/current/src/ecos/ecos_app.c
--- a/packages/services/gfx/mw/current/src/ecos/ecos_app.c
+++ b/packages/services/gfx/mw/current/src/ecos/ecos_app.c
@@ -24,6 +24,7 @@
 #define USE_JFFS2
 #undef  USE_ROMDISK
 #endif
+#include <pkgconf/microwindows.h>
 
 #ifndef CYGFUN_KERNEL_API_C
 # error Kernel API must be enabled to build this application
@@ -103,7 +104,7 @@ startup(CYG_ADDRESS data)
         int res;
 
         printf("Mount ROM file system\n");
-#ifdef CYGPKG_HAL_ARM_SA11X0_IPAQ
+#if (defined CYGPKG_HAL_ARM_SA11X0_IPAQ) && (!defined CYGBLD_MICROWINDOWS_VNC_DRIVERS)
         // Work around hardware anomaly which causes major screen flicker
         {
             char *hold_rom_fs;
diff --git a/packages/services/gfx/mw/current/src/ecos/ecos_init.c b/packages/services/gfx/mw/current/src/ecos/ecos_init.c
--- a/packages/services/gfx/mw/current/src/ecos/ecos_init.c
+++ b/packages/services/gfx/mw/current/src/ecos/ecos_init.c
@@ -5,6 +5,7 @@
 #include <pkgconf/system.h>
 #include <pkgconf/kernel.h>
 #include <pkgconf/hal.h>
+#include <pkgconf/microwindows.h>
 #include <cyg/kernel/kapi.h>
 #include <cyg/infra/diag.h>
 
@@ -126,7 +127,7 @@ ecos_nx_init(CYG_ADDRWORD data)
         exit(1);
     }
 
-#ifdef CYGPKG_HAL_ARM_SA11X0_IPAQ
+#if (defined CYGPKG_HAL_ARM_SA11X0_IPAQ) && (!defined CYGBLD_MICROWINDOWS_VNC_DRIVERS)
     GrSetPortraitMode(MWPORTRAIT_RIGHT);
 #endif
     
@@ -157,7 +158,7 @@ ecos_nx_init(CYG_ADDRWORD data)
     }
 #endif
 
-#ifdef CYGPKG_HAL_ARM
+#if (defined CYGPKG_HAL_ARM) && (!defined CYGBLD_MICROWINDOWS_VNC_DRIVERS)
     // Touch sensitive screen calibration, only relevant on some
     // platforms.
     GrSetGCFont(gct, GrCreateFont(GR_FONT_GUI_VAR, 0, NULL));