1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
index 897c32aa..f583a7d6 100644
--- a/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
+++ b/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
@@ -100,12 +100,12 @@ static __inline void GDISP_LLD(init_board)(void) {
 	/* This code should really use the ChibiOS driver for these functions */

 

 	// Pin for backlight

-	pPIOB->PIO_CODR   = PIOB_LCD_BL_MASK;    // Set PB20 to LOW

-	pPIOB->PIO_OER    = PIOB_LCD_BL_MASK;    // Configure PB20 as output

+	pPIOB->PIO_CODR   = PIOB_GDISP_BL_MASK;    // Set PB20 to LOW

+	pPIOB->PIO_OER    = PIOB_GDISP_BL_MASK;    // Configure PB20 as output

 

 	// Reset pin

-	pPIOA->PIO_SODR   = PIOA_LCD_RESET_MASK;     // Set PA2 to HIGH

-	pPIOA->PIO_OER    = PIOA_LCD_RESET_MASK;     // Configure PA2 as output

+	pPIOA->PIO_SODR   = PIOA_GDISP_RESET_MASK;     // Set PA2 to HIGH

+	pPIOA->PIO_OER    = PIOA_GDISP_RESET_MASK;     // Configure PA2 as output

 

 	// CS pin - this seems to be ignored

 	// pPIOA->PIO_SODR   = BIT12;     // Set PA2 to HIGH

@@ -144,11 +144,11 @@ static __inline void GDISP_LLD(init_board)(void) {
  */

 static __inline void GDISP_LLD(setpin_reset)(bool_t state) {

 	if (state)

-		palClearPad(IOPORT1, PIOA_LCD_RESET);

-//		pPIOA->PIO_CODR = PIOA_LCD_RESET_MASK;

+		palClearPad(IOPORT1, PIOA_GDISP_RESET);

+//		pPIOA->PIO_CODR = PIOA_GDISP_RESET_MASK;

 	else

-		palSetPad(IOPORT1, PIOA_LCD_RESET);

-//		pPIOA->PIO_SODR = PIOA_LCD_RESET_MASK;

+		palSetPad(IOPORT1, PIOA_GDISP_RESET);

+//		pPIOA->PIO_SODR = PIOA_GDISP_RESET_MASK;

 }

 

 /**

@@ -160,11 +160,11 @@ static __inline void GDISP_LLD(setpin_reset)(bool_t state) {
  */

 static __inline void GDISP_LLD(setpin_backlight)(bool_t state) {

 	if (state)

-		palSetPad(IOPORT2, PIOB_LCD_BL);

-//		pPIOB->PIO_SODR = PIOB_LCD_BL_MASK;

+		palSetPad(IOPORT2, PIOB_GDISP_BL);

+//		pPIOB->PIO_SODR = PIOB_GDISP_BL_MASK;

 	else

-		palClearPad(IOPORT2, PIOB_LCD_BL);

-//		pPIOB->PIO_CODR = PIOB_LCD_BL_MASK;

+		palClearPad(IOPORT2, PIOB_GDISP_BL);

+//		pPIOB->PIO_CODR = PIOB_GDISP_BL_MASK;

 }

 

 /**