commit f777ca1ddc4c5bd26418c0a7c110cb3a972a4a30
author Daisuke Nojiri <dnojiri@chromium.org> Fri Jul 31 15:22:35 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Aug 12 19:26:18 2015 +0000
tree e9028dca5de52c3d6e76456728c74d820767c9cc
parent 8849e5b212b60b57651bb91da175563179c917c8

fastboot: use video_printf instead of printf_color

This change makes fastboot use video_printf, which is renamed
from printf_color and moved under libpayload's video driver.

BUG=none
BRANCH=chromeos-2013.04
TEST=verified printed messages on Smaug
CQ-DEPEND=CL:290130

Change-Id: I24ac2a3faf8a7929e27b5fbc13d66554a8cd5f4f
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/290057
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit 1f8beef35420e19f70a9205a2d030aec93b5e1d2)
Reviewed-on: https://chromium-review.googlesource.com/290445
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>

src/vboot/fastboot.c

diff --git a/src/vboot/fastboot.c b/src/vboot/fastboot.c
index 6dd3b22..693ae50 100644
--- a/src/vboot/fastboot.c
+++ b/src/vboot/fastboot.c
@@ -155,28 +155,6 @@
 	power_off();
 }
 
-static void printf_color(int foreground, int background, const char *fmt, ...)
-{
-	int i, len;
-	char str[200];
-
-	va_list ap;
-	va_start(ap, fmt);
-	len = vsnprintf(str, 199, fmt, ap);
-	va_end(ap);
-	if (len <= 0)
-		return;
-	str[199] = '\0';
-
-	foreground &= 0xf;
-	foreground <<= 8;
-	background &= 0xf;
-	background <<= 12;
-
-	for (i = 0; i < len; i++)
-		video_console_putchar(str[i] | foreground | background);
-}
-
 void vboot_try_fastboot(void)
 {
 	static const struct {
@@ -223,23 +201,23 @@
 	video_get_rows_cols(&rows, &cols);
 
 	video_console_set_cursor(0, 3);
-	printf_color(7, 0, "<-- Button up: run selected option\n\n");
-	printf_color(7, 0, "<-- Button down: next option\n");
+	video_printf(7, 0, "<-- Button up: run selected option\n\n");
+	video_printf(7, 0, "<-- Button down: next option\n");
 
 	video_console_set_cursor(0, rows - 10);
 
 	// set cursor appropriately
-	printf_color(12, 0, "FASTBOOT MODE\n");
+	video_printf(12, 0, "FASTBOOT MODE\n");
 	/*
 	 * TODO: Show PRODUCT_NAME, VARIANT, HW VERSION, BOOTLOADER VERSION,
 	 * SERIAL NUMBER, SIGNING
 	 */
-	printf_color(12, 0, "DEVICE: %s\n",
+	video_printf(12, 0, "DEVICE: %s\n",
 		     fb_device_unlocked() ? "unlocked" : "locked");
 
 	while (1) {
 		video_console_set_cursor(0, 0);
-		printf_color(commands[position].color, 0, "%*s",
+		video_printf(commands[position].color, 0, "%*s",
 			-max_strlen, commands[position].text);
 		int keypress = getchar();
 		printf("got keypress %x\n", keypress);