diff options
author | Antoine Cellerier <dionoea@videolan.org> | 2007-09-30 21:40:22 +0000 |
---|---|---|
committer | Antoine Cellerier <dionoea@videolan.org> | 2007-09-30 21:40:22 +0000 |
commit | 2445f664502f758f86234498f6a4b7e879f519c7 (patch) | |
tree | 4c5abbc2da8b27461f2958b6c60d91cc11db445d | |
parent | cebfc40f69966141d4a3fa4db31dad7fe9deb452 (diff) | |
download | rockbox-2445f664502f758f86234498f6a4b7e879f519c7.tar.gz rockbox-2445f664502f758f86234498f6a4b7e879f519c7.zip |
Fix red due to previous commit, remove some ifdefs. (/me crosses his fingers)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14929 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/lcd-1bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-remote-1bit-v.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-remote-2bit-vi.c | 5 | ||||
-rw-r--r-- | firmware/export/scroll_engine.h | 4 |
6 files changed, 10 insertions, 19 deletions
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index 1720a5ff5c..bd62e105cb 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c | |||
@@ -687,9 +687,8 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, | |||
687 | s = &lcd_scroll_info.scroll[y]; | 687 | s = &lcd_scroll_info.scroll[y]; |
688 | 688 | ||
689 | s->start_tick = current_tick + lcd_scroll_info.delay; | 689 | s->start_tick = current_tick + lcd_scroll_info.delay; |
690 | s->invert = false; | 690 | s->style = style; |
691 | if (style & STYLE_INVERT) { | 691 | if (style & STYLE_INVERT) { |
692 | s->invert = true; | ||
693 | lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); | 692 | lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); |
694 | } | 693 | } |
695 | else | 694 | else |
@@ -785,7 +784,7 @@ void lcd_scroll_fn(void) | |||
785 | } | 784 | } |
786 | 785 | ||
787 | lastmode = drawmode; | 786 | lastmode = drawmode; |
788 | drawmode = s->invert ? | 787 | drawmode = (s->style&STYLE_INVERT) ? |
789 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; | 788 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; |
790 | lcd_putsxyofs(xpos, ypos, s->offset, s->line); | 789 | lcd_putsxyofs(xpos, ypos, s->offset, s->line); |
791 | drawmode = lastmode; | 790 | drawmode = lastmode; |
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c index 70d6b439ce..32ebfa7f81 100644 --- a/firmware/drivers/lcd-2bit-horz.c +++ b/firmware/drivers/lcd-2bit-horz.c | |||
@@ -886,9 +886,8 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, | |||
886 | s = &lcd_scroll_info.scroll[y]; | 886 | s = &lcd_scroll_info.scroll[y]; |
887 | 887 | ||
888 | s->start_tick = current_tick + lcd_scroll_info.delay; | 888 | s->start_tick = current_tick + lcd_scroll_info.delay; |
889 | s->invert = false; | 889 | s->style = style; |
890 | if (style & STYLE_INVERT) { | 890 | if (style & STYLE_INVERT) { |
891 | s->invert = true; | ||
892 | lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); | 891 | lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); |
893 | } | 892 | } |
894 | else | 893 | else |
@@ -984,7 +983,7 @@ void lcd_scroll_fn(void) | |||
984 | } | 983 | } |
985 | 984 | ||
986 | lastmode = drawmode; | 985 | lastmode = drawmode; |
987 | drawmode = s->invert ? | 986 | drawmode = (s->style&STYLE_INVERT) ? |
988 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; | 987 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; |
989 | lcd_putsxyofs(xpos, ypos, s->offset, s->line); | 988 | lcd_putsxyofs(xpos, ypos, s->offset, s->line); |
990 | drawmode = lastmode; | 989 | drawmode = lastmode; |
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c index 6be42afe86..aa3cd2cc3b 100644 --- a/firmware/drivers/lcd-2bit-vert.c +++ b/firmware/drivers/lcd-2bit-vert.c | |||
@@ -1022,9 +1022,8 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, | |||
1022 | s = &lcd_scroll_info.scroll[y]; | 1022 | s = &lcd_scroll_info.scroll[y]; |
1023 | 1023 | ||
1024 | s->start_tick = current_tick + lcd_scroll_info.delay; | 1024 | s->start_tick = current_tick + lcd_scroll_info.delay; |
1025 | s->invert = false; | 1025 | s->style = style; |
1026 | if (style & STYLE_INVERT) { | 1026 | if (style & STYLE_INVERT) { |
1027 | s->invert = true; | ||
1028 | lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); | 1027 | lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); |
1029 | } | 1028 | } |
1030 | else | 1029 | else |
@@ -1120,7 +1119,7 @@ void lcd_scroll_fn(void) | |||
1120 | } | 1119 | } |
1121 | 1120 | ||
1122 | lastmode = drawmode; | 1121 | lastmode = drawmode; |
1123 | drawmode = s->invert ? | 1122 | drawmode = (s->style&STYLE_INVERT) ? |
1124 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; | 1123 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; |
1125 | lcd_putsxyofs(xpos, ypos, s->offset, s->line); | 1124 | lcd_putsxyofs(xpos, ypos, s->offset, s->line); |
1126 | drawmode = lastmode; | 1125 | drawmode = lastmode; |
diff --git a/firmware/drivers/lcd-remote-1bit-v.c b/firmware/drivers/lcd-remote-1bit-v.c index 480df73c2d..9bfbf580d9 100644 --- a/firmware/drivers/lcd-remote-1bit-v.c +++ b/firmware/drivers/lcd-remote-1bit-v.c | |||
@@ -685,9 +685,8 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri | |||
685 | s = &lcd_remote_scroll_info.scroll[y]; | 685 | s = &lcd_remote_scroll_info.scroll[y]; |
686 | 686 | ||
687 | s->start_tick = current_tick + lcd_remote_scroll_info.delay; | 687 | s->start_tick = current_tick + lcd_remote_scroll_info.delay; |
688 | s->invert = false; | 688 | s->style = style; |
689 | if (style & STYLE_INVERT) { | 689 | if (style & STYLE_INVERT) { |
690 | s->invert = true; | ||
691 | lcd_remote_puts_style_offset(x,y,string,STYLE_INVERT,offset); | 690 | lcd_remote_puts_style_offset(x,y,string,STYLE_INVERT,offset); |
692 | } | 691 | } |
693 | else | 692 | else |
@@ -783,7 +782,7 @@ void lcd_remote_scroll_fn(void) | |||
783 | } | 782 | } |
784 | 783 | ||
785 | lastmode = drawmode; | 784 | lastmode = drawmode; |
786 | drawmode = s->invert ? | 785 | drawmode = (s->style&STYLE_INVERT) ? |
787 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; | 786 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; |
788 | lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); | 787 | lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); |
789 | drawmode = lastmode; | 788 | drawmode = lastmode; |
diff --git a/firmware/drivers/lcd-remote-2bit-vi.c b/firmware/drivers/lcd-remote-2bit-vi.c index 51189b0fa9..d5757f4dbb 100644 --- a/firmware/drivers/lcd-remote-2bit-vi.c +++ b/firmware/drivers/lcd-remote-2bit-vi.c | |||
@@ -1022,9 +1022,8 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri | |||
1022 | s = &lcd_remote_scroll_info.scroll[y]; | 1022 | s = &lcd_remote_scroll_info.scroll[y]; |
1023 | 1023 | ||
1024 | s->start_tick = current_tick + lcd_remote_scroll_info.delay; | 1024 | s->start_tick = current_tick + lcd_remote_scroll_info.delay; |
1025 | s->invert = false; | 1025 | s->style = style; |
1026 | if (style & STYLE_INVERT) { | 1026 | if (style & STYLE_INVERT) { |
1027 | s->invert = true; | ||
1028 | lcd_remote_puts_style_offset(x,y,string,STYLE_INVERT,offset); | 1027 | lcd_remote_puts_style_offset(x,y,string,STYLE_INVERT,offset); |
1029 | } | 1028 | } |
1030 | else | 1029 | else |
@@ -1120,7 +1119,7 @@ void lcd_remote_scroll_fn(void) | |||
1120 | } | 1119 | } |
1121 | 1120 | ||
1122 | lastmode = drawmode; | 1121 | lastmode = drawmode; |
1123 | drawmode = s->invert ? | 1122 | drawmode = (s->style&STYLE_INVERT) ? |
1124 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; | 1123 | (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; |
1125 | lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); | 1124 | lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); |
1126 | drawmode = lastmode; | 1125 | drawmode = lastmode; |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 238641c08c..5e39990129 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -43,11 +43,7 @@ struct scrollinfo | |||
43 | int startx; | 43 | int startx; |
44 | #ifdef HAVE_LCD_BITMAP | 44 | #ifdef HAVE_LCD_BITMAP |
45 | int width; /* length of line in pixels */ | 45 | int width; /* length of line in pixels */ |
46 | #ifdef HAVE_LCD_COLOR | ||
47 | int style; /* line style */ | 46 | int style; /* line style */ |
48 | #else | ||
49 | bool invert; /* invert the scrolled text */ | ||
50 | #endif | ||
51 | #endif/* HAVE_LCD_BITMAP */ | 47 | #endif/* HAVE_LCD_BITMAP */ |
52 | bool backward; /* scroll presently forward or backward? */ | 48 | bool backward; /* scroll presently forward or backward? */ |
53 | bool bidir; | 49 | bool bidir; |