Sansa e200v2: bootloader: fit size

Max allowed size: 120860
Old thumb build: 128494
New thumb build: 118514 (fits!)

Disabled:
Logo;
alpha blending capabilities for bitmaps;
Arm stack unwinder (backtrace);

Related forum discussion: https://forums.rockbox.org/index.php/topic,54768.0.html

Fixes FS#12380

Change-Id: I978720d795cb0ef5169103e467cf8386c21d8e93

6 files changed, 13 insertions, 5 deletions

diff --git a/firmware/drivers/lcd-16bit-common.c b/firmware/drivers/lcd-16bit-common.c
index 9d24dfe16e..ab136bf238 100644
--- a/firmware/drivers/lcd-16bit-common.c
+++ b/firmware/drivers/lcd-16bit-common.c
@@ -335,7 +335,7 @@ void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width, int heig
     lcd_mono_bitmap_part(src, 0, 0, width, x, y, width, height);
 }
 
-
+#ifndef DISABLE_ALPHA_BITMAP
 /* About Rockbox' internal alpha channel format (for ALPHA_BPP == 4)
  *
  * For each pixel, 4bit of alpha information is stored in a byte-stream,
@@ -654,3 +654,4 @@ static void ICODE_ATTR lcd_alpha_bitmap_part_mix(
 
     BLEND_FINISH;
 }
+#endif /* !DISABLE_ALPHA_BITMAP */
\ No newline at end of file
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c
index d4ad218d14..6532ea5121 100644
--- a/firmware/drivers/lcd-16bit-vert.c
+++ b/firmware/drivers/lcd-16bit-vert.c
@@ -47,11 +47,13 @@
 extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_backdrop[];
 extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_bgcolor[];
 
+#ifndef DISABLE_ALPHA_BITMAP
 static void ICODE_ATTR lcd_alpha_bitmap_part_mix(const fb_data* image,
                                       const unsigned char *src, int src_x,
                                       int src_y, int x, int y,
                                       int width, int height,
                                       int stride_image, int stride_src);
+#endif /* !DISABLE_ALPHA_BITMAP */
 
 #include "lcd-color-common.c"
 #include "lcd-bitmap-common.c"
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index fbf6700f28..967878b2e4 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -47,12 +47,13 @@
 extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_backdrop[];
 extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_bgcolor[];
 
+#ifndef DISABLE_ALPHA_BITMAP
 static void ICODE_ATTR lcd_alpha_bitmap_part_mix(const fb_data* image,
                                       const unsigned char *src, int src_x,
                                       int src_y, int x, int y,
                                       int width, int height,
                                       int stride_image, int stride_src);
-
+#endif /* !DISABLE_ALPHA_BITMAP */
 #include "lcd-color-common.c"
 #include "lcd-bitmap-common.c"
 #include "lcd-16bit-common.c"
diff --git a/firmware/drivers/lcd-24bit.c b/firmware/drivers/lcd-24bit.c
index dbb7e543af..64ddf4a201 100644
--- a/firmware/drivers/lcd-24bit.c
+++ b/firmware/drivers/lcd-24bit.c
@@ -47,13 +47,13 @@
 
 extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_backdrop[];
 extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_bgcolor[];
-
+#ifndef DISABLE_ALPHA_BITMAP
 static void ICODE_ATTR lcd_alpha_bitmap_part_mix(const fb_data* image,
                                       const unsigned char *src, int src_x,
                                       int src_y, int x, int y,
                                       int width, int height,
                                       int stride_image, int stride_src);
-
+#endif /* !DISABLE_ALPHA_BITMAP */
 #include "lcd-color-common.c"
 #include "lcd-bitmap-common.c"
 
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 975c494b5a..75d31e3453 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -563,7 +563,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
 
         bits = font_get_bits(pf, *ucs);
 
-#if defined(MAIN_LCD) && defined(HAVE_LCD_COLOR)
+#if defined(MAIN_LCD) && defined(HAVE_LCD_COLOR) && !defined(DISABLE_ALPHA_BITMAP)
         if (pf->depth)
             lcd_alpha_bitmap_part(bits, ofs, 0, width, x, y,
                                   width - ofs, pf->height);
diff --git a/firmware/drivers/lcd-color-common.c b/firmware/drivers/lcd-color-common.c
index 5f83160dab..1ec965d816 100644
--- a/firmware/drivers/lcd-color-common.c
+++ b/firmware/drivers/lcd-color-common.c
@@ -166,6 +166,7 @@ void lcd_bitmap_transparent(const fb_data *src, int x, int y,
                                 STRIDE(SCREEN_MAIN, width, height), x, y, width, height);
 }
 
+#ifndef DISABLE_ALPHA_BITMAP
 /* draw alpha bitmap for anti-alias font */
 void ICODE_ATTR lcd_alpha_bitmap_part(const unsigned char *src, int src_x,
                                       int src_y, int stride, int x, int y,
@@ -173,6 +174,7 @@ void ICODE_ATTR lcd_alpha_bitmap_part(const unsigned char *src, int src_x,
 {
     lcd_alpha_bitmap_part_mix(NULL, src, src_x, src_y, x, y, width, height, 0, stride);
 }
+#endif /* !DISABLE_ALPHA_BITMAP */
 
 /* Draw a partial bitmap (mono or native) including alpha channel */
 void ICODE_ATTR lcd_bmp_part(const struct bitmap* bm, int src_x, int src_y,
@@ -181,10 +183,12 @@ void ICODE_ATTR lcd_bmp_part(const struct bitmap* bm, int src_x, int src_y,
     int bitmap_stride = LCD_FBSTRIDE(bm->width, bm->height);
     if (bm->format == FORMAT_MONO)
         lcd_mono_bitmap_part(bm->data, src_x, src_y, bm->width, x, y, width, height);
+#ifndef DISABLE_ALPHA_BITMAP
     else if (bm->alpha_offset > 0)
         lcd_alpha_bitmap_part_mix((fb_data*)bm->data, bm->data+bm->alpha_offset,
             src_x, src_y, x, y, width, height,
             bitmap_stride, ALIGN_UP(bm->width, 2));
+#endif /* !DISABLE_ALPHA_BITMAP */
     else
         lcd_bitmap_transparent_part((fb_data*)bm->data,
             src_x, src_y, bitmap_stride, x, y, width, height);