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

whitespaces

ugfx_release_2.6
Tectu 2012-06-28 11:15:10 +02:00
parent 599af99046
commit 02f58e279f
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
console.c
View File

@ -23,6 +23,7 @@ static size_t reads(void *ip, uint8_t *bp, size_t n) {
(void)ip; (void)ip;
(void)bp; (void)bp;
(void)n; (void)n;
return 0; return 0;
} }
@ -32,23 +33,28 @@ static msg_t put(void *ip, uint8_t b) {
static msg_t get(void *ip) { static msg_t get(void *ip) {
(void)ip; (void)ip;
return RDY_OK; return RDY_OK;
} }
static msg_t putt(void *ip, uint8_t b, systime_t timeout) { static msg_t putt(void *ip, uint8_t b, systime_t timeout) {
(void)timeout; (void)timeout;
/* TODO: handle timeout */ /* TODO: handle timeout */
return lcdConsolePut((GLCDConsole *)ip, (char)b); return lcdConsolePut((GLCDConsole *)ip, (char)b);
} }
static msg_t gett(void *ip, systime_t timeout) { static msg_t gett(void *ip, systime_t timeout) {
(void)ip; (void)ip;
(void)timeout; (void)timeout;
return RDY_OK; return RDY_OK;
} }
static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) { static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) {
(void)time; (void)time;
return lcdConsoleWrite((GLCDConsole *)ip, bp, n); 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)bp;
(void)n; (void)n;
(void)time; (void)time;
return 0; return 0;
} }
static chnflags_t getflags(void *ip) { 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 = { static const struct GLCDConsoleVMT vmt = {
writes, reads, put, get, writes, reads, put, get,
putt, gett, writet, readt, putt, gett, writet, readt,
getflags getflags
}; };
msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, 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) {
font_t font, uint16_t bkcolor, uint16_t color) {
const uint8_t* ptr; const uint8_t* ptr;
uint16_t chi; uint16_t chi;
uint16_t x,y; uint16_t x,y;

40
console.h
View File

@ -12,7 +12,7 @@ typedef struct GLCDConsole GLCDConsole;
* @brief @p GLCDConsole specific methods. * @brief @p GLCDConsole specific methods.
*/ */
#define _glcd_driver_methods \ #define _glcd_driver_methods \
_base_asynchronous_channel_methods _base_asynchronous_channel_methods
/** /**
* @extends BaseAsynchronousChannelVMT * @extends BaseAsynchronousChannelVMT
@ -20,7 +20,7 @@ typedef struct GLCDConsole GLCDConsole;
* @brief @p GLCDConsole virtual methods table. * @brief @p GLCDConsole virtual methods table.
*/ */
struct GLCDConsoleVMT { struct GLCDConsoleVMT {
_glcd_driver_methods _glcd_driver_methods
}; };
/** /**
@ -31,31 +31,29 @@ struct GLCDConsoleVMT {
* I/O queues. * I/O queues.
*/ */
struct GLCDConsole { struct GLCDConsole {
/** @brief Virtual Methods Table.*/ /** @brief Virtual Methods Table.*/
const struct GLCDConsoleVMT *vmt; const struct GLCDConsoleVMT *vmt;
_base_asynchronous_channel_data _base_asynchronous_channel_data
/* WARNING: Do not add any data to this struct above this comment, only below */ /* WARNING: Do not add any data to this struct above this comment, only below */
/* font */ /* font */
font_t font; font_t font;
/* lcd area to use */ /* lcd area to use */
uint16_t x0,y0; uint16_t x0,y0;
/* current cursor position, in pixels */ /* current cursor position, in pixels */
uint16_t cx,cy; uint16_t cx,cy;
/* console size in pixels */ /* console size in pixels */
uint16_t sx,sy; uint16_t sx,sy;
/* foreground and background colour */ /* foreground and background colour */
uint16_t bkcolor, color; uint16_t bkcolor, color;
/* font size in pixels */ /* font size in pixels */
uint8_t fy; uint8_t fy;
}; };
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, 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);
font_t font, uint16_t bkcolor, uint16_t color);
msg_t lcdConsolePut(GLCDConsole *console, char c); msg_t lcdConsolePut(GLCDConsole *console, char c);
msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n); msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n);