Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 193df022 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: vt, too many commands per line in rgb_foreground 



Do not opencode max3, use the macro.

Separate commands. Until now, I have not noticed the comma. Make it
one line, one command. And make the code obvious.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f91e142

drivers/tty/vt/vt.c

+16 −11
Original line number Diff line number Diff line
@@ -1260,18 +1260,23 @@ static void rgb_from_256(int i, struct rgb *c) 


static void rgb_foreground(struct vc_data *vc, const struct rgb *c)

{

	u8 hue, max = c->r;

	if (c->g > max)

		max = c->g;

	if (c->b > max)

		max = c->b;

	hue = (c->r > max/2 ? 4 : 0)

	    | (c->g > max/2 ? 2 : 0)

	    | (c->b > max/2 ? 1 : 0);

	if (hue == 7 && max <= 0x55)

		hue = 0, vc->vc_intensity = 2;

	u8 hue = 0, max = max3(c->r, c->g, c->b);



	if (c->r > max / 2)

		hue |= 4;

	if (c->g > max / 2)

		hue |= 2;

	if (c->b > max / 2)

		hue |= 1;



	if (hue == 7 && max <= 0x55) {

		hue = 0;

		vc->vc_intensity = 2;

	} else if (max > 0xaa)

		vc->vc_intensity = 2;

	else

		vc->vc_intensity = (max > 0xaa) + 1;

		vc->vc_intensity = 1;



	vc->vc_color = (vc->vc_color & 0xf0) | hue;

}