aboutsummaryrefslogtreecommitdiffstats
path: root/halext/include
diff options
context:
space:
mode:
authorThomas Saunders <trsaunders@gmail.com>2012-08-07 17:04:57 +0100
committerThomas Saunders <trsaunders@gmail.com>2012-08-07 17:04:57 +0100
commitb87fc583d47a81328385da6392eb79abd0642b07 (patch)
tree3993e952486e4acee5c6c5467353b48836989614 /halext/include
parentfc2a9900d1cf3c02c6e11accfcd8bd378e57a812 (diff)
downloaduGFX-b87fc583d47a81328385da6392eb79abd0642b07.tar.gz
uGFX-b87fc583d47a81328385da6392eb79abd0642b07.tar.bz2
uGFX-b87fc583d47a81328385da6392eb79abd0642b07.zip
fix grammar, vertical scroll, missing function definition
Diffstat (limited to 'halext/include')
-rw-r--r--halext/include/gdisp.h3
-rw-r--r--halext/include/gdisp_fonts.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/halext/include/gdisp.h b/halext/include/gdisp.h
index 454f5c4c..ddb12137 100644
--- a/halext/include/gdisp.h
+++ b/halext/include/gdisp.h
@@ -218,6 +218,7 @@ extern "C" {
#if GDISP_NEED_TEXT
void gdispDrawChar(coord_t x, coord_t y, char c, font_t font, color_t color);
void gdispFillChar(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor);
+ void gdispDrawString(coord_t x, coord_t y, const char *str, font_t font, color_t color);
#endif
/* Read a pixel Function */
@@ -232,7 +233,7 @@ extern "C" {
/* Set driver specific control */
#if GDISP_NEED_CONTROL
- void gdispControl(unsigned what, void *value);
+ void gdispControl(int what, void *value);
#endif
#else
diff --git a/halext/include/gdisp_fonts.h b/halext/include/gdisp_fonts.h
index a271030e..a1a4c3cb 100644
--- a/halext/include/gdisp_fonts.h
+++ b/halext/include/gdisp_fonts.h
@@ -80,7 +80,7 @@ struct font {
};
/**
- * @brief Macro's to get to the complex parts of the font structure.
+ * @brief Macros to get to the complex parts of the font structure.
*/
#define _getCharWidth(f,c) (((c) < (f)->minChar || (c) > (f)->maxChar) ? 0 : (f)->widthTable[(c) - (f)->minChar])
#define _getCharOffset(f,c) ((f)->offsetTable[(c) - (f)->minChar])