cleaned up board file mess

6 files changed, 200 insertions, 231 deletions

diff --git a/drivers/gdisp/Nokia6610GE8/GE8.h b/drivers/gdisp/Nokia6610GE8/GE8.h
index 3d02d0f3..598a6e2d 100644
--- a/drivers/gdisp/Nokia6610GE8/GE8.h
+++ b/drivers/gdisp/Nokia6610GE8/GE8.h
@@ -4,51 +4,51 @@
  *
  *              http://chibios-gfx.com/license.html
  */
-

-#ifndef GE8_H

-#define GE8_H

-

-// *****************************************************************************

-// Include file for Epson S1D15G00 LCD Controller (GE8)

-//

-// Author: James P Lynch August 30, 2007

-// Modified for GDISP: Andrew Hannam August 2, 2012

-//

-// *****************************************************************************

-

-#define DISON		0xAF // Display on

-#define DISOFF		0xAE // Display off

-#define DISNOR		0xA6 // Normal display

-#define DISINV		0xA7 // Inverse display

-#define COMSCN		0xBB // Common scan direction

-#define DISCTL		0xCA // Display control

-#define SLPIN		0x95 // Sleep in

-#define SLPOUT		0x94 // Sleep out

-#define PASET		0x75 // Page address set

-#define CASET		0x15 // Column address set

-#define DATCTL		0xBC // Data scan direction, etc.

-#define RGBSET8		0xCE // 256-color position set

-#define RAMWR		0x5C // Writing to memory

-#define RAMRD		0x5D // Reading from memory

-#define PTLIN		0xA8 // Partial display in

-#define PTLOUT		0xA9 // Partial display out

-#define RMWIN		0xE0 // Read and modify write

-#define RMWOUT		0xEE // End

-#define ASCSET		0xAA // Area scroll set

-#define SCSTART		0xAB // Scroll start set

-#define OSCON		0xD1 // Internal oscillation on

-#define OSCOFF		0xD2 // Internal oscillation off

-#define PWRCTR		0x20 // Power control

-#define VOLCTR		0x81 // Electronic volume control

-#define VOLUP		0xD6 // Increment electronic control by 1

-#define VOLDOWN		0xD7 // Decrement electronic control by 1

-#define TMPGRD		0x82 // Temperature gradient set

-#define EPCTIN		0xCD // Control EEPROM

-#define EPCOUT		0xCC // Cancel EEPROM control

-#define EPMWR		0xFC // Write into EEPROM

-#define EPMRD		0xFD // Read from EEPROM

-#define EPSRRD1		0x7C // Read register 1

-#define EPSRRD2		0x7D // Read register 2

-#define NOP			0x25 // NOP instruction

-

-#endif /* GE8_H */

+
+#ifndef GE8_H
+#define GE8_H
+
+// *****************************************************************************
+// Include file for Epson S1D15G00 LCD Controller (GE8)
+//
+// Author: James P Lynch August 30, 2007
+// Modified for GDISP: Andrew Hannam August 2, 2012
+//
+// *****************************************************************************
+
+#define DISON		0xAF // Display on
+#define DISOFF		0xAE // Display off
+#define DISNOR		0xA6 // Normal display
+#define DISINV		0xA7 // Inverse display
+#define COMSCN		0xBB // Common scan direction
+#define DISCTL		0xCA // Display control
+#define SLPIN		0x95 // Sleep in
+#define SLPOUT		0x94 // Sleep out
+#define PASET		0x75 // Page address set
+#define CASET		0x15 // Column address set
+#define DATCTL		0xBC // Data scan direction, etc.
+#define RGBSET8		0xCE // 256-color position set
+#define RAMWR		0x5C // Writing to memory
+#define RAMRD		0x5D // Reading from memory
+#define PTLIN		0xA8 // Partial display in
+#define PTLOUT		0xA9 // Partial display out
+#define RMWIN		0xE0 // Read and modify write
+#define RMWOUT		0xEE // End
+#define ASCSET		0xAA // Area scroll set
+#define SCSTART		0xAB // Scroll start set
+#define OSCON		0xD1 // Internal oscillation on
+#define OSCOFF		0xD2 // Internal oscillation off
+#define PWRCTR		0x20 // Power control
+#define VOLCTR		0x81 // Electronic volume control
+#define VOLUP		0xD6 // Increment electronic control by 1
+#define VOLDOWN		0xD7 // Decrement electronic control by 1
+#define TMPGRD		0x82 // Temperature gradient set
+#define EPCTIN		0xCD // Control EEPROM
+#define EPCOUT		0xCC // Cancel EEPROM control
+#define EPMWR		0xFC // Write into EEPROM
+#define EPMRD		0xFD // Read from EEPROM
+#define EPSRRD1		0x7C // Read register 1
+#define EPSRRD2		0x7D // Read register 2
+#define NOP			0x25 // NOP instruction
+
+#endif /* GE8_H */
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
index 4e62f297..7d35d469 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
@@ -59,15 +59,7 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
-#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD
-	/* Include the user supplied board definitions */
-	#include "gdisp_lld_board.h"
-#elif defined(BOARD_OLIMEX_SAM7_EX256)
-	#include "gdisp_lld_board_olimexsam7ex256.h"
-#else
-	/* Include the user supplied board definitions */
-	#include "gdisp_lld_board.h"
-#endif
+#include "gdisp_lld_board.h"
 
 // Some macros just to make reading the code easier
 #define delayms(ms)						gfxSleepMilliseconds(ms)
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk b/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
index 3a1adec9..3e1f1851 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
@@ -1,5 +1,5 @@
-# List the required driver.

-GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.c

-

-# Required include directories

-GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610GE8

+# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610GE8
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_template.h
index 34234015..8aeb633b 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_template.h
@@ -4,119 +4,111 @@
  *
  *              http://chibios-gfx.com/license.html
  */
-

-/**

- * @file    drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h

- * @brief   GDISP Graphic Driver subsystem board interface for the Nokia6610 GE8 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_BOARD_H

-#define _GDISP_LLD_BOARD_H

-

-/**

- * @brief   Initialise the board for the display.

- * @notes	Performs the following functions:

- *			1. initialise the spi port used by your display

- *			2. initialise the reset pin (initial state not-in-reset)

- *			3. initialise the chip select pin (initial state not-active)

- *			4. initialise the backlight pin (initial state back-light off)

- *

- * @notapi

- */

-static inline void init_board(void) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for init_board for your board"

-}

-

-/**

- * @brief   Set or clear the lcd reset pin.

- *

- * @param[in] state		TRUE = lcd in reset, FALSE = normal operation

- * 

- * @notapi

- */

-static inline void setpin_reset(bool_t state) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for setpin_reset for your board"

-}

-

-/**

- * @brief   Set the lcd back-light level.

- * @note	For now 0% turns the backlight off, anything else the backlight is on.

- *			While the hardware supports PWM backlight control, we are not using it

- *			yet.

- *

- * @param[in] percent		0 to 100%

- * 

- * @notapi

- */

-static inline void set_backlight(uint8_t percent) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for set_backlight for your board"

-}

-

-/**

- * @brief   Take exclusive control of the bus

- *

- * @notapi

- */

-static inline void acquire_bus(void) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for acquire_bus for your board"

-}

-

-/**

- * @brief   Release exclusive control of the bus

- *

- * @notapi

- */

-static inline void release_bus(void) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for release_bus for your board"

-}

-

-/**

- * @brief   Send an 8 bit command to the lcd.

- *

- * @param[in] cmd		The command to send

- *

- * @notapi

- */

-static inline void write_cmd(uint16_t cmd) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for write_cmd for your board"

-}

-

-/**

- * @brief   Send an 8 bit data to the lcd.

- *

- * @param[in] data		The data to send

- * 

- * @notapi

- */

-static inline void write_data(uint16_t data) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for write_data for your board"

-}

-

-#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)

-/**

- * @brief   Read data from the lcd.

- *

- * @return	The data from the lcd

- * @note	The chip select may need to be asserted/de-asserted

- * 			around the actual spi read

- * 

- * @notapi

- */

-static inline uint16_t read_data(void) {

-	/* Code here */

-	#error "gdispNokia6610GE8: You must supply a definition for read_data for your board"

-}

-#endif

-

-#endif /* _GDISP_LLD_BOARD_H */

-/** @} */

