All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Anatolij Gustschin <agust@denx.de>, Tom Rini <trini@konsulko.com>,
	Simon Glass <sjg@chromium.org>
Subject: [PATCH 16/23] video: Drop #ifdefs from video_bmp
Date: Fri, 19 Nov 2021 13:24:00 -0700	[thread overview]
Message-ID: <20211119202408.1815506-17-sjg@chromium.org> (raw)
In-Reply-To: <20211119202408.1815506-1-sjg@chromium.org>

Convert the current preprocessor macros to C code.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 drivers/video/video_bmp.c | 97 ++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 1c613567657..e8600b2def3 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -66,7 +66,6 @@ static void write_pix8(u8 *fb, uint bpix, struct bmp_color_table_entry *palette,
 	}
 }
 
-#ifdef CONFIG_VIDEO_BMP_RLE8
 static void draw_unencoded_bitmap(u8 **fbp, uint bpix, uchar *bmap,
 				  struct bmp_color_table_entry *palette,
 				  int cnt)
@@ -183,7 +182,6 @@ static void video_display_rle8_bitmap(struct udevice *dev,
 		}
 	}
 }
-#endif
 
 /**
  * video_splash_align_axis() - Align a single coordinate
@@ -294,16 +292,19 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
 
 	switch (bmp_bpix) {
 	case 1:
-	case 8: {
-#ifdef CONFIG_VIDEO_BMP_RLE8
-		u32 compression = get_unaligned_le32(&bmp->header.compression);
-		debug("compressed %d %d\n", compression, BMP_BI_RLE8);
-		if (compression == BMP_BI_RLE8) {
-			video_display_rle8_bitmap(dev, bmp, bpix, palette, fb,
-						  x, y, width, height);
-			break;
+	case 8:
+		if (IS_ENABLED(CONFIG_VIDEO_BMP_RLE8)) {
+			u32 compression = get_unaligned_le32(
+				&bmp->header.compression);
+			debug("compressed %d %d\n", compression, BMP_BI_RLE8);
+			if (compression == BMP_BI_RLE8) {
+				video_display_rle8_bitmap(dev, bmp, bpix, palette, fb,
+							  x, y, width, height);
+				break;
+			}
 		}
-#endif
+
+		/* Not compressed */
 		byte_width = width * (bpix / 8);
 		if (!byte_width)
 			byte_width = width;
@@ -319,56 +320,56 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
 			fb -= byte_width + priv->line_length;
 		}
 		break;
-	}
-#if defined(CONFIG_BMP_16BPP)
 	case 16:
