diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware/export/scroll_engine.h | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'firmware/export/scroll_engine.h')
-rw-r--r-- | firmware/export/scroll_engine.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 051e367506..f13e2efca7 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -58,11 +58,7 @@ extern bool lcd_remote_scroll_now(struct scrollinfo *scroll); | |||
58 | * larger than the normal linebuffer since it holds the line a second | 58 | * larger than the normal linebuffer since it holds the line a second |
59 | * time (+3 spaces) for non-bidir scrolling */ | 59 | * time (+3 spaces) for non-bidir scrolling */ |
60 | #define SCROLL_SPACING 3 | 60 | #define SCROLL_SPACING 3 |
61 | #ifdef HAVE_LCD_BITMAP | ||
62 | #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2) | 61 | #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2) |
63 | #else | ||
64 | #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2) | ||
65 | #endif | ||
66 | 62 | ||
67 | struct scrollinfo | 63 | struct scrollinfo |
68 | { | 64 | { |
@@ -95,20 +91,14 @@ struct scroll_screen_info | |||
95 | long ticks; /* # of ticks between updates*/ | 91 | long ticks; /* # of ticks between updates*/ |
96 | long delay; /* ticks delay before start */ | 92 | long delay; /* ticks delay before start */ |
97 | int bidir_limit; /* percent */ | 93 | int bidir_limit; /* percent */ |
98 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) | ||
99 | int step; /* pixels per scroll step */ | 94 | int step; /* pixels per scroll step */ |
100 | #endif | ||
101 | #if defined(HAVE_REMOTE_LCD) | 95 | #if defined(HAVE_REMOTE_LCD) |
102 | long last_scroll; | 96 | long last_scroll; |
103 | #endif | 97 | #endif |
104 | }; | 98 | }; |
105 | 99 | ||
106 | /** main lcd **/ | 100 | /** main lcd **/ |
107 | #ifdef HAVE_LCD_BITMAP | ||
108 | #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) | 101 | #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) |
109 | #else | ||
110 | #define LCD_SCROLLABLE_LINES LCD_HEIGHT * 2 | ||
111 | #endif | ||
112 | 102 | ||
113 | extern struct scroll_screen_info lcd_scroll_info; | 103 | extern struct scroll_screen_info lcd_scroll_info; |
114 | 104 | ||