mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-13 08:31:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

video: Avoid using #ifdef in video-uclass.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(), etc., instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-20 18:10:37 -07:00 committed by Anatolij Gustschin
parent 775d33229f
commit 0c20aafe0b
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/video/video-uclass.c
View File

@ -92,8 +92,8 @@ int video_clear(struct udevice *dev)
struct video_priv *priv = dev_get_uclass_priv(dev); struct video_priv *priv = dev_get_uclass_priv(dev);
switch (priv->bpix) { switch (priv->bpix) {
#ifdef CONFIG_VIDEO_BPP16 case VIDEO_BPP16:
case VIDEO_BPP16: { if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
u16 *ppix = priv->fb; u16 *ppix = priv->fb;
u16 *end = priv->fb + priv->fb_size; u16 *end = priv->fb + priv->fb_size;
@ -101,9 +101,8 @@ int video_clear(struct udevice *dev)
*ppix++ = priv->colour_bg; *ppix++ = priv->colour_bg;
break; break;
} }
#endif case VIDEO_BPP32:
#ifdef CONFIG_VIDEO_BPP32 if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
case VIDEO_BPP32: {
u32 *ppix = priv->fb; u32 *ppix = priv->fb;
u32 *end = priv->fb + priv->fb_size; u32 *end = priv->fb + priv->fb_size;
@ -111,7 +110,6 @@ int video_clear(struct udevice *dev)
*ppix++ = priv->colour_bg; *ppix++ = priv->colour_bg;
break; break;
} }
#endif
default: default:
memset(priv->fb, priv->colour_bg, priv->fb_size); memset(priv->fb, priv->colour_bg, priv->fb_size);
break; break;
@ -125,14 +123,14 @@ void video_set_default_colors(struct udevice *dev, bool invert)
struct video_priv *priv = dev_get_uclass_priv(dev); struct video_priv *priv = dev_get_uclass_priv(dev);
int fore, back; int fore, back;
#ifdef CONFIG_SYS_WHITE_ON_BLACK if (CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK)) {
/* White is used when switching to bold, use light gray here */ /* White is used when switching to bold, use light gray here */
fore = VID_LIGHT_GRAY; fore = VID_LIGHT_GRAY;
back = VID_BLACK; back = VID_BLACK;
#else } else {
fore = VID_BLACK; fore = VID_BLACK;
back = VID_WHITE; back = VID_WHITE;
#endif }
if (invert) { if (invert) {
int temp; int temp;