-		for (i = 0; i < height; ++i) {
-			WATCHDOG_RESET();
-			for (j = 0; j < width; j++) {
-				*fb++ = *bmap++;
-				*fb++ = *bmap++;
+		if (IS_ENABLED(CONFIG_BMP_16BPP)) {
+			for (i = 0; i < height; ++i) {
+				WATCHDOG_RESET();
+				for (j = 0; j < width; j++) {
+					*fb++ = *bmap++;
+					*fb++ = *bmap++;
+				}
+				bmap += (padded_width - width);
+				fb -= width * 2 + priv->line_length;
 			}
-			bmap += (padded_width - width);
-			fb -= width * 2 + priv->line_length;
 		}
 		break;
-#endif /* CONFIG_BMP_16BPP */
-#if defined(CONFIG_BMP_24BPP)
 	case 24:
-		for (i = 0; i < height; ++i) {
-			for (j = 0; j < width; j++) {
-				if (bpix == 16) {
-					/* 16bit 565RGB format */
-					*(u16 *)fb = ((bmap[2] >> 3) << 11) |
-						((bmap[1] >> 2) << 5) |
-						(bmap[0] >> 3);
-					bmap += 3;
-					fb += 2;
-				} else {
-					*fb++ = *bmap++;
-					*fb++ = *bmap++;
-					*fb++ = *bmap++;
-					*fb++ = 0;
+		if (IS_ENABLED(CONFIG_BMP_24BPP)) {
+			for (i = 0; i < height; ++i) {
+				for (j = 0; j < width; j++) {
+					if (bpix == 16) {
+						/* 16bit 565RGB format */
+						*(u16 *)fb = ((bmap[2] >> 3)
+							<< 11) |
+							((bmap[1] >> 2) << 5) |
+							(bmap[0] >> 3);
+						bmap += 3;
+						fb += 2;
+					} else {
+						*fb++ = *bmap++;
+						*fb++ = *bmap++;
+						*fb++ = *bmap++;
+						*fb++ = 0;
+					}
 				}
+				fb -= priv->line_length + width * (bpix / 8);
+				bmap += (padded_width - width);
 			}
-			fb -= priv->line_length + width * (bpix / 8);
-			bmap += (padded_width - width);
 		}
 		break;
-#endif /* CONFIG_BMP_24BPP */
-#if defined(CONFIG_BMP_32BPP)
 	case 32:
-		for (i = 0; i < height; ++i) {
-			for (j = 0; j < width; j++) {
-				*fb++ = *bmap++;
-				*fb++ = *bmap++;
-				*fb++ = *bmap++;
-				*fb++ = *bmap++;
+		if (IS_ENABLED(CONFIG_BMP_32BPP)) {
+			for (i = 0; i < height; ++i) {
+				for (j = 0; j < width; j++) {
+					*fb++ = *bmap++;
+					*fb++ = *bmap++;
+					*fb++ = *bmap++;
+					*fb++ = *bmap++;
+				}
+				fb -= priv->line_length + width * (bpix / 8);
 			}
-			fb -= priv->line_length + width * (bpix / 8);
 		}
 		break;
-#endif /* CONFIG_BMP_32BPP */
 	default:
 		break;
 	};
-- 
2.34.0.rc2.393.gf8c9666880-goog


  parent reply	other threads:[~2021-11-19 20:28 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-19 20:23 [PATCH 00/23] video: Support a U-Boot logo more easily Simon Glass
2021-11-19 20:23 ` [PATCH 01/23] sandbox: video: Support 8bpp depth Simon Glass
2021-11-19 20:23 ` [PATCH 02/23] video: sandbox: Avoid duplicate display windows Simon Glass
2021-11-19 20:23 ` [PATCH 03/23] console: Avoid serial output before the console is running Simon Glass
2021-11-19 20:23 ` [PATCH 04/23] video: sandbox: Set a maximum frame-buffer size Simon Glass
2021-11-19 20:23 ` [PATCH 05/23] sandbox: video: Correct the address of the copy base Simon Glass
2021-11-19 20:23 ` [PATCH 06/23] sandbox: video: Add BMP tests for 32bpp and 8bpp modes Simon Glass
2021-11-19 20:23 ` [PATCH 07/23] video: Expand video debugging buffer size Simon Glass
2021-11-19 20:23 ` [PATCH 08/23] sandbox: Enable support for the gzip command Simon Glass
2021-11-19 20:23 ` [PATCH 09/23] video: Drop fb_put_byte() el at Simon Glass
2021-11-19 20:23 ` [PATCH 10/23] video: Move BMP pixel-writing into a function Simon Glass
2021-11-19 20:23 ` [PATCH 11/23] video: bmp: Update RLE8 support to use the write function Simon Glass
2021-11-19 20:23 ` [PATCH 12/23] video: Drop the uclass colour map Simon Glass
2021-11-19 20:23 ` [PATCH 13/23] video: Tidy up 24/32 BMP blitting Simon Glass
2021-11-19 20:23 ` [PATCH 14/23] video: Add a test for 16bpp BMP files Simon Glass
2021-11-19 20:23 ` [PATCH 15/23] video: theadorable: Use RGB565 for BMP blitting Simon Glass
2021-11-19 20:24 ` Simon Glass [this message]
2021-11-19 20:24 ` [PATCH 17/23] video: Convert CONFIG_VIDEO_LOGO to Kconfig Simon Glass
2022-01-22 13:26   ` Pali Rohár
2022-01-22 15:29     ` Tom Rini
2022-01-22 15:41       ` Pali Rohár
2022-01-22 18:41         ` Tom Rini
2022-01-23 14:48           ` Pali Rohár
2022-01-23 14:54             ` Tom Rini
2022-01-23 15:11               ` Pali Rohár
2022-01-23 16:14                 ` Tom Rini
2022-01-24  9:39                 ` Merlijn Wajer
2022-01-24 14:42                   ` Tom Rini
2022-01-22 17:17     ` Simon Glass
2021-11-19 20:24 ` [PATCH 18/23] video: Drop VIDEO_LOGO from cfb_console Simon Glass
2021-11-19 20:24 ` [PATCH 19/23] video: Support showing the U-Boot logo Simon Glass
2022-03-15 16:13   ` Tim Harvey
2022-03-28  6:35     ` Simon Glass
2022-03-28 18:50       ` Tim Harvey
2022-03-28 19:00         ` Fabio Estevam
2021-11-19 20:24 ` [PATCH 20/23] video: Show the U-Boot logo by default Simon Glass
2021-11-19 20:24 ` [PATCH 21/23] video: Support virtio devices with the splash screen Simon Glass
2021-11-23  2:08   ` Jaehoon Chung
2021-11-23  3:02     ` Peng Fan (OSS)
2021-11-19 20:24 ` [PATCH 22/23] x86: coreboot: Support getting a logo from virtio Simon Glass
2021-11-19 20:24 ` [PATCH 23/23] x86: coreboot: Add a sample script to build a qemu image Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211119202408.1815506-17-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=agust@denx.de \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.