aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gdisp/QImage
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gdisp/QImage')
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_driver.c6
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_qimage.cpp6
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_qimage.h3
3 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gdisp/QImage/gdisp_lld_driver.c b/drivers/gdisp/QImage/gdisp_lld_driver.c
index dbd7c279..a93d1761 100644
--- a/drivers/gdisp/QImage/gdisp_lld_driver.c
+++ b/drivers/gdisp/QImage/gdisp_lld_driver.c
@@ -27,13 +27,13 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g)
+LLDSPEC gBool gdisp_lld_init(GDisplay *g)
{
/* No board interface and no private driver area */
g->priv = g->board = 0;
if (!qimage_init(g, GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT)) {
- return FALSE;
+ return gFalse;
}
/* Initialise the GDISP structure */
@@ -44,7 +44,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g)
g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
g->g.Contrast = GDISP_INITIAL_CONTRAST;
- return TRUE;
+ return gTrue;
}
#if GDISP_HARDWARE_DRAWPIXEL
diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp
index a133dfb4..ba7cf44d 100644
--- a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp
+++ b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp
@@ -3,17 +3,17 @@
#include "../../../src/gdisp/gdisp_driver.h"
#include "gdisp_lld_qimage.h"
-bool_t qimage_init(GDisplay* g, coord_t width, coord_t height)
+gBool qimage_init(GDisplay* g, coord_t width, coord_t height)
{
QImage* qimage = new QImage(width, height, QImage::Format_RGB888);
if (!qimage) {
- return FALSE;
+ return gFalse;
}
qimage->fill(Qt::gray);
g->priv = qimage;
- return TRUE;
+ return gTrue;
}
void qimage_setPixel(GDisplay* g)
diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.h b/drivers/gdisp/QImage/gdisp_lld_qimage.h
index 9e855f08..512fdf53 100644
--- a/drivers/gdisp/QImage/gdisp_lld_qimage.h
+++ b/drivers/gdisp/QImage/gdisp_lld_qimage.h
@@ -2,11 +2,12 @@
#include "../../../gfx.h"
+/* This test is needed as this file is also included in the .cpp file providing the below functions */
#ifdef __cplusplus
extern "C" {
#endif
-bool_t qimage_init(GDisplay* g, coord_t width, coord_t height);
+gBool qimage_init(GDisplay* g, coord_t width, coord_t height);
void qimage_setPixel(GDisplay* g);
color_t qimage_getPixel(GDisplay* g);