uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

GConsole -> GConsole_t

ugfx_release_2.6
Joel Bodenmann 2012-10-11 09:27:02 +02:00
parent 4a27e7c799
commit 069b0d32d8
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/console.h
View File

@ -34,15 +34,14 @@
/** /**
* @brief Structure representing a GConsole driver. * @brief Structure representing a GConsole driver.
*/ */
typedef struct GConsole GConsole;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color); msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color);
msg_t lcdConsolePut(GConsole *console, char c); msg_t lcdConsolePut(GConsole_t *console, char c);
msg_t lcdConsoleWrite(GConsole *console, const uint8_t *bp, size_t n); msg_t lcdConsoleWrite(GConsole_t *console, const uint8_t *bp, size_t n);
#ifdef __cplusplus #ifdef __cplusplus
} }

11
src/console.c
View File

@ -41,7 +41,7 @@ struct GConsoleVMT {
* @details This class extends @p BaseAsynchronousChannel by adding physical * @details This class extends @p BaseAsynchronousChannel by adding physical
* I/O queues. * I/O queues.
*/ */
struct GConsole { typedef struct _GConsole_t {
/** @brief Virtual Methods Table.*/ /** @brief Virtual Methods Table.*/
const struct GConsoleVMT *vmt; const struct GConsoleVMT *vmt;
_base_asynchronous_channel_data _base_asynchronous_channel_data
@ -60,7 +60,7 @@ struct GConsole {
uint8_t fy; uint8_t fy;
/* font inter-character padding in pixels */ /* font inter-character padding in pixels */
uint8_t fp; uint8_t fp;
}; } GConsole_t;
/* /*
* Interface implementation. The interface is write only * Interface implementation. The interface is write only
@ -130,7 +130,7 @@ static const struct GConsoleVMT vmt = {
}; };
msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) { msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) {
console->vmt = &vmt; console->vmt = &vmt;
/* read font, get height & padding */ /* read font, get height & padding */
console->fy = gdispGetFontMetric(font, fontHeight); console->fy = gdispGetFontMetric(font, fontHeight);
@ -154,7 +154,7 @@ msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, c
return RDY_OK; return RDY_OK;
} }
msg_t lcdConsolePut(GLCDConsole *console, char c) { msg_t lcdConsolePut(GLCDConsole_t *console, char c) {
uint8_t width; uint8_t width;
if(c == '\n') { if(c == '\n') {
@ -208,7 +208,7 @@ msg_t lcdConsolePut(GLCDConsole *console, char c) {
return RDY_OK; return RDY_OK;
} }
msg_t lcdConsoleWrite(GLCDConsole *console, const uint8_t *bp, size_t n) { msg_t lcdConsoleWrite(GLCDConsole_t *console, const uint8_t *bp, size_t n) {
size_t i; size_t i;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
lcdConsolePut(console, bp[i]); lcdConsolePut(console, bp[i]);
@ -217,3 +217,4 @@ msg_t lcdConsoleWrite(GLCDConsole *console, const uint8_t *bp, size_t n) {
} }
#endif /* GDISP_NEED_CONSOLE */ #endif /* GDISP_NEED_CONSOLE */

1
src/gdisp.c
View File

@ -1122,3 +1122,4 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
#endif /* _GDISP_C */ #endif /* _GDISP_C */
/** @} */ /** @} */