Merge pull request #16 from Tectu/master

Merge Tectu Changes

1 files changed, 19 insertions, 19 deletions

diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h
index da6d859f..b2e6df53 100644
--- a/include/gdisp/gdisp.h
+++ b/include/gdisp/gdisp.h
@@ -201,26 +201,26 @@ extern "C" {
 #else

 

 	/* The same as above but use the low level driver directly if no multi-thread support is needed */

-	#define gdispInit(gdisp)									GDISP_LLD(init)()

+	#define gdispInit(gdisp)									lld_gdisp_init()

 	#define gdispIsBusy()										FALSE

-	#define gdispClear(color)									GDISP_LLD(clear)(color)

-	#define gdispDrawPixel(x, y, color)							GDISP_LLD(drawpixel)(x, y, color)

-	#define gdispDrawLine(x0, y0, x1, y1, color)				GDISP_LLD(drawline)(x0, y0, x1, y1, color)

-	#define gdispFillArea(x, y, cx, cy, color)					GDISP_LLD(fillarea)(x, y, cx, cy, color)

-	#define gdispBlitAreaEx(x, y, cx, cy, sx, sy, scx, buf)		GDISP_LLD(blitareaex)(x, y, cx, cy, sx, sy, scx, buf)

-	#define gdispSetClip(x, y, cx, cy)							GDISP_LLD(setclip)(x, y, cx, cy)

-	#define gdispDrawCircle(x, y, radius, color)				GDISP_LLD(drawcircle)(x, y, radius, color)

-	#define gdispFillCircle(x, y, radius, color)				GDISP_LLD(fillcircle)(x, y, radius, color)

-	#define gdispDrawArc(x, y, radius, sangle, eangle, color)	GDISP_LLD(drawarc)(x, y, radius, sangle, eangle, color)

-	#define gdispFillArc(x, y, radius, sangle, eangle, color)	GDISP_LLD(fillarc)(x, y, radius, sangle, eangle, color)

-	#define gdispDrawEllipse(x, y, a, b, color)					GDISP_LLD(drawellipse)(x, y, a, b, color)

-	#define gdispFillEllipse(x, y, a, b, color)					GDISP_LLD(fillellipse)(x, y, a, b, color)

-	#define gdispDrawChar(x, y, c, font, color)					GDISP_LLD(drawchar)(x, y, c, font, color)

-	#define gdispFillChar(x, y, c, font, color, bgcolor)		GDISP_LLD(fillchar)(x, y, c, font, color, bgcolor)

-	#define gdispGetPixelColor(x, y)							GDISP_LLD(getpixelcolor)(x, y)

-	#define gdispVerticalScroll(x, y, cx, cy, lines, bgcolor)	GDISP_LLD(verticalscroll)(x, y, cx, cy, lines, bgcolor)

-	#define gdispControl(what, value)							GDISP_LLD(control)(what, value)

-	#define gdispQuery(what)									GDISP_LLD(query)(what)

+	#define gdispClear(color)									lld_gdisp_clear(color)

+	#define gdispDrawPixel(x, y, color)							lld_gdisp_draw_pixel(x, y, color)

+	#define gdispDrawLine(x0, y0, x1, y1, color)				lld_gdisp_draw_line(x0, y0, x1, y1, color)

+	#define gdispFillArea(x, y, cx, cy, color)					lld_gdisp_fill_area(x, y, cx, cy, color)

+	#define gdispBlitAreaEx(x, y, cx, cy, sx, sy, scx, buf)		lld_gdisp_blit_area_ex(x, y, cx, cy, sx, sy, scx, buf)

+	#define gdispSetClip(x, y, cx, cy)							lld_gdisp_set_clip(x, y, cx, cy)

+	#define gdispDrawCircle(x, y, radius, color)				lld_gdisp_draw_circle(x, y, radius, color)

+	#define gdispFillCircle(x, y, radius, color)				lld_gdisp_fill_circle(x, y, radius, color)

+	#define gdispDrawArc(x, y, radius, sangle, eangle, color)	lld_gdisp_draw_arc(x, y, radius, sangle, eangle, color)

+	#define gdispFillArc(x, y, radius, sangle, eangle, color)	lld_gdisp_fill_arc(x, y, radius, sangle, eangle, color)

+	#define gdispDrawEllipse(x, y, a, b, color)					lld_gdisp_draw_ellipse(x, y, a, b, color)

+	#define gdispFillEllipse(x, y, a, b, color)					lld_gdisp_fill_ellipse(x, y, a, b, color)

+	#define gdispDrawChar(x, y, c, font, color)					lld_gdisp_draw_char(x, y, c, font, color)

+	#define gdispFillChar(x, y, c, font, color, bgcolor)		lld_gdisp_fill_char(x, y, c, font, color, bgcolor)

+	#define gdispGetPixelColor(x, y)							lld_gdisp_get_pixel_color(x, y)

+	#define gdispVerticalScroll(x, y, cx, cy, lines, bgcolor)	lld_gdisp_vertical_scroll(x, y, cx, cy, lines, bgcolor)

+	#define gdispControl(what, value)							lld_gdisp_control(what, value)

+	#define gdispQuery(what)									lld_gdisp_query(what)

 

 #endif