summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-04-13 18:17:16 +0200
committerThomas Martitz <kugel@rockbox.org>2014-01-07 14:13:48 +0100
commit8f64625888965d7eed46101fad8fc7fbd9e30f03 (patch)
tree35b41b514fbb9904e36763a7f425f42ff98e8dc7 /firmware
parenta422604435bbb92b6d69552e347c8fa56c0830a2 (diff)
downloadrockbox-8f64625888965d7eed46101fad8fc7fbd9e30f03.tar.gz
rockbox-8f64625888965d7eed46101fad8fc7fbd9e30f03.zip
lcd-common: Remove unused function lcd_puts_offset().
Change-Id: I39749bf3db915e5a8ddb6e6f25eb201ea0aaf981
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/lcd-bitmap-common.c5
-rw-r--r--firmware/drivers/lcd-charcell.c33
-rw-r--r--firmware/export/lcd-remote.h2
-rw-r--r--firmware/export/lcd.h1
4 files changed, 17 insertions, 24 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 00d317c9c8..2219b6de78 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -494,11 +494,6 @@ void LCDFN(puts_style)(int x, int y, const unsigned char *str, int style)
494 LCDFN(puts_style_offset)(x, y, str, style, 0); 494 LCDFN(puts_style_offset)(x, y, str, style, 0);
495} 495}
496 496
497void LCDFN(puts_offset)(int x, int y, const unsigned char *str, int offset)
498{
499 LCDFN(puts_style_offset)(x, y, str, STYLE_DEFAULT, offset);
500}
501
502/*** scrolling ***/ 497/*** scrolling ***/
503 498
504static struct scrollinfo* find_scrolling_line(int x, int y) 499static struct scrollinfo* find_scrolling_line(int x, int y)
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c
index c3b1482a3b..6a6e57e992 100644
--- a/firmware/drivers/lcd-charcell.c
+++ b/firmware/drivers/lcd-charcell.c
@@ -477,10 +477,25 @@ void lcd_putsxyf(int x, int y, const unsigned char *fmt, ...)
477 477
478/*** Line oriented text output ***/ 478/*** Line oriented text output ***/
479 479
480/* Put a string at a given char position, skipping first offset chars */
481void lcd_putsofs(int x, int y, const unsigned char *str, int offset)
482{
483 if ((unsigned)y >= (unsigned)current_vp->height)
484 return;
485
486 /* make sure scrolling is turned off on the line we are updating */
487 lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
488
489 x = lcd_putsxyofs(x, y, offset, str);
490 while (x < current_vp->width)
491 lcd_putxchar(x++, y, xspace);
492}
493
494
480/* Put a string at a given char position */ 495/* Put a string at a given char position */
481void lcd_puts(int x, int y, const unsigned char *str) 496void lcd_puts(int x, int y, const unsigned char *str)
482{ 497{
483 lcd_puts_offset(x, y, str, 0); 498 lcd_putsofs(x, y, str, 0);
484} 499}
485 500
486/* Formatting version of lcd_puts */ 501/* Formatting version of lcd_puts */
@@ -494,20 +509,6 @@ void lcd_putsf(int x, int y, const unsigned char *fmt, ...)
494 lcd_puts(x, y, buf); 509 lcd_puts(x, y, buf);
495} 510}
496 511
497/* Put a string at a given char position, skipping first offset chars */
498void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
499{
500 if ((unsigned)y >= (unsigned)current_vp->height)
501 return;
502
503 /* make sure scrolling is turned off on the line we are updating */
504 lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
505
506 x = lcd_putsxyofs(x, y, offset, str);
507 while (x < current_vp->width)
508 lcd_putxchar(x++, y, xspace);
509}
510
511/** scrolling **/ 512/** scrolling **/
512 513
513void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, 514void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
@@ -529,7 +530,7 @@ void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
529 530
530 s->start_tick = current_tick + lcd_scroll_info.delay; 531 s->start_tick = current_tick + lcd_scroll_info.delay;
531 532
532 lcd_puts_offset(x, y, string, offset); 533 lcd_putsofs(x, y, string, offset);
533 len = utf8length(string); 534 len = utf8length(string);
534 535
535 if (current_vp->width - x >= len) 536 if (current_vp->width - x >= len)
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 5eb08b618f..347a46e8bd 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -177,8 +177,6 @@ extern void lcd_remote_puts(int x, int y, const unsigned char *str);
177extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...); 177extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...);
178extern void lcd_remote_puts_style(int x, int y, const unsigned char *str, 178extern void lcd_remote_puts_style(int x, int y, const unsigned char *str,
179 int style); 179 int style);
180extern void lcd_remote_puts_offset(int x, int y, const unsigned char *str,
181 int offset);
182extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, 180extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str,
183 int style, int offset); 181 int style, int offset);
184extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, 182extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str,
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index dd7c3ba80f..7c361d4097 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -207,7 +207,6 @@ extern void lcd_putsxy_style_offset(int x, int y, const unsigned char *str,
207extern void lcd_puts(int x, int y, const unsigned char *string); 207extern void lcd_puts(int x, int y, const unsigned char *string);
208extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); 208extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...);
209extern void lcd_puts_style(int x, int y, const unsigned char *string, int style); 209extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
210extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset);
211extern void lcd_putc(int x, int y, unsigned long ucs); 210extern void lcd_putc(int x, int y, unsigned long ucs);
212extern void lcd_puts_scroll(int x, int y, const unsigned char* string); 211extern void lcd_puts_scroll(int x, int y, const unsigned char* string);
213extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, 212extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string,