Mercurial > ecos
changeset 1191:66e039e7871e
Avoid iPAQ setups when using VNC
| author | gthomas |
|---|---|
| date | Tue, 02 Sep 2003 11:24:17 +0000 |
| parents | d53522870fc0 |
| children | 797d8336bd8a |
| files | packages/services/gfx/mw/current/ChangeLog packages/services/gfx/mw/current/src/ecos/ecos_app.c packages/services/gfx/mw/current/src/ecos/ecos_init.c |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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;
--- 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));