From a734b10c4115627fff7407ef334fba1acc618cf4 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Tue, 20 Nov 2012 18:56:26 +0100 Subject: [PATCH] typo fix: aquire_bus -> acquire_bus --- drivers/gdisp/Nokia6610/gdisp_lld.c | 10 +++++----- drivers/gdisp/Nokia6610/gdisp_lld_board_example.h | 4 ++-- .../Nokia6610/gdisp_lld_board_olimexsam7ex256.h | 2 +- drivers/gdisp/SSD1289/gdisp_lld.c | 14 +++++++------- drivers/gdisp/SSD1289/gdisp_lld_board_example.h | 4 ++-- .../gdisp/SSD1289/gdisp_lld_board_example_fsmc.h | 2 +- .../SSD1289/gdisp_lld_board_firebullstm32f103.h | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/gdisp/Nokia6610/gdisp_lld.c b/drivers/gdisp/Nokia6610/gdisp_lld.c index facd727d..04a39545 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld.c +++ b/drivers/gdisp/Nokia6610/gdisp_lld.c @@ -125,7 +125,7 @@ bool_t GDISP_LLD(init)(void) { delayms(20); // Get the bus for the following initialisation commands - aquire_bus(); + acquire_bus(); #if defined(GDISP_USE_GE8) write_cmd3(DISCTL, 0x00, 0x20, 0x00); // Display control @@ -245,7 +245,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; #endif - aquire_bus(); + acquire_bus(); setviewport(x, y, 1, 1); write_cmd3(RAMWR, 0, (color>>8) & 0x0F, color & 0xFF); release_bus(); @@ -277,7 +277,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { tuples = (cx*cy+1)/2; // With an odd sized area we over-print by one pixel. // This extra pixel is ignored by the controller. - aquire_bus(); + acquire_bus(); setviewport(x, y, cx, cy); write_cmd(RAMWR); for(i=0; i < tuples; i++) @@ -319,7 +319,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { endx = srcx + cx; endy = y + cy; - aquire_bus(); + acquire_bus(); setviewport(x, y, cx, cy); write_cmd(RAMWR); @@ -537,7 +537,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { return; case GDISP_CONTROL_CONTRAST: if ((unsigned)value > 100) value = (void *)100; - aquire_bus(); + acquire_bus(); #if defined(GDISP_USE_GE8) write_cmd2(VOLCTR, (unsigned)value, 0x03); #elif defined(GDISP_USE_GE12) diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h index a4db297f..de8eb6ce 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h +++ b/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h @@ -76,8 +76,8 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void aquire_bus(void) { -#error "gdispNokia6610: You must supply a definition for aquire_bus for your board" +static __inline void acquire_bus(void) { +#error "gdispNokia6610: You must supply a definition for acquire_bus for your board" } /** diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h index cbfd4486..3d1e6ceb 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h +++ b/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h @@ -137,7 +137,7 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void aquire_bus(void) { +static __inline void acquire_bus(void) { /* Nothing to do for this board as the LCD is the only device on the SPI port */ } diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c index f785a532..9b572568 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.c +++ b/drivers/gdisp/SSD1289/gdisp_lld.c @@ -161,7 +161,7 @@ bool_t GDISP_LLD(init)(void) { delayms(20); // Get the bus for the following initialisation commands - aquire_bus(); + acquire_bus(); write_reg(0x0000,0x0001); delay(5); write_reg(0x0003,0xA8A4); delay(5); @@ -241,7 +241,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; #endif - aquire_bus(); + acquire_bus(); set_cursor(x, y); write_reg(0x0022, color); release_bus(); @@ -276,7 +276,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { void GDISP_LLD(clear)(color_t color) { unsigned i; - aquire_bus(); + acquire_bus(); set_cursor(0, 0); stream_start(); for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++) @@ -310,7 +310,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { area = cx*cy; - aquire_bus(); + acquire_bus(); set_viewport(x, y, cx, cy); stream_start(); for(i = 0; i < area; i++) @@ -346,7 +346,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y; #endif - aquire_bus(); + acquire_bus(); set_viewport(x, y, cx, cy); stream_start(); @@ -379,7 +379,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { if (x < 0 || x >= GDISP.Width || y < 0 || y >= GDISP.Height) return 0; #endif - aquire_bus(); + acquire_bus(); set_cursor(x, y); stream_start(); color = read_data(); // dummy read @@ -419,7 +419,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { abslines = lines < 0 ? -lines : lines; - aquire_bus(); + acquire_bus(); if (abslines >= cy) { abslines = cy; gap = 0; diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h b/drivers/gdisp/SSD1289/gdisp_lld_board_example.h index 05f7cefa..c47a6ed6 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h +++ b/drivers/gdisp/SSD1289/gdisp_lld_board_example.h @@ -68,8 +68,8 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void aquire_bus(void) { -#error "SSD1289: You must supply a definition for aquire_bus for your board" +static __inline void acquire_bus(void) { +#error "SSD1289: You must supply a definition for acquire_bus for your board" } /** diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h b/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h index 5541a8cd..dd492f9d 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h +++ b/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h @@ -116,7 +116,7 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void aquire_bus(void) { +static __inline void acquire_bus(void) { /* Nothing to do here */ } diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h index ad445f9e..48be3cf7 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h +++ b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h @@ -88,7 +88,7 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void aquire_bus(void) { +static __inline void acquire_bus(void) { /* Nothing to do here */ }