diff options
Diffstat (limited to 'firmware/drivers/lcd-recorder.c')
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index 9513c26380..65866ec83f 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c | |||
@@ -392,7 +392,7 @@ static void nopixel(int x, int y) | |||
392 | (void)y; | 392 | (void)y; |
393 | } | 393 | } |
394 | 394 | ||
395 | lcd_pixelfunc_type* pixelfunc[8] = { | 395 | lcd_pixelfunc_type* lcd_pixelfuncs[8] = { |
396 | flippixel, nopixel, setpixel, setpixel, | 396 | flippixel, nopixel, setpixel, setpixel, |
397 | nopixel, clearpixel, nopixel, clearpixel | 397 | nopixel, clearpixel, nopixel, clearpixel |
398 | }; | 398 | }; |
@@ -437,7 +437,7 @@ static void solidinvblock(unsigned char *address, unsigned mask, unsigned bits) | |||
437 | *address = (*address & ~mask) | (~bits & mask); | 437 | *address = (*address & ~mask) | (~bits & mask); |
438 | } | 438 | } |
439 | 439 | ||
440 | lcd_blockfunc_type* blockfunc[8] = { | 440 | lcd_blockfunc_type* lcd_blockfuncs[8] = { |
441 | flipblock, bgblock, fgblock, solidblock, | 441 | flipblock, bgblock, fgblock, solidblock, |
442 | flipinvblock, bginvblock, fginvblock, solidinvblock | 442 | flipinvblock, bginvblock, fginvblock, solidinvblock |
443 | }; | 443 | }; |
@@ -457,7 +457,7 @@ void lcd_clear_display(void) | |||
457 | void lcd_drawpixel(int x, int y) | 457 | void lcd_drawpixel(int x, int y) |
458 | { | 458 | { |
459 | if (((unsigned)x < LCD_WIDTH) || ((unsigned)y < LCD_HEIGHT)) | 459 | if (((unsigned)x < LCD_WIDTH) || ((unsigned)y < LCD_HEIGHT)) |
460 | pixelfunc[drawmode](x, y); | 460 | lcd_pixelfuncs[drawmode](x, y); |
461 | } | 461 | } |
462 | 462 | ||
463 | /* Draw a line */ | 463 | /* Draw a line */ |
@@ -469,7 +469,7 @@ void lcd_drawline(int x1, int y1, int x2, int y2) | |||
469 | int d, dinc1, dinc2; | 469 | int d, dinc1, dinc2; |
470 | int x, xinc1, xinc2; | 470 | int x, xinc1, xinc2; |
471 | int y, yinc1, yinc2; | 471 | int y, yinc1, yinc2; |
472 | lcd_pixelfunc_type *pfunc = pixelfunc[drawmode]; | 472 | lcd_pixelfunc_type *pfunc = lcd_pixelfuncs[drawmode]; |
473 | 473 | ||
474 | deltax = abs(x2 - x1); | 474 | deltax = abs(x2 - x1); |
475 | deltay = abs(y2 - y1); | 475 | deltay = abs(y2 - y1); |
@@ -557,7 +557,7 @@ void lcd_hline(int x1, int x2, int y) | |||
557 | if (x2 >= LCD_WIDTH) | 557 | if (x2 >= LCD_WIDTH) |
558 | x2 = LCD_WIDTH-1; | 558 | x2 = LCD_WIDTH-1; |
559 | 559 | ||
560 | bfunc = blockfunc[drawmode]; | 560 | bfunc = lcd_blockfuncs[drawmode]; |
561 | dst = &lcd_framebuffer[y>>3][x1]; | 561 | dst = &lcd_framebuffer[y>>3][x1]; |
562 | mask = 1 << (y & 7); | 562 | mask = 1 << (y & 7); |
563 | 563 | ||
@@ -591,7 +591,7 @@ void lcd_vline(int x, int y1, int y2) | |||
591 | if (y2 >= LCD_HEIGHT) | 591 | if (y2 >= LCD_HEIGHT) |
592 | y2 = LCD_HEIGHT-1; | 592 | y2 = LCD_HEIGHT-1; |
593 | 593 | ||
594 | bfunc = blockfunc[drawmode]; | 594 | bfunc = lcd_blockfuncs[drawmode]; |
595 | dst = &lcd_framebuffer[y1>>3][x]; | 595 | dst = &lcd_framebuffer[y1>>3][x]; |
596 | ny = y2 - (y1 & ~7); | 596 | ny = y2 - (y1 & ~7); |
597 | mask = 0xFFu << (y1 & 7); | 597 | mask = 0xFFu << (y1 & 7); |
@@ -657,7 +657,7 @@ void lcd_fillrect(int x, int y, int width, int height) | |||
657 | (drawmode & DRMODE_BG) : (drawmode & DRMODE_FG); | 657 | (drawmode & DRMODE_BG) : (drawmode & DRMODE_FG); |
658 | if (fillopt &&(drawmode & DRMODE_INVERSEVID)) | 658 | if (fillopt &&(drawmode & DRMODE_INVERSEVID)) |
659 | bits = 0; | 659 | bits = 0; |
660 | bfunc = blockfunc[drawmode]; | 660 | bfunc = lcd_blockfuncs[drawmode]; |
661 | dst = &lcd_framebuffer[y>>3][x]; | 661 | dst = &lcd_framebuffer[y>>3][x]; |
662 | ny = height - 1 + (y & 7); | 662 | ny = height - 1 + (y & 7); |
663 | mask = 0xFFu << (y & 7); | 663 | mask = 0xFFu << (y & 7); |
@@ -742,7 +742,7 @@ void lcd_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
742 | shift = y & 7; | 742 | shift = y & 7; |
743 | ny = height - 1 + shift + src_y; | 743 | ny = height - 1 + shift + src_y; |
744 | 744 | ||
745 | bfunc = blockfunc[drawmode]; | 745 | bfunc = lcd_blockfuncs[drawmode]; |
746 | mask = 0xFFu << (shift + src_y); | 746 | mask = 0xFFu << (shift + src_y); |
747 | mask_bottom = 0xFFu >> (7 - (ny & 7)); | 747 | mask_bottom = 0xFFu >> (7 - (ny & 7)); |
748 | 748 | ||