+
+/**
+ * @file    drivers/gdisp/Nokia6610GE8/gdisp_lld_board_template.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the Nokia6610 GE8 display.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#ifndef _GDISP_LLD_BOARD_H
+#define _GDISP_LLD_BOARD_H
+
+/**
+ * @brief   Initialise the board for the display.
+ * @notes	Performs the following functions:
+ *			1. initialise the spi port used by your display
+ *			2. initialise the reset pin (initial state not-in-reset)
+ *			3. initialise the chip select pin (initial state not-active)
+ *			4. initialise the backlight pin (initial state back-light off)
+ *
+ * @notapi
+ */
+static inline void init_board(void) {
+
+}
+
+/**
+ * @brief   Set or clear the lcd reset pin.
+ *
+ * @param[in] state		TRUE = lcd in reset, FALSE = normal operation
+ * 
+ * @notapi
+ */
+static inline void setpin_reset(bool_t state) {
+
+}
+
+/**
+ * @brief   Set the lcd back-light level.
+ * @note	For now 0% turns the backlight off, anything else the backlight is on.
+ *			While the hardware supports PWM backlight control, we are not using it
+ *			yet.
+ *
+ * @param[in] percent		0 to 100%
+ * 
+ * @notapi
+ */
+static inline void set_backlight(uint8_t percent) {
+
+}
+
+/**
+ * @brief   Take exclusive control of the bus
+ *
+ * @notapi
+ */
+static inline void acquire_bus(void) {
+
+}
+
+/**
+ * @brief   Release exclusive control of the bus
+ *
+ * @notapi
+ */
+static inline void release_bus(void) {
+
+}
+
+/**
+ * @brief   Send an 8 bit command to the lcd.
+ *
+ * @param[in] cmd		The command to send
+ *
+ * @notapi
+ */
+static inline void write_cmd(uint16_t cmd) {
+
+}
+
+/**
+ * @brief   Send an 8 bit data to the lcd.
+ *
+ * @param[in] data		The data to send
+ * 
+ * @notapi
+ */
+static inline void write_data(uint16_t data) {
+
+}
+
+#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
+/**
+ * @brief   Read data from the lcd.
+ *
+ * @return	The data from the lcd
+ * @note	The chip select may need to be asserted/de-asserted
+ * 			around the actual spi read
+ * 
+ * @notapi
+ */
+static inline uint16_t read_data(void) {
+
+}
+#endif
+
+#endif /* _GDISP_LLD_BOARD_H */
+/** @} */
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
index 65e8d481..399bda0b 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
@@ -4,41 +4,41 @@
  *
  *              http://chibios-gfx.com/license.html
  */
-

-/**

- * @file    drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h

- * @brief   GDISP Graphic Driver subsystem low level driver header for the Nokia6610 GE8 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_CONFIG_H

-#define _GDISP_LLD_CONFIG_H

-

-#if GFX_USE_GDISP 

-

-/*===========================================================================*/

-/* Driver hardware support.                                                  */

-/*===========================================================================*/

-

-#define GDISP_DRIVER_NAME				"Nokia6610GE8"

-

-#define GDISP_HARDWARE_FILLS			TRUE

-#define GDISP_HARDWARE_BITFILLS			TRUE

-#define GDISP_HARDWARE_CONTROL			TRUE

-

-#define GDISP_SOFTWARE_TEXTFILLDRAW		FALSE

-#define GDISP_SOFTWARE_TEXTBLITCOLUMN	FALSE

-

-#define GDISP_PIXELFORMAT				GDISP_PIXELFORMAT_RGB444

-/* This driver supports both packed and unpacked pixel formats and line formats.

- * 	By default we leave these as FALSE.

- */

-#define GDISP_PACKED_PIXELS				FALSE

-#define GDISP_PACKED_LINES				FALSE

-

-#endif	/* GFX_USE_GDISP */

-

-#endif	/* _GDISP_LLD_CONFIG_H */

-/** @} */

+
+/**
+ * @file    drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
+ * @brief   GDISP Graphic Driver subsystem low level driver header for the Nokia6610 GE8 display.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#ifndef _GDISP_LLD_CONFIG_H
+#define _GDISP_LLD_CONFIG_H
+
+#if GFX_USE_GDISP 
+
+/*===========================================================================*/
+/* Driver hardware support.                                                  */
+/*===========================================================================*/
+
+#define GDISP_DRIVER_NAME				"Nokia6610GE8"
+
+#define GDISP_HARDWARE_FILLS			TRUE
+#define GDISP_HARDWARE_BITFILLS			TRUE
+#define GDISP_HARDWARE_CONTROL			TRUE
+
+#define GDISP_SOFTWARE_TEXTFILLDRAW		FALSE
+#define GDISP_SOFTWARE_TEXTBLITCOLUMN	FALSE
+
+#define GDISP_PIXELFORMAT				GDISP_PIXELFORMAT_RGB444
+/* This driver supports both packed and unpacked pixel formats and line formats.
+ * 	By default we leave these as FALSE.
+ */
+#define GDISP_PACKED_PIXELS				FALSE
+#define GDISP_PACKED_LINES				FALSE
+
+#endif	/* GFX_USE_GDISP */
+
+#endif	/* _GDISP_LLD_CONFIG_H */
+/** @} */
diff --git a/drivers/gdisp/Nokia6610GE8/readme.txt b/drivers/gdisp/Nokia6610GE8/readme.txt
deleted file mode 100644
index 503ca0b9..00000000
--- a/drivers/gdisp/Nokia6610GE8/readme.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-This driver is for the Nokia6610 Epson (GE8) controller

-

-To use this driver:

-

-1. Add in your gfxconf.h:

-	a) #define GFX_USE_GDISP	TRUE

-	b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD

-	c) If you are not using a known board then create a gdisp_lld_board.h file

-		and ensure it is on your include path.

-		Use the gdisp_lld_board_example.h file as a basis.

-		Currently known boards are:

-			Olimex SAM7-EX256

-

-2. To your makefile add the following lines:

-	include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk