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/multiple/Win32 | |
| 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/multiple/Win32')
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld.c | 16 | ||||
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld_config.h | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/multiple/Win32/gdisp_lld.c b/drivers/multiple/Win32/gdisp_lld.c index d44bbfad..8a46abc9 100644 --- a/drivers/multiple/Win32/gdisp_lld.c +++ b/drivers/multiple/Win32/gdisp_lld.c @@ -314,7 +314,7 @@ static DWORD WINAPI WindowThread(LPVOID lpParameter) { *
* @notapi
*/
-bool_t GDISP_LLD(init)(void) {
+bool_t lld_gdisp_init(void) {
RECT rect;
/* Set the window dimensions */
@@ -356,7 +356,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) {
HDC dc;
#if WIN32_USE_MSG_REDRAW
RECT rect;
@@ -422,7 +422,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { *
* @notapi
*/
- void GDISP_LLD(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color) {
+ void lld_gdisp_draw_line(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color) {
POINT p;
HPEN pen;
HDC dc;
@@ -550,7 +550,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { *
* @notapi
*/
- void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
+ void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
HDC dc;
RECT rect;
HBRUSH hbr;
@@ -681,7 +681,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { *
* @notapi
*/
- void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {
+ void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {
BITMAPV4HEADER bmpInfo;
RECT rect;
#if GDISP_NEED_CONTROL
@@ -788,7 +788,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) {
color_t color;
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
@@ -834,7 +834,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) {
RECT rect, frect, srect;
HBRUSH hbr;
@@ -958,7 +958,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { *
* @notapi
*/
- void GDISP_LLD(control)(unsigned what, void *value) {
+ void lld_gdisp_control(unsigned what, void *value) {
switch(what) {
case GDISP_CONTROL_ORIENTATION:
if (GDISP.Orientation == (gdisp_orientation_t)value)
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h index bebd76b9..f62b0fdb 100644 --- a/drivers/multiple/Win32/gdisp_lld_config.h +++ b/drivers/multiple/Win32/gdisp_lld_config.h @@ -36,7 +36,6 @@ /*===========================================================================*/
#define GDISP_DRIVER_NAME "Win32"
-#define GDISP_LLD(x) gdisp_lld_##x##_Win32
#define GDISP_HARDWARE_LINES TRUE
#define GDISP_HARDWARE_FILLS TRUE
|