diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-03-11 09:28:49 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-03-11 09:28:49 +0000 |
commit | 06bc627c993b742997473bd76c75795c4b165cae (patch) | |
tree | 9d41cbb602de3ae59942c0ffc091670ef2e659f7 /firmware | |
parent | 37f529cc3cdcc7990b2a770efec06e45c6054f36 (diff) | |
download | rockbox-06bc627c993b742997473bd76c75795c4b165cae.tar.gz rockbox-06bc627c993b742997473bd76c75795c4b165cae.zip |
Removed lcd_roll() and lcd_remote_roll() functions. These functions were not really portable. Removed the only plugin that used lcd_roll(): Oscillograph. Oscilloscope offers everything that oscillograph did and more, in a portable way. * Bumped & sorted plugin API.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8995 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-h100-remote.c | 26 | ||||
-rw-r--r-- | firmware/drivers/lcd-h100.c | 18 | ||||
-rw-r--r-- | firmware/drivers/lcd-h300.c | 13 | ||||
-rw-r--r-- | firmware/drivers/lcd-ipod.c | 26 | ||||
-rw-r--r-- | firmware/drivers/lcd-ipodvideo.c | 13 | ||||
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 12 |
6 files changed, 0 insertions, 108 deletions
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c index df735ca40d..a6d584c3fb 100644 --- a/firmware/drivers/lcd-h100-remote.c +++ b/firmware/drivers/lcd-h100-remote.c | |||
@@ -100,7 +100,6 @@ static bool remote_initialized = false; | |||
100 | static bool cached_invert = false; | 100 | static bool cached_invert = false; |
101 | static bool cached_flip = false; | 101 | static bool cached_flip = false; |
102 | static int cached_contrast = 32; | 102 | static int cached_contrast = 32; |
103 | static int cached_roll = 0; | ||
104 | #endif | 103 | #endif |
105 | 104 | ||
106 | /* scrolling */ | 105 | /* scrolling */ |
@@ -393,30 +392,6 @@ void lcd_remote_set_flip(bool yesno) | |||
393 | } | 392 | } |
394 | } | 393 | } |
395 | 394 | ||
396 | /* Rolls up the lcd display by the specified amount of lines. | ||
397 | * Lines that are rolled out over the top of the screen are | ||
398 | * rolled in from the bottom again. This is a hardware | ||
399 | * remapping only and all operations on the lcd are affected. | ||
400 | * -> | ||
401 | * @param int lines - The number of lines that are rolled. | ||
402 | * The value must be 0 <= pixels < LCD_REMOTE_HEIGHT. */ | ||
403 | void lcd_remote_roll(int lines) | ||
404 | { | ||
405 | char data[2]; | ||
406 | |||
407 | cached_roll = lines; | ||
408 | |||
409 | if (remote_initialized) | ||
410 | { | ||
411 | lines &= LCD_REMOTE_HEIGHT-1; | ||
412 | data[0] = lines & 0xff; | ||
413 | data[1] = lines >> 8; | ||
414 | |||
415 | lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line | ||
416 | lcd_remote_write_data(data, 2); | ||
417 | } | ||
418 | } | ||
419 | |||
420 | /* The actual LCD init */ | 395 | /* The actual LCD init */ |
421 | static void remote_lcd_init(void) | 396 | static void remote_lcd_init(void) |
422 | { | 397 | { |
@@ -443,7 +418,6 @@ static void remote_lcd_init(void) | |||
443 | lcd_remote_set_flip(cached_flip); | 418 | lcd_remote_set_flip(cached_flip); |
444 | lcd_remote_set_contrast(cached_contrast); | 419 | lcd_remote_set_contrast(cached_contrast); |
445 | lcd_remote_set_invert_display(cached_invert); | 420 | lcd_remote_set_invert_display(cached_invert); |
446 | lcd_remote_roll(cached_roll); | ||
447 | } | 421 | } |
448 | 422 | ||
449 | static int _remote_type = 0; | 423 | static int _remote_type = 0; |
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c index 7b67ad023c..1d80458679 100644 --- a/firmware/drivers/lcd-h100.c +++ b/firmware/drivers/lcd-h100.c | |||
@@ -136,19 +136,6 @@ void lcd_set_flip(bool yesno) | |||
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
139 | /* Rolls up the lcd display by the specified amount of lines. | ||
140 | * Lines that are rolled out over the top of the screen are | ||
141 | * rolled in from the bottom again. This is a hardware | ||
142 | * remapping only and all operations on the lcd are affected. | ||
143 | * -> | ||
144 | * @param int lines - The number of lines that are rolled. | ||
145 | * The value must be 0 <= pixels < LCD_HEIGHT. */ | ||
146 | void lcd_roll(int lines) | ||
147 | { | ||
148 | lines &= LCD_HEIGHT-1; | ||
149 | lcd_write_command_ex(LCD_CNTL_DISPLAY_START_LINE, lines, -1); | ||
150 | } | ||
151 | |||
152 | #endif /* !SIMULATOR */ | 139 | #endif /* !SIMULATOR */ |
153 | 140 | ||
154 | /* LCD init */ | 141 | /* LCD init */ |
@@ -163,8 +150,6 @@ void lcd_init(void) | |||
163 | 150 | ||
164 | void lcd_init(void) | 151 | void lcd_init(void) |
165 | { | 152 | { |
166 | static unsigned char area_data[4] = { 0x01, 0x00, 0x7f, 0x80 }; | ||
167 | |||
168 | /* GPO35 is the LCD A0 pin | 153 | /* GPO35 is the LCD A0 pin |
169 | GPO46 is LCD RESET */ | 154 | GPO46 is LCD RESET */ |
170 | or_l(0x00004008, &GPIO1_OUT); | 155 | or_l(0x00004008, &GPIO1_OUT); |
@@ -198,9 +183,6 @@ void lcd_init(void) | |||
198 | sleep(HZ/10); /* 100 ms pause */ | 183 | sleep(HZ/10); /* 100 ms pause */ |
199 | lcd_write_command_ex(LCD_CNTL_POWER_CONTROL, 0x17, -1); | 184 | lcd_write_command_ex(LCD_CNTL_POWER_CONTROL, 0x17, -1); |
200 | 185 | ||
201 | lcd_write_command(LCD_CNTL_AREA_SCROLL); | ||
202 | lcd_write_data(area_data, sizeof(area_data)); | ||
203 | |||
204 | lcd_write_command_ex(LCD_CNTL_DISPLAY_START_LINE, 0, -1); | 186 | lcd_write_command_ex(LCD_CNTL_DISPLAY_START_LINE, 0, -1); |
205 | lcd_write_command_ex(LCD_CNTL_GRAY_SCALE_PATTERN, 0x42, -1); | 187 | lcd_write_command_ex(LCD_CNTL_GRAY_SCALE_PATTERN, 0x42, -1); |
206 | lcd_write_command_ex(LCD_CNTL_DISPLAY_MODE, 0, -1); /* Greyscale mode */ | 188 | lcd_write_command_ex(LCD_CNTL_DISPLAY_MODE, 0, -1); /* Greyscale mode */ |
diff --git a/firmware/drivers/lcd-h300.c b/firmware/drivers/lcd-h300.c index 8ee6b1c47e..046bd3a9cb 100644 --- a/firmware/drivers/lcd-h300.c +++ b/firmware/drivers/lcd-h300.c | |||
@@ -107,19 +107,6 @@ void lcd_set_flip(bool yesno) | |||
107 | (void)yesno; | 107 | (void)yesno; |
108 | } | 108 | } |
109 | 109 | ||
110 | /* Rolls up the lcd display by the specified amount of lines. | ||
111 | * Lines that are rolled out over the top of the screen are | ||
112 | * rolled in from the bottom again. This is a hardware | ||
113 | * remapping only and all operations on the lcd are affected. | ||
114 | * -> | ||
115 | * @param int lines - The number of lines that are rolled. | ||
116 | * The value must be 0 <= pixels < LCD_HEIGHT. */ | ||
117 | void lcd_roll(int lines) | ||
118 | { | ||
119 | (void)lines; | ||
120 | } | ||
121 | |||
122 | |||
123 | /* LCD init */ | 110 | /* LCD init */ |
124 | void lcd_init_device(void) | 111 | void lcd_init_device(void) |
125 | { | 112 | { |
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c index 4df47f9f20..2d190d3d70 100644 --- a/firmware/drivers/lcd-ipod.c +++ b/firmware/drivers/lcd-ipod.c | |||
@@ -141,19 +141,6 @@ void lcd_blit(const unsigned char* data, int x, int by, int width, | |||
141 | (void)stride; | 141 | (void)stride; |
142 | } | 142 | } |
143 | 143 | ||
144 | /* Rolls up the lcd display by the specified amount of lines. | ||
145 | * Lines that are rolled out over the top of the screen are | ||
146 | * rolled in from the bottom again. This is a hardware | ||
147 | * remapping only and all operations on the lcd are affected. | ||
148 | * -> | ||
149 | * @param int lines - The number of lines that are rolled. | ||
150 | * The value must be 0 <= pixels < LCD_HEIGHT. */ | ||
151 | void lcd_roll(int lines) | ||
152 | { | ||
153 | /* TODO Implement lcd_roll() */ | ||
154 | lines &= LCD_HEIGHT-1; | ||
155 | } | ||
156 | |||
157 | /*** hardware configuration ***/ | 144 | /*** hardware configuration ***/ |
158 | 145 | ||
159 | /* Update the display. | 146 | /* Update the display. |
@@ -314,19 +301,6 @@ void lcd_set_flip(bool yesno) | |||
314 | (void)yesno; | 301 | (void)yesno; |
315 | } | 302 | } |
316 | 303 | ||
317 | /* Rolls up the lcd display by the specified amount of lines. | ||
318 | * Lines that are rolled out over the top of the screen are | ||
319 | * rolled in from the bottom again. This is a hardware | ||
320 | * remapping only and all operations on the lcd are affected. | ||
321 | * -> | ||
322 | * @param int lines - The number of lines that are rolled. | ||
323 | * The value must be 0 <= pixels < LCD_HEIGHT. */ | ||
324 | void lcd_roll(int lines) | ||
325 | { | ||
326 | /* TODO: Implement lcd_roll() */ | ||
327 | lines &= LCD_HEIGHT-1; | ||
328 | } | ||
329 | |||
330 | /* LCD init */ | 304 | /* LCD init */ |
331 | void lcd_init_device(void) | 305 | void lcd_init_device(void) |
332 | { | 306 | { |
diff --git a/firmware/drivers/lcd-ipodvideo.c b/firmware/drivers/lcd-ipodvideo.c index 066616959e..84b830377e 100644 --- a/firmware/drivers/lcd-ipodvideo.c +++ b/firmware/drivers/lcd-ipodvideo.c | |||
@@ -50,19 +50,6 @@ void lcd_set_flip(bool yesno) | |||
50 | (void)yesno; | 50 | (void)yesno; |
51 | } | 51 | } |
52 | 52 | ||
53 | /* Rolls up the lcd display by the specified amount of lines. | ||
54 | * Lines that are rolled out over the top of the screen are | ||
55 | * rolled in from the bottom again. This is a hardware | ||
56 | * remapping only and all operations on the lcd are affected. | ||
57 | * -> | ||
58 | * @param int lines - The number of lines that are rolled. | ||
59 | * The value must be 0 <= pixels < LCD_HEIGHT. */ | ||
60 | void lcd_roll(int lines) | ||
61 | { | ||
62 | /* TODO: Implement lcd_roll() */ | ||
63 | lines &= LCD_HEIGHT-1; | ||
64 | } | ||
65 | |||
66 | /* LCD init */ | 53 | /* LCD init */ |
67 | void lcd_init_device(void) | 54 | void lcd_init_device(void) |
68 | { | 55 | { |
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index 22388815ae..7a44acf590 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c | |||
@@ -226,18 +226,6 @@ void lcd_set_flip(bool yesno) | |||
226 | #endif | 226 | #endif |
227 | } | 227 | } |
228 | 228 | ||
229 | /* Rolls up the lcd display by the specified amount of lines. | ||
230 | * Lines that are rolled out over the top of the screen are | ||
231 | * rolled in from the bottom again. This is a hardware | ||
232 | * remapping only and all operations on the lcd are affected. | ||
233 | * -> | ||
234 | * @param int lines - The number of lines that are rolled. | ||
235 | * The value must be 0 <= pixels < LCD_HEIGHT. */ | ||
236 | void lcd_roll(int lines) | ||
237 | { | ||
238 | lcd_write_command(LCD_SET_DISPLAY_START_LINE | (lines & (LCD_HEIGHT-1))); | ||
239 | } | ||
240 | |||
241 | #endif /* !SIMULATOR */ | 229 | #endif /* !SIMULATOR */ |
242 | 230 | ||
243 | /* LCD init */ | 231 | /* LCD init */ |