diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-02-17 23:20:59 -0800 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-02-17 23:20:59 -0800 |
commit | a178b91c4f609479f02635594ad2032b357dd7d7 (patch) | |
tree | 441303789039af288ec1b333386d79c63905c273 /drivers/gdisp/TestStub | |
parent | 1985906bea97a015d6e035ebb3f91b6e4f94aff1 (diff) | |
parent | d41120ee2dc37f7feee7dde40abbb4dae430f7d3 (diff) | |
download | uGFX-a178b91c4f609479f02635594ad2032b357dd7d7.tar.gz uGFX-a178b91c4f609479f02635594ad2032b357dd7d7.tar.bz2 uGFX-a178b91c4f609479f02635594ad2032b357dd7d7.zip |
Merge pull request #16 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'drivers/gdisp/TestStub')
-rw-r--r-- | drivers/gdisp/TestStub/gdisp_lld.c | 8 | ||||
-rw-r--r-- | drivers/gdisp/TestStub/gdisp_lld_config.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c index 83049aa2..be323912 100644 --- a/drivers/gdisp/TestStub/gdisp_lld.c +++ b/drivers/gdisp/TestStub/gdisp_lld.c @@ -53,7 +53,7 @@ *
* @notapi
*/
-bool_t GDISP_LLD(init)(void) {
+bool_t lld_gdisp_init(void) {
/* Initialise the GDISP structure */
GDISP.Width = GDISP_SCREEN_WIDTH;
GDISP.Height = GDISP_SCREEN_HEIGHT;
@@ -79,7 +79,7 @@ bool_t GDISP_LLD(init)(void) { *
* @notapi
*/
-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {
(void)x;
(void)y;
(void)color;
@@ -97,7 +97,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { *
* @notapi
*/
- color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {
+ color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {
(void)x;
(void)y;
@@ -119,7 +119,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { *
* @notapi
*/
- void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
+ void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
(void)x;
(void)y;
(void)cx;
diff --git a/drivers/gdisp/TestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h index 18c2de59..8ae82ff4 100644 --- a/drivers/gdisp/TestStub/gdisp_lld_config.h +++ b/drivers/gdisp/TestStub/gdisp_lld_config.h @@ -36,7 +36,6 @@ /*===========================================================================*/
#define GDISP_DRIVER_NAME "TestStub"
-#define GDISP_LLD(x) gdisp_lld_##x##_TestStub
#define GDISP_HARDWARE_SCROLL GDISP_NEED_SCROLL
#define GDISP_HARDWARE_PIXELREAD GDISP_NEED_PIXELREAD
|