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

remove result from GLCD message struct and use chMsgRelease to pass result instead

remotes/origin_old/ugfx_release_2.6
trsaunders 2012-07-24 17:17:32 +01:00
parent c30550779b
commit 4ba0eb23a7
3 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
glcd/glcd.c
View File

@ -18,35 +18,35 @@ static msg_t ThreadGLCDWorker(void *arg) {
/* Wait for msg with work to do. */ /* Wait for msg with work to do. */
p = chMsgWait(); p = chMsgWait();
struct glcd_msg_base *msg = (struct glcd_msg_base*)chMsgGet(p); struct glcd_msg_base *msg = (struct glcd_msg_base*)chMsgGet(p);
msg->result = GLCD_PROGRESS; glcd_result_t result = GLCD_PROGRESS;
/* do work here */ /* do work here */
switch(msg->action) { switch(msg->action) {
case GLCD_SET_POWERMODE: { case GLCD_SET_POWERMODE: {
EMSG(glcd_msg_powermode); EMSG(glcd_msg_powermode);
lld_lcdSetPowerMode(emsg->powermode); lld_lcdSetPowerMode(emsg->powermode);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_SET_ORIENTATION: { case GLCD_SET_ORIENTATION: {
EMSG(glcd_msg_orientation); EMSG(glcd_msg_orientation);
lld_lcdSetOrientation(emsg->newOrientation); lld_lcdSetOrientation(emsg->newOrientation);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_SET_WINDOW: { case GLCD_SET_WINDOW: {
EMSG(glcd_msg_set_window); EMSG(glcd_msg_set_window);
lld_lcdSetWindow(emsg->x0, emsg->y0, emsg->x1, emsg->y1); lld_lcdSetWindow(emsg->x0, emsg->y0, emsg->x1, emsg->y1);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_FILL_AREA: { case GLCD_FILL_AREA: {
EMSG(glcd_msg_fill_area); EMSG(glcd_msg_fill_area);
lld_lcdFillArea(emsg->x0, emsg->y0, emsg->x1, emsg->y1, emsg->color); lld_lcdFillArea(emsg->x0, emsg->y0, emsg->x1, emsg->y1, emsg->color);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
@ -56,60 +56,60 @@ static msg_t ThreadGLCDWorker(void *arg) {
lld_lcdWriteStreamStart(); lld_lcdWriteStreamStart();
lld_lcdWriteStream(emsg->buffer, emsg->size); lld_lcdWriteStream(emsg->buffer, emsg->size);
lld_lcdWriteStreamStop(); lld_lcdWriteStreamStop();
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_CLEAR: { case GLCD_CLEAR: {
EMSG(glcd_msg_clear); EMSG(glcd_msg_clear);
lld_lcdClear(emsg->color); lld_lcdClear(emsg->color);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_GET_PIXEL_COLOR: { case GLCD_GET_PIXEL_COLOR: {
/* ToDo */ /* ToDo */
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_DRAW_PIXEL: { case GLCD_DRAW_PIXEL: {
EMSG(glcd_msg_draw_pixel); EMSG(glcd_msg_draw_pixel);
lld_lcdDrawPixel(emsg->x, emsg->y, emsg->color); lld_lcdDrawPixel(emsg->x, emsg->y, emsg->color);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_WRITE_STREAM_START: { case GLCD_WRITE_STREAM_START: {
lld_lcdWriteStreamStart(); lld_lcdWriteStreamStart();
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_WRITE_STREAM_STOP: { case GLCD_WRITE_STREAM_STOP: {
lld_lcdWriteStreamStop(); lld_lcdWriteStreamStop();
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_WRITE_STREAM: { case GLCD_WRITE_STREAM: {
EMSG(glcd_msg_write_stream); EMSG(glcd_msg_write_stream);
lld_lcdWriteStream(emsg->buffer, emsg->size); lld_lcdWriteStream(emsg->buffer, emsg->size);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
case GLCD_VERTICAL_SCROLL: { case GLCD_VERTICAL_SCROLL: {
EMSG(glcd_msg_vertical_scroll); EMSG(glcd_msg_vertical_scroll);
lld_lcdVerticalScroll(emsg->x0, emsg->y0, emsg->x1, emsg->y1, emsg->lines); lld_lcdVerticalScroll(emsg->x0, emsg->y0, emsg->x1, emsg->y1, emsg->lines);
msg->result = GLCD_DONE; result = GLCD_DONE;
break; break;
} }
} }
/* Done, release msg again. */ /* Done, release msg again. */
chMsgRelease(p, 0); chMsgRelease(p, (msg_t)result);
} }
return 0; return 0;
@ -138,25 +138,25 @@ uint16_t lcdGetOrientation(void) {
return lld_lcdGetOrientation(); return lld_lcdGetOrientation();
} }
void lcdSetPowerMode(uint8_t powerMode) { glcd_result_t lcdSetPowerMode(uint8_t powerMode) {
struct glcd_msg_powermode msg; struct glcd_msg_powermode msg;
msg.action = GLCD_SET_POWERMODE; msg.action = GLCD_SET_POWERMODE;
msg.powermode = powerMode; msg.powermode = powerMode;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdSetOrientation(uint8_t newOrientation) { glcd_result_t lcdSetOrientation(uint8_t newOrientation) {
struct glcd_msg_orientation msg; struct glcd_msg_orientation msg;
msg.action = GLCD_SET_ORIENTATION; msg.action = GLCD_SET_ORIENTATION;
msg.newOrientation = newOrientation; msg.newOrientation = newOrientation;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) { glcd_result_t lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
struct glcd_msg_set_window msg; struct glcd_msg_set_window msg;
msg.action = GLCD_SET_WINDOW; msg.action = GLCD_SET_WINDOW;
@ -165,10 +165,10 @@ void lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
msg.x1 = x1; msg.x1 = x1;
msg.y1 = y1; msg.y1 = y1;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) { glcd_result_t lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {
struct glcd_msg_fill_area msg; struct glcd_msg_fill_area msg;
msg.action = GLCD_FILL_AREA; msg.action = GLCD_FILL_AREA;
@ -178,10 +178,10 @@ void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t co
msg.y1 = y1; msg.y1 = y1;
msg.color = color; msg.color = color;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *buffer, size_t n) { glcd_result_t lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *buffer, size_t n) {
struct glcd_msg_write_area msg; struct glcd_msg_write_area msg;
msg.action = GLCD_WRITE_AREA; msg.action = GLCD_WRITE_AREA;
@ -192,16 +192,16 @@ void lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *
msg.buffer = buffer; msg.buffer = buffer;
msg.size = n; msg.size = n;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdClear(uint16_t color) { glcd_result_t lcdClear(uint16_t color) {
struct glcd_msg_clear msg; struct glcd_msg_clear msg;
msg.action = GLCD_CLEAR; msg.action = GLCD_CLEAR;
msg.color = color; msg.color = color;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
uint16_t lcdGetPixelColor(uint16_t x, uint16_t y) { uint16_t lcdGetPixelColor(uint16_t x, uint16_t y) {
@ -215,12 +215,10 @@ uint16_t lcdGetPixelColor(uint16_t x, uint16_t y) {
chMsgSend(workerThread, (msg_t)&msg); chMsgSend(workerThread, (msg_t)&msg);
while(msg.result != GLCD_DONE);
return result; return result;
} }
void lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color) { glcd_result_t lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color) {
struct glcd_msg_draw_pixel msg; struct glcd_msg_draw_pixel msg;
msg.action = GLCD_DRAW_PIXEL; msg.action = GLCD_DRAW_PIXEL;
@ -228,36 +226,36 @@ void lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color) {
msg.y = y; msg.y = y;
msg.color = color; msg.color = color;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
static void lcdWriteStreamStart(void) { glcd_result_t lcdWriteStreamStart(void) {
struct glcd_msg_write_stream_start msg; struct glcd_msg_write_stream_start msg;
msg.action = GLCD_WRITE_STREAM_START; msg.action = GLCD_WRITE_STREAM_START;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
static void lcdWriteStreamStop(void) { glcd_result_t lcdWriteStreamStop(void) {
struct glcd_msg_write_stream_stop msg; struct glcd_msg_write_stream_stop msg;
msg.action = GLCD_WRITE_STREAM_STOP; msg.action = GLCD_WRITE_STREAM_STOP;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
static void lcdWriteStream(uint16_t *buffer, uint16_t size) { glcd_result_t lcdWriteStream(uint16_t *buffer, uint16_t size) {
struct glcd_msg_write_stream msg; struct glcd_msg_write_stream msg;
msg.action = GLCD_WRITE_STREAM; msg.action = GLCD_WRITE_STREAM;
msg.buffer = buffer; msg.buffer = buffer;
msg.size = size; msg.size = size;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines) { glcd_result_t lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines) {
struct glcd_msg_vertical_scroll msg; struct glcd_msg_vertical_scroll msg;
msg.action = GLCD_VERTICAL_SCROLL; msg.action = GLCD_VERTICAL_SCROLL;
@ -267,7 +265,7 @@ void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint1
msg.y1 = y1; msg.y1 = y1;
msg.lines = lines; msg.lines = lines;
chMsgSend(workerThread, (msg_t)&msg); return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);
} }
void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) { void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {

16
glcd/glcd.h
View File

@ -55,15 +55,15 @@ extern "C" {
/* Core functions */ /* Core functions */
void lcdInit(GLCDDriver *GLCDD1); void lcdInit(GLCDDriver *GLCDD1);
void lcdClear(uint16_t color); glcd_result_t lcdClear(uint16_t color);
void lcdSetOrientation(uint8_t newOrientation); glcd_result_t lcdSetOrientation(uint8_t newOrientation);
void lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1); glcd_result_t lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1);
void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color); glcd_result_t lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
void lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *buffer, size_t n); glcd_result_t lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *buffer, size_t n);
void lcdSetPowerMode(uint8_t powerMode); glcd_result_t lcdSetPowerMode(uint8_t powerMode);
/* Drawing functions */ /* Drawing functions */
void lcdDrawPixel(uint16_t x, uint16_t y, uint16_t point); glcd_result_t lcdDrawPixel(uint16_t x, uint16_t y, uint16_t point);
void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color); void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color); void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color);
void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const char* str, font_t font, uint16_t fontColor, uint16_t bkColor); void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const char* str, font_t font, uint16_t fontColor, uint16_t bkColor);
@ -88,7 +88,7 @@ uint16_t lcdBGR2RGB(uint16_t color);
uint16_t lcdGetPixelColor(uint16_t x, uint16_t y); uint16_t lcdGetPixelColor(uint16_t x, uint16_t y);
/* Scrolling function */ /* Scrolling function */
void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines); glcd_result_t lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines);
#ifdef __cplusplus #ifdef __cplusplus
} }

5
glcd/worker.h
View File

@ -22,9 +22,10 @@ enum glcd_result { GLCD_DONE,
GLCD_PROGRESS, GLCD_PROGRESS,
}; };
typedef enum glcd_result glcd_result_t;
#define _glcd_msg_base \ #define _glcd_msg_base \
enum glcd_action action; \ enum glcd_action action;
enum glcd_result result;
struct glcd_msg_base { struct glcd_msg_base {
_glcd_msg_base _glcd_msg_base