dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-06 19:22:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

video: Avoid using #ifdef in console_rotate.c

Browse Source 
This code does not really need to use #ifdef. We can use if() instead and
gain build coverage without impacting code size.

Change the #ifdefs to use IS_ENABLED() instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-12-20 18:10:35 -07:00
committed by Anatolij Gustschin
parent 46421197d5
commit c656731901
1 changed files with 147 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

303
drivers/video/console_rotate.c
View File

@@ -22,33 +22,30 @@ static int console_set_row_1(struct udevice *dev, uint row, int clr)
(row + 1) * VIDEO_FONT_HEIGHT * pbytes; (row + 1) * VIDEO_FONT_HEIGHT * pbytes;
for (j = 0; j < vid_priv->ysize; j++) { for (j = 0; j < vid_priv->ysize; j++) {
switch (vid_priv->bpix) { switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8 case VIDEO_BPP8:
case VIDEO_BPP8: { if (IS_ENABLED(CONFIG_VIDEO_BPP8)) {
uint8_t *dst = line; uint8_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif case VIDEO_BPP16:
#ifdef CONFIG_VIDEO_BPP16 if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
case VIDEO_BPP16: { uint16_t *dst = line;
uint16_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif case VIDEO_BPP32:
#ifdef CONFIG_VIDEO_BPP32 if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
case VIDEO_BPP32: { uint32_t *dst = line;
uint32_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif
default: default:
return -ENOSYS; return -ENOSYS;
} }
@@ -99,39 +96,39 @@ static int console_putc_xy_1(struct udevice *dev, uint x_frac, uint y, char ch)
for (col = 0; col < VIDEO_FONT_HEIGHT; col++) { for (col = 0; col < VIDEO_FONT_HEIGHT; col++) {
switch (vid_priv->bpix) { switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8 case VIDEO_BPP8:
case VIDEO_BPP8: { if (IS_ENABLED(CONFIG_VIDEO_BPP8)) {
uint8_t *dst = line; uint8_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) { for (i = 0; i < VIDEO_FONT_HEIGHT; i++) {
*dst-- = (pfont[i] & mask) ? vid_priv->colour_fg *dst-- = (pfont[i] & mask) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
vid_priv->colour_bg;
}
break;
} }
break; case VIDEO_BPP16:
} if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
#endif uint16_t *dst = line;
#ifdef CONFIG_VIDEO_BPP16
case VIDEO_BPP16: {
uint16_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) { for (i = 0; i < VIDEO_FONT_HEIGHT; i++) {
*dst-- = (pfont[i] & mask) ? vid_priv->colour_fg *dst-- = (pfont[i] & mask) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
vid_priv->colour_bg;
}
break;
} }
break; case VIDEO_BPP32:
} if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
#endif uint32_t *dst = line;
#ifdef CONFIG_VIDEO_BPP32
case VIDEO_BPP32: {
uint32_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) { for (i = 0; i < VIDEO_FONT_HEIGHT; i++) {
*dst-- = (pfont[i] & mask) ? vid_priv->colour_fg *dst-- = (pfont[i] & mask) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
vid_priv->colour_bg;
}
break;
} }
break;
}
#endif
default: default:
return -ENOSYS; return -ENOSYS;
} }
@@ -153,33 +150,30 @@ static int console_set_row_2(struct udevice *dev, uint row, int clr)
line = vid_priv->fb + vid_priv->ysize * vid_priv->line_length - line = vid_priv->fb + vid_priv->ysize * vid_priv->line_length -
(row + 1) * VIDEO_FONT_HEIGHT * vid_priv->line_length; (row + 1) * VIDEO_FONT_HEIGHT * vid_priv->line_length;
switch (vid_priv->bpix) { switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8 case VIDEO_BPP8:
case VIDEO_BPP8: { if (IS_ENABLED(CONFIG_VIDEO_BPP8)) {
uint8_t *dst = line; uint8_t *dst = line;
for (i = 0; i < pixels; i++) for (i = 0; i < pixels; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif case VIDEO_BPP16:
#ifdef CONFIG_VIDEO_BPP16 if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
case VIDEO_BPP16: { uint16_t *dst = line;
uint16_t *dst = line;
for (i = 0; i < pixels; i++) for (i = 0; i < pixels; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif case VIDEO_BPP32:
#ifdef CONFIG_VIDEO_BPP32 if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
case VIDEO_BPP32: { uint32_t *dst = line;
uint32_t *dst = line;
for (i = 0; i < pixels; i++) for (i = 0; i < pixels; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif
default: default:
return -ENOSYS; return -ENOSYS;
} }
@@ -226,42 +220,42 @@ static int console_putc_xy_2(struct udevice *dev, uint x_frac, uint y, char ch)
uchar bits = video_fontdata[idx]; uchar bits = video_fontdata[idx];
switch (vid_priv->bpix) { switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8 case VIDEO_BPP8:
case VIDEO_BPP8: { if (IS_ENABLED(CONFIG_VIDEO_BPP8)) {
uint8_t *dst = line; uint8_t *dst = line;
for (i = 0; i < VIDEO_FONT_WIDTH; i++) { for (i = 0; i < VIDEO_FONT_WIDTH; i++) {
*dst-- = (bits & 0x80) ? vid_priv->colour_fg *dst-- = (bits & 0x80) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
bits <<= 1; vid_priv->colour_bg;
bits <<= 1;
}
break;
} }
break; case VIDEO_BPP16:
} if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
#endif uint16_t *dst = line;
#ifdef CONFIG_VIDEO_BPP16
case VIDEO_BPP16: {
uint16_t *dst = line;
for (i = 0; i < VIDEO_FONT_WIDTH; i++) { for (i = 0; i < VIDEO_FONT_WIDTH; i++) {
*dst-- = (bits & 0x80) ? vid_priv->colour_fg *dst-- = (bits & 0x80) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
bits <<= 1; vid_priv->colour_bg;
bits <<= 1;
}
break;
} }
break; case VIDEO_BPP32:
} if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
#endif uint32_t *dst = line;
#ifdef CONFIG_VIDEO_BPP32
case VIDEO_BPP32: {
uint32_t *dst = line;
for (i = 0; i < VIDEO_FONT_WIDTH; i++) { for (i = 0; i < VIDEO_FONT_WIDTH; i++) {
*dst-- = (bits & 0x80) ? vid_priv->colour_fg *dst-- = (bits & 0x80) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
bits <<= 1; vid_priv->colour_bg;
bits <<= 1;
}
break;
} }
break;
}
#endif
default: default:
return -ENOSYS; return -ENOSYS;
} }
@@ -281,33 +275,30 @@ static int console_set_row_3(struct udevice *dev, uint row, int clr)
line = vid_priv->fb + row * VIDEO_FONT_HEIGHT * pbytes; line = vid_priv->fb + row * VIDEO_FONT_HEIGHT * pbytes;
for (j = 0; j < vid_priv->ysize; j++) { for (j = 0; j < vid_priv->ysize; j++) {
switch (vid_priv->bpix) { switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8 case VIDEO_BPP8:
case VIDEO_BPP8: { if (IS_ENABLED(CONFIG_VIDEO_BPP8)) {
uint8_t *dst = line; uint8_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif case VIDEO_BPP16:
#ifdef CONFIG_VIDEO_BPP16 if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
case VIDEO_BPP16: { uint16_t *dst = line;
uint16_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif case VIDEO_BPP32:
#ifdef CONFIG_VIDEO_BPP32 if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
case VIDEO_BPP32: { uint32_t *dst = line;
uint32_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
*dst++ = clr; *dst++ = clr;
break; break;
} }
#endif
default: default:
return -ENOSYS; return -ENOSYS;
} }
@@ -356,39 +347,39 @@ static int console_putc_xy_3(struct udevice *dev, uint x_frac, uint y, char ch)
for (col = 0; col < VIDEO_FONT_HEIGHT; col++) { for (col = 0; col < VIDEO_FONT_HEIGHT; col++) {
switch (vid_priv->bpix) { switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8 case VIDEO_BPP8:
case VIDEO_BPP8: { if (IS_ENABLED(CONFIG_VIDEO_BPP8)) {
uint8_t *dst = line; uint8_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) { for (i = 0; i < VIDEO_FONT_HEIGHT; i++) {
*dst++ = (pfont[i] & mask) ? vid_priv->colour_fg *dst++ = (pfont[i] & mask) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
vid_priv->colour_bg;
}
break;
} }
break; case VIDEO_BPP16:
} if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
#endif uint16_t *dst = line;
#ifdef CONFIG_VIDEO_BPP16
case VIDEO_BPP16: {
uint16_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) { for (i = 0; i < VIDEO_FONT_HEIGHT; i++) {
*dst++ = (pfont[i] & mask) ? vid_priv->colour_fg *dst++ = (pfont[i] & mask) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
vid_priv->colour_bg;
}
break;
} }
break; case VIDEO_BPP32:
} if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
#endif uint32_t *dst = line;
#ifdef CONFIG_VIDEO_BPP32
case VIDEO_BPP32: {
uint32_t *dst = line;
for (i = 0; i < VIDEO_FONT_HEIGHT; i++) { for (i = 0; i < VIDEO_FONT_HEIGHT; i++) {
*dst++ = (pfont[i] & mask) ? vid_priv->colour_fg *dst++ = (pfont[i] & mask) ?
: vid_priv->colour_bg; vid_priv->colour_fg :
vid_priv->colour_bg;
}
break;
} }
break;
}
#endif
default: default:
return -ENOSYS; return -ENOSYS;
} }