From 8f64625888965d7eed46101fad8fc7fbd9e30f03 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Sat, 13 Apr 2013 18:17:16 +0200
Subject: lcd-common: Remove unused function lcd_puts_offset().

Change-Id: I39749bf3db915e5a8ddb6e6f25eb201ea0aaf981
---
 firmware/drivers/lcd-bitmap-common.c |  5 -----
 firmware/drivers/lcd-charcell.c      | 33 +++++++++++++++++----------------
 firmware/export/lcd-remote.h         |  2 --
 firmware/export/lcd.h                |  1 -
 4 files changed, 17 insertions(+), 24 deletions(-)

(limited to 'firmware')

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)
     LCDFN(puts_style_offset)(x, y, str, style, 0);
 }
 
-void LCDFN(puts_offset)(int x, int y, const unsigned char *str, int offset)
-{
-    LCDFN(puts_style_offset)(x, y, str, STYLE_DEFAULT, offset);
-}
-
 /*** scrolling ***/
 
 static 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, ...)
 
 /*** Line oriented text output ***/
 
+/* Put a string at a given char position,  skipping first offset chars */
+void lcd_putsofs(int x, int y, const unsigned char *str, int offset)
+{
+    if ((unsigned)y >= (unsigned)current_vp->height)
+        return;
+
+    /* make sure scrolling is turned off on the line we are updating */
+    lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
+
+    x = lcd_putsxyofs(x, y, offset, str);
+    while (x < current_vp->width)
+        lcd_putxchar(x++, y, xspace);
+}
+
+
 /* Put a string at a given char position */
 void lcd_puts(int x, int y, const unsigned char *str)
 {
-    lcd_puts_offset(x, y, str, 0);
+    lcd_putsofs(x, y, str, 0);
 }
 
 /* Formatting version of lcd_puts */
@@ -494,20 +509,6 @@ void lcd_putsf(int x, int y, const unsigned char *fmt, ...)
     lcd_puts(x, y, buf);
 }
 
-/* Put a string at a given char position,  skipping first offset chars */
-void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
-{
-    if ((unsigned)y >= (unsigned)current_vp->height)
-        return;
-
-    /* make sure scrolling is turned off on the line we are updating */
-    lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
-
-    x = lcd_putsxyofs(x, y, offset, str);
-    while (x < current_vp->width)
-        lcd_putxchar(x++, y, xspace);
-}
-
 /** scrolling **/
 
 void 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,
 
     s->start_tick = current_tick + lcd_scroll_info.delay;
 
-    lcd_puts_offset(x, y, string, offset);
+    lcd_putsofs(x, y, string, offset);
     len = utf8length(string);
 
     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);
 extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...);
 extern void lcd_remote_puts_style(int x, int y, const unsigned char *str,
                                   int style);
-extern void lcd_remote_puts_offset(int x, int y, const unsigned char *str,
-                                   int offset);
 extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str,
                                          int style, int offset);
 extern 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,
 extern void lcd_puts(int x, int y, const unsigned char *string);
 extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...);
 extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
-extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset);
 extern void lcd_putc(int x, int y, unsigned long ucs);
 extern void lcd_puts_scroll(int x, int y, const unsigned char* string);
 extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string,
-- 
cgit v1.2.3