diff --git a/console.c b/console.c index c206ef5f..acfae978 100644 --- a/console.c +++ b/console.c @@ -23,6 +23,7 @@ static size_t reads(void *ip, uint8_t *bp, size_t n) { (void)ip; (void)bp; (void)n; + return 0; } @@ -32,23 +33,28 @@ static msg_t put(void *ip, uint8_t b) { static msg_t get(void *ip) { (void)ip; + return RDY_OK; } static msg_t putt(void *ip, uint8_t b, systime_t timeout) { (void)timeout; + /* TODO: handle timeout */ + return lcdConsolePut((GLCDConsole *)ip, (char)b); } static msg_t gett(void *ip, systime_t timeout) { (void)ip; (void)timeout; + return RDY_OK; } static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) { (void)time; + return lcdConsoleWrite((GLCDConsole *)ip, bp, n); } @@ -57,22 +63,22 @@ static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) { (void)bp; (void)n; (void)time; + return 0; } static chnflags_t getflags(void *ip) { - _chn_get_and_clear_flags_impl(ip); + _chn_get_and_clear_flags_impl(ip); } static const struct GLCDConsoleVMT vmt = { - writes, reads, put, get, - putt, gett, writet, readt, - getflags + writes, reads, put, get, + putt, gett, writet, readt, + getflags }; -msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, - font_t font, uint16_t bkcolor, uint16_t color) { +msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, font_t font, uint16_t bkcolor, uint16_t color) { const uint8_t* ptr; uint16_t chi; uint16_t x,y; diff --git a/console.h b/console.h index fcdef293..890be94d 100644 --- a/console.h +++ b/console.h @@ -12,7 +12,7 @@ typedef struct GLCDConsole GLCDConsole; * @brief @p GLCDConsole specific methods. */ #define _glcd_driver_methods \ - _base_asynchronous_channel_methods + _base_asynchronous_channel_methods /** * @extends BaseAsynchronousChannelVMT @@ -20,7 +20,7 @@ typedef struct GLCDConsole GLCDConsole; * @brief @p GLCDConsole virtual methods table. */ struct GLCDConsoleVMT { - _glcd_driver_methods + _glcd_driver_methods }; /** @@ -31,31 +31,29 @@ struct GLCDConsoleVMT { * I/O queues. */ struct GLCDConsole { - /** @brief Virtual Methods Table.*/ - const struct GLCDConsoleVMT *vmt; - _base_asynchronous_channel_data - /* WARNING: Do not add any data to this struct above this comment, only below */ - /* font */ - font_t font; - /* lcd area to use */ - uint16_t x0,y0; - /* current cursor position, in pixels */ - uint16_t cx,cy; - /* console size in pixels */ - uint16_t sx,sy; - /* foreground and background colour */ - uint16_t bkcolor, color; - /* font size in pixels */ - uint8_t fy; + /** @brief Virtual Methods Table.*/ + const struct GLCDConsoleVMT *vmt; + _base_asynchronous_channel_data + /* WARNING: Do not add any data to this struct above this comment, only below */ + /* font */ + font_t font; + /* lcd area to use */ + uint16_t x0,y0; + /* current cursor position, in pixels */ + uint16_t cx,cy; + /* console size in pixels */ + uint16_t sx,sy; + /* foreground and background colour */ + uint16_t bkcolor, color; + /* font size in pixels */ + uint8_t fy; }; #ifdef __cplusplus extern "C" { #endif -msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, - font_t font, uint16_t bkcolor, uint16_t color); - +msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height font_t font, uint16_t bkcolor, uint16_t color); msg_t lcdConsolePut(GLCDConsole *console, char c); msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n);