3 files changed, 10 insertions, 16 deletions

diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index d09d293c26..8e3b52c246 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -82,25 +82,19 @@ static void lcd_gradient_rect(int x1, int x2, int y, unsigned h,
 #endif
 
 /*
- * draws the borders of the viewport, or of current_vp if vp == NULL
+ * draws the borders of the current viewport
  **/
-void LCDFN(draw_viewport_rect)(const struct viewport *vp)
+void LCDFN(draw_border_viewport)(void)
 {
-    if (vp == NULL)
-        LCDFN(drawrect)(0, 0, current_vp->width, current_vp->height);
-    else
-        LCDFN(drawrect)(vp->x, vp->y, vp->width, vp->height);
+    LCDFN(drawrect)(0, 0, current_vp->width, current_vp->height);
 }
 
 /*
- * fills the rectangle formed by vp or by current_vp if vp == NULL
+ * fills the rectangle formed by current_vp
  **/
-void LCDFN(fill_viewport_rect)(const struct viewport *vp)
+void LCDFN(fill_viewport)(void)
 {
-    if (vp == NULL)
-        LCDFN(fillrect)(0, 0, current_vp->width, current_vp->height);
-    else
-        LCDFN(fillrect)(vp->x, vp->y, vp->width, vp->height);
+    LCDFN(fillrect)(0, 0, current_vp->width, current_vp->height);
 }
 
 /* put a string at a given pixel position, skipping first ofs pixel columns */
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 5a78fa2b07..9b5f397dff 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -178,8 +178,8 @@ extern void lcd_remote_hline(int x1, int x2, int y);
 extern void lcd_remote_vline(int x, int y1, int y2);
 extern void lcd_remote_drawrect(int x, int y, int width, int height);
 extern void lcd_remote_fillrect(int x, int y, int width, int height);
-extern void lcd_remote_draw_viewport_rect(const struct viewport *vp);
-extern void lcd_remote_fill_viewport_rect(const struct viewport *vp);
+extern void lcd_remote_draw_border_viewport(const struct viewport *vp);
+extern void lcd_remote_fill_viewport(const struct viewport *vp);
 extern void lcd_remote_bitmap_part(const fb_remote_data *src, int src_x,
                                    int src_y, int stride, int x, int y,
                                    int width, int height);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 3a01cbca61..79231d198e 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -507,8 +507,8 @@ extern void lcd_hline(int x1, int x2, int y);
 extern void lcd_vline(int x, int y1, int y2);
 extern void lcd_drawrect(int x, int y, int width, int height);
 extern void lcd_fillrect(int x, int y, int width, int height);
-extern void lcd_draw_viewport_rect(const struct viewport *vp);
-extern void lcd_fill_viewport_rect(const struct viewport *vp);
+extern void lcd_draw_border_viewport(void);
+extern void lcd_fill_viewport(void);
 extern void lcd_bitmap_part(const fb_data *src, int src_x, int src_y,
                             int stride, int x, int y, int width, int height);
 extern void lcd_bitmap(const fb_data *src, int x, int y, int width,