[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/39] hw/display/pxa2xx: Apply brace-related coding style fixes t
From: |
Peter Maydell |
Subject: |
[PULL 37/39] hw/display/pxa2xx: Apply brace-related coding style fixes to template header |
Date: |
Fri, 12 Mar 2021 13:51:38 +0000 |
We're about to move code from the template header into pxa2xx_lcd.c.
Before doing that, make coding style fixes so checkpatch doesn't
complain about the patch which moves the code. This commit fixes
missing braces in the SKIP_PIXEL() macro definition and in if()
statements.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210211141515.8755-8-peter.maydell@linaro.org
---
hw/display/pxa2xx_template.h | 47 +++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/hw/display/pxa2xx_template.h b/hw/display/pxa2xx_template.h
index 711fd9994e2..1c13d3ac007 100644
--- a/hw/display/pxa2xx_template.h
+++ b/hw/display/pxa2xx_template.h
@@ -9,7 +9,7 @@
* Framebuffer format conversion routines.
*/
-# define SKIP_PIXEL(to) to += deststep
+# define SKIP_PIXEL(to) do { to += deststep; } while (0)
# define COPY_PIXEL(to, from) \
do { \
*(uint32_t *) to = from; \
@@ -142,10 +142,11 @@ static void pxa2xx_draw_line16t(void *opaque,
data >>= 5;
r = (data & 0x1f) << 3;
data >>= 5;
- if (data & 1)
+ if (data & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
data >>= 1;
b = (data & 0x1f) << 3;
data >>= 5;
@@ -153,10 +154,11 @@ static void pxa2xx_draw_line16t(void *opaque,
data >>= 5;
r = (data & 0x1f) << 3;
data >>= 5;
- if (data & 1)
+ if (data & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
width -= 2;
src += 4;
}
@@ -248,10 +250,11 @@ static void pxa2xx_draw_line19(void *opaque,
data >>= 6;
r = (data & 0x3f) << 2;
data >>= 6;
- if (data & 1)
+ if (data & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
width -= 1;
src += 4;
}
@@ -281,10 +284,11 @@ static void pxa2xx_draw_line19p(void *opaque,
data[0] >>= 6;
r = (data[0] & 0x3f) << 2;
data[0] >>= 6;
- if (data[0] & 1)
+ if (data[0] & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
data[0] >>= 6;
b = (data[0] & 0x3f) << 2;
data[0] >>= 6;
@@ -292,10 +296,11 @@ static void pxa2xx_draw_line19p(void *opaque,
data[1] >>= 4;
r = (data[1] & 0x3f) << 2;
data[1] >>= 6;
- if (data[1] & 1)
+ if (data[1] & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
data[1] >>= 6;
b = (data[1] & 0x3f) << 2;
data[1] >>= 6;
@@ -303,10 +308,11 @@ static void pxa2xx_draw_line19p(void *opaque,
data[1] >>= 6;
r = ((data[2] & 0x3) << 6) | (data[1] << 2);
data[2] >>= 2;
- if (data[2] & 1)
+ if (data[2] & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
data[2] >>= 6;
b = (data[2] & 0x3f) << 2;
data[2] >>= 6;
@@ -314,10 +320,11 @@ static void pxa2xx_draw_line19p(void *opaque,
data[2] >>= 6;
r = data[2] << 2;
data[2] >>= 6;
- if (data[2] & 1)
+ if (data[2] & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
width -= 4;
}
}
@@ -359,10 +366,11 @@ static void pxa2xx_draw_line24t(void *opaque,
data >>= 8;
r = data & 0xff;
data >>= 8;
- if (data & 1)
+ if (data & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
width -= 1;
src += 4;
}
@@ -384,10 +392,11 @@ static void pxa2xx_draw_line25(void *opaque,
data >>= 8;
r = data & 0xff;
data >>= 8;
- if (data & 1)
+ if (data & 1) {
SKIP_PIXEL(dest);
- else
+ } else {
COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));
+ }
width -= 1;
src += 4;
}
--
2.20.1
- [PULL 19/39] tests/acceptance/boot_linux_console: remove Armbian 19.11.3 bionic test for orangepi-pc machine, (continued)
- [PULL 19/39] tests/acceptance/boot_linux_console: remove Armbian 19.11.3 bionic test for orangepi-pc machine, Peter Maydell, 2021/03/12
- [PULL 20/39] tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08, Peter Maydell, 2021/03/12
- [PULL 10/39] target/arm: Fix sve_uzp_p vs odd vector lengths, Peter Maydell, 2021/03/12
- [PULL 25/39] hw/arm/virt: KVM: The IPA lower bound is 32, Peter Maydell, 2021/03/12
- [PULL 22/39] tests/acceptance: drop ARMBIAN_ARTIFACTS_CACHED condition for orangepi-pc, cubieboard tests, Peter Maydell, 2021/03/12
- [PULL 30/39] tests/qtest: Test PWM fan RPM using MFT in PWM test, Peter Maydell, 2021/03/12
- [PULL 31/39] hw/display/pl110: Remove dead code for non-32-bpp surfaces, Peter Maydell, 2021/03/12
- [PULL 32/39] hw/display/pl110: Pull included-once parts of template header into pl110.c, Peter Maydell, 2021/03/12
- [PULL 28/39] hw/arm: Add MFT device to NPCM7xx Soc, Peter Maydell, 2021/03/12
- [PULL 33/39] hw/display/pl110: Remove use of BITS from pl110_template.h, Peter Maydell, 2021/03/12
- [PULL 37/39] hw/display/pxa2xx: Apply brace-related coding style fixes to template header,
Peter Maydell <=
- [PULL 38/39] hw/display/pxa2xx: Apply whitespace-only coding style fixes to template header, Peter Maydell, 2021/03/12
- [PULL 39/39] hw/display/pxa2xx: Inline template header, Peter Maydell, 2021/03/12
- [PULL 17/39] target/arm: Update sve reduction vs simd_desc, Peter Maydell, 2021/03/12
- [PULL 36/39] hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h, Peter Maydell, 2021/03/12