OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2016-06-23 13:34:33 +02:00 committed by Greg Kroah-Hartman
parent 0f91e14264
commit 193df02279
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/tty/vt/vt.c
View File

@ -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;
}