From 15a09de6592ec8548057f640eb16c452ac9fa296 Mon Sep 17 00:00:00 2001 From: inmarket Date: Wed, 18 Sep 2013 23:38:26 +1000 Subject: Update demos so OS can be specified in the Makefile --- demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h | 8 ++++---- demos/modules/gdisp/gdisp_images/gfxconf.h | 6 +++--- demos/modules/gdisp/gdisp_images_animated/gfxconf.h | 6 +++--- demos/modules/gdisp/gdisp_text/main.c | 3 +-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h index 997e57dd..a282a5f8 100644 --- a/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h +++ b/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h @@ -15,10 +15,10 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS FALSE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_LINUX FALSE -#define GFX_USE_OS_OSX FALSE +//#define GFX_USE_OS_CHIBIOS FALSE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_LINUX FALSE +//#define GFX_USE_OS_OSX FALSE /* GFX subsystems to turn on */ #define GFX_USE_GDISP TRUE diff --git a/demos/modules/gdisp/gdisp_images/gfxconf.h b/demos/modules/gdisp/gdisp_images/gfxconf.h index 74fffa61..9e37988c 100644 --- a/demos/modules/gdisp/gdisp_images/gfxconf.h +++ b/demos/modules/gdisp/gdisp_images/gfxconf.h @@ -31,9 +31,9 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS TRUE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_POSIX FALSE +//#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_POSIX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE diff --git a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h index eded2fc4..ab91a9e7 100644 --- a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h +++ b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h @@ -31,9 +31,9 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS TRUE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_POSIX FALSE +//#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_POSIX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE diff --git a/demos/modules/gdisp/gdisp_text/main.c b/demos/modules/gdisp/gdisp_text/main.c index dee741fa..7ea3405e 100644 --- a/demos/modules/gdisp/gdisp_text/main.c +++ b/demos/modules/gdisp/gdisp_text/main.c @@ -30,7 +30,7 @@ #include "gfx.h" int main(void) { - coord_t width, height; + coord_t width; font_t font1, font2, font3, font4; const char *msg; @@ -39,7 +39,6 @@ int main(void) { // Get the screen size width = gdispGetWidth(); - height = gdispGetHeight(); // Get the fonts we want to use font1 = gdispOpenFont("UI2"); -- cgit v1.2.3 ue='search'/>

path: root/target/linux/brcm63xx/patches-3.18/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch

blob: 740fb2dafc4ece9e0c88630a1ad2b800f763ed59 (plain)