Fix compile error in GDISP

Fix compile error with wrongly named include file
Revert lld_gdisp naming convention to gdisp_lld to fix problem and be
consitant with all other low level drivers.

1 files changed, 133 insertions, 133 deletions

diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c
index be323912..a1f3de3e 100644
--- a/drivers/gdisp/TestStub/gdisp_lld.c
+++ b/drivers/gdisp/TestStub/gdisp_lld.c
@@ -1,133 +1,133 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/TestStub/gdisp_lld.c

- * @brief   GDISP Graphics Driver subsystem low level driver source (stub).

- *

- * @addtogroup GDISP

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-#include "gfx.h"

-

-#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/

-

-/* Include the emulation code for things we don't support */

-#include "gdisp/lld/emulation.c"

-

-#ifndef GDISP_SCREEN_HEIGHT

-	#define GDISP_SCREEN_HEIGHT		128

-#endif

-#ifndef GDISP_SCREEN_WIDTH

-	#define GDISP_SCREEN_WIDTH		128

-#endif

-

-/* ---- Required Routines ---- */

-/*

-	The following 2 routines are required.

-	All other routines are optional.

-*/

-

-/**

- * @brief   Low level GDISP driver initialization.

- *

- * @notapi

- */

-bool_t lld_gdisp_init(void) {

-	/* Initialise the GDISP structure */

-	GDISP.Width = GDISP_SCREEN_WIDTH;

-	GDISP.Height = GDISP_SCREEN_HEIGHT;

-	GDISP.Orientation = GDISP_ROTATE_0;

-	GDISP.Powermode = powerOff;

-	GDISP.Backlight = 100;

-	GDISP.Contrast = 50;

-	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

-		GDISP.clipx0 = 0;

-		GDISP.clipy0 = 0;

-		GDISP.clipx1 = GDISP.Width;

-		GDISP.clipy1 = GDISP.Height;

-	#endif

-	return TRUE;

-}

-

-/**

- * @brief   Draws a pixel on the display.

- *

- * @param[in] x        X location of the pixel

- * @param[in] y        Y location of the pixel

- * @param[in] color    The color of the pixel

- *

- * @notapi

- */

-void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

-	(void)x;

-	(void)y;

-	(void)color;

-}

-

-/* ---- Optional Routines ---- */

-

-#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Get the color of a particular pixel.

-	 * @note    Optional.

-	 * @note    If x,y is off the screen, the result is undefined.

-	 *

-	 * @param[in] x, y     The start of the text

-	 *

-	 * @notapi

-	 */

-	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

-		(void)x;

-		(void)y;

-

-		return 0;

-	}

-#endif

-

-#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Scroll vertically a section of the screen.

-	 * @note    Optional.

-	 * @note    If x,y + cx,cy is off the screen, the result is undefined.

-	 * @note    If lines is >= cy, it is equivelent to a area fill with bgcolor.

-	 *

-	 * @param[in] x, y     The start of the area to be scrolled

-	 * @param[in] cx, cy   The size of the area to be scrolled

-	 * @param[in] lines    The number of lines to scroll (Can be positive or negative)

-	 * @param[in] bgcolor  The color to fill the newly exposed area.

-	 *

-	 * @notapi

-	 */

-	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;

-		(void)cy;

-		(void)lines;

-		(void)bgcolor;

-	}

-#endif

-

-#endif /* GFX_USE_GDISP */

-/** @} */

+/*
+    ChibiOS/GFX - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file    drivers/gdisp/TestStub/gdisp_lld.c
+ * @brief   GDISP Graphics Driver subsystem low level driver source (stub).
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#include "ch.h"
+#include "hal.h"
+#include "gfx.h"
+
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
+
+/* Include the emulation code for things we don't support */
+#include "gdisp/lld/emulation.c"
+
+#ifndef GDISP_SCREEN_HEIGHT
+	#define GDISP_SCREEN_HEIGHT		128
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+	#define GDISP_SCREEN_WIDTH		128
+#endif
+
+/* ---- Required Routines ---- */
+/*
+	The following 2 routines are required.
+	All other routines are optional.
+*/
+
+/**
+ * @brief   Low level GDISP driver initialization.
+ *
+ * @notapi
+ */
+bool_t gdisp_lld_init(void) {
+	/* Initialise the GDISP structure */
+	GDISP.Width = GDISP_SCREEN_WIDTH;
+	GDISP.Height = GDISP_SCREEN_HEIGHT;
+	GDISP.Orientation = GDISP_ROTATE_0;
+	GDISP.Powermode = powerOff;
+	GDISP.Backlight = 100;
+	GDISP.Contrast = 50;
+	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
+		GDISP.clipx0 = 0;
+		GDISP.clipy0 = 0;
+		GDISP.clipx1 = GDISP.Width;
+		GDISP.clipy1 = GDISP.Height;
+	#endif
+	return TRUE;
+}
+
+/**
+ * @brief   Draws a pixel on the display.
+ *
+ * @param[in] x        X location of the pixel
+ * @param[in] y        Y location of the pixel
+ * @param[in] color    The color of the pixel
+ *
+ * @notapi
+ */
+void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
+	(void)x;
+	(void)y;
+	(void)color;
+}
+
+/* ---- Optional Routines ---- */
+
+#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)
+	/**
+	 * @brief   Get the color of a particular pixel.
+	 * @note    Optional.
+	 * @note    If x,y is off the screen, the result is undefined.
+	 *
+	 * @param[in] x, y     The start of the text
+	 *
+	 * @notapi
+	 */
+	color_t gdisp_lld_get_pixel_color(coord_t x, coord_t y) {
+		(void)x;
+		(void)y;
+
+		return 0;
+	}
+#endif
+
+#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)
+	/**
+	 * @brief   Scroll vertically a section of the screen.
+	 * @note    Optional.
+	 * @note    If x,y + cx,cy is off the screen, the result is undefined.
+	 * @note    If lines is >= cy, it is equivelent to a area fill with bgcolor.
+	 *
+	 * @param[in] x, y     The start of the area to be scrolled
+	 * @param[in] cx, cy   The size of the area to be scrolled
+	 * @param[in] lines    The number of lines to scroll (Can be positive or negative)
+	 * @param[in] bgcolor  The color to fill the newly exposed area.
+	 *
+	 * @notapi
+	 */
+	void gdisp_lld_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;
+		(void)cy;
+		(void)lines;
+		(void)bgcolor;
+	}
+#endif
+
+#endif /* GFX_USE_GDISP */
+/** @} */