From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 17 Jul 2020 10:31:31 -0400
Subject: [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
---
 apps/plugins/logo.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

(limited to 'apps/plugins/logo.c')

diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 60bed3b826..984a65aa34 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -29,7 +29,6 @@ static const struct button_mapping *plugin_contexts[]
 #endif
                         };
 
-#ifdef HAVE_LCD_BITMAP
 #define DISPLAY_WIDTH LCD_WIDTH
 #define DISPLAY_HEIGHT LCD_HEIGHT
 #define RAND_SCALE 5
@@ -48,19 +47,6 @@ static const struct button_mapping *plugin_contexts[]
 #define LOGO_WIDTH BMPWIDTH_rockboxlogo
 #define LOGO_HEIGHT BMPHEIGHT_rockboxlogo
 
-#else /* !LCD_BITMAP */
-#define DISPLAY_WIDTH 55
-#define DISPLAY_HEIGHT 14
-#define RAND_SCALE 2
-#define LOGO_WIDTH 16
-#define LOGO_HEIGHT 7
-#define LOGO rockbox16x7
-const unsigned char rockbox16x7[] = {
-    0x47, 0x18, 0xa6, 0xd8, 0x66, 0xde, 0xb7, 0x9b,
-    0x76, 0xdb, 0x26, 0xdb, 0x66, 0xde,
-};
-#endif /* !LCD_BITMAP */
-
 /* We use PLA */
 #define LP_QUIT              PLA_EXIT
 #define LP_QUIT2             PLA_CANCEL
@@ -88,7 +74,6 @@ enum plugin_status plugin_start(const void* parameter) {
     dy = rb->rand()%(2*RAND_SCALE+1) - RAND_SCALE;
 
     while (1) {
-#ifdef HAVE_LCD_BITMAP
         rb->lcd_clear_display();
         rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
 #ifdef REMOTE_LOGO
@@ -98,12 +83,6 @@ enum plugin_status plugin_start(const void* parameter) {
                 (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
                 REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);
 #endif
-#else
-        pgfx_clear_display();
-        pgfx_mono_bitmap(LOGO, x % 5, y, LOGO_WIDTH, LOGO_HEIGHT);
-        cpos = x / 5;
-#endif
-
         x += dx;
         if (x < 0) {
             dx = -dx;
@@ -124,18 +103,9 @@ enum plugin_status plugin_start(const void* parameter) {
             y = DISPLAY_HEIGHT - LOGO_HEIGHT;
         }
 
-#ifdef HAVE_LCD_BITMAP
         rb->lcd_update();
 #ifdef REMOTE_LOGO
         rb->lcd_remote_update();
-#endif
-#else
-        if (cpos != old_cpos) {
-            rb->lcd_clear_display();
-            pgfx_display(cpos, 0);
-            old_cpos = cpos;
-        }
-        pgfx_update();
 #endif
         rb->sleep(HZ/timer);
 
-- 
cgit v1.2.3