uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

replaced get_bus by aquire_bus

Browse source
This commit is contained in:
Joel Bodenmann 2012-11-19 21:55:08 +01:00
parent cafb454745
commit 9f2a7c36d9
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gdisp/Nokia6610/gdisp_lld.c
View file

@ -125,7 +125,7 @@ bool_t GDISP_LLD(init)(void) {
delayms(20); delayms(20);
// Get the bus for the following initialisation commands // Get the bus for the following initialisation commands
get_bus(); aquire_bus();
#if defined(GDISP_USE_GE8) #if defined(GDISP_USE_GE8)
write_cmd3(DISCTL, 0x00, 0x20, 0x00); // Display control 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 GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
#endif #endif
get_bus(); aquire_bus();
setviewport(x, y, 1, 1); setviewport(x, y, 1, 1);
write_cmd3(RAMWR, 0, (color>>8) & 0x0F, color & 0xFF); write_cmd3(RAMWR, 0, (color>>8) & 0x0F, color & 0xFF);
release_bus(); 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. tuples = (cx*cy+1)/2; // With an odd sized area we over-print by one pixel.
// This extra pixel is ignored by the controller. // This extra pixel is ignored by the controller.
get_bus(); aquire_bus();
setviewport(x, y, cx, cy); setviewport(x, y, cx, cy);
write_cmd(RAMWR); write_cmd(RAMWR);
for(i=0; i < tuples; i++) 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; endx = srcx + cx;
endy = y + cy; endy = y + cy;
get_bus(); aquire_bus();
setviewport(x, y, cx, cy); setviewport(x, y, cx, cy);
write_cmd(RAMWR); write_cmd(RAMWR);
@ -537,7 +537,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
return; return;
case GDISP_CONTROL_CONTRAST: case GDISP_CONTROL_CONTRAST:
if ((unsigned)value > 100) value = (void *)100; if ((unsigned)value > 100) value = (void *)100;
get_bus(); aquire_bus();
#if defined(GDISP_USE_GE8) #if defined(GDISP_USE_GE8)
write_cmd2(VOLCTR, (unsigned)value, 0x03); write_cmd2(VOLCTR, (unsigned)value, 0x03);
#elif defined(GDISP_USE_GE12) #elif defined(GDISP_USE_GE12)

4
drivers/gdisp/Nokia6610/gdisp_lld_board_example.h
View file

@ -76,8 +76,8 @@ static __inline void set_backlight(uint8_t percent) {
* *
* @notapi * @notapi
*/ */
static __inline void get_bus(void) { static __inline void aquire_bus(void) {
#error "gdispNokia6610: You must supply a definition for get_bus for your board" #error "gdispNokia6610: You must supply a definition for aquire_bus for your board"
} }
/** /**

4
drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
View file

@ -137,8 +137,8 @@ static __inline void set_backlight(uint8_t percent) {
* *
* @notapi * @notapi
*/ */
static __inline void get_bus(void) { static __inline void aquire_bus(void) {
// Nothing to do for this board as the LCD is the only device on the SPI port /* Nothing to do for this board as the LCD is the only device on the SPI port */
} }
/** /**

14
drivers/gdisp/SSD1289/gdisp_lld.c
View file

@ -161,7 +161,7 @@ bool_t GDISP_LLD(init)(void) {
delayms(20); delayms(20);
// Get the bus for the following initialisation commands // Get the bus for the following initialisation commands
get_bus(); aquire_bus();
write_reg(0x0000,0x0001); delay(5); write_reg(0x0000,0x0001); delay(5);
write_reg(0x0003,0xA8A4); 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; if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
#endif #endif
get_bus(); aquire_bus();
set_cursor(x, y); set_cursor(x, y);
write_reg(0x0022, color); write_reg(0x0022, color);
release_bus(); 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) { void GDISP_LLD(clear)(color_t color) {
unsigned i; unsigned i;
get_bus(); aquire_bus();
set_cursor(0, 0); set_cursor(0, 0);
stream_start(); stream_start();
for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++) 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; area = cx*cy;
get_bus(); aquire_bus();
set_viewport(x, y, cx, cy); set_viewport(x, y, cx, cy);
stream_start(); stream_start();
for(i = 0; i < area; i++) 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; if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y;
#endif #endif
get_bus(); aquire_bus();
set_viewport(x, y, cx, cy); set_viewport(x, y, cx, cy);
stream_start(); 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; if (x < 0 || x >= GDISP.Width || y < 0 || y >= GDISP.Height) return 0;
#endif #endif
get_bus(); aquire_bus();
set_cursor(x, y); set_cursor(x, y);
stream_start(); stream_start();
color = read_data(); // dummy read 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; abslines = lines < 0 ? -lines : lines;
get_bus(); aquire_bus();
if (abslines >= cy) { if (abslines >= cy) {
abslines = cy; abslines = cy;
gap = 0; gap = 0;

4
drivers/gdisp/SSD1289/gdisp_lld_board_example.h
View file

@ -68,8 +68,8 @@ static __inline void set_backlight(uint8_t percent) {
* *
* @notapi * @notapi
*/ */
static __inline void get_bus(void) { static __inline void aquire_bus(void) {
#error "SSD1289: You must supply a definition for get_bus for your board" #error "SSD1289: You must supply a definition for aquire_bus for your board"
} }
/** /**

2
drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
View file

@ -116,7 +116,7 @@ static __inline void set_backlight(uint8_t percent) {
* *
* @notapi * @notapi
*/ */
static __inline void get_bus(void) { static __inline void aquire_bus(void) {
/* Nothing to do here */ /* Nothing to do here */
} }

2
drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
View file

@ -88,7 +88,7 @@ static __inline void set_backlight(uint8_t percent) {
* *
* @notapi * @notapi
*/ */
static __inline void get_bus(void) { static __inline void aquire_bus(void) {
/* Nothing to do here */ /* Nothing to do here */
} }