From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 22 Jan 2014 13:22:32 +0000 (+0000)
Subject: [cmdline] Rename "console" command's --bpp option to --depth
X-Git-Tag: v1.20.1~1292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c8c272ae2fb17c85275c07bc5fecbf21fe1ab5;p=thirdparty%2Fipxe.git

[cmdline] Rename "console" command's --bpp option to --depth

Rename the "--bpp" option to "--depth", to free up the single-letter
option "-b" for "--bottom" in preparation for adding margin support.

This does not break backwards compatibility with documented features,
since the "console" command has not yet been documented.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/arch/i386/interface/pcbios/vesafb.c b/src/arch/i386/interface/pcbios/vesafb.c
index d4a7287a8..2adc7b040 100644
--- a/src/arch/i386/interface/pcbios/vesafb.c
+++ b/src/arch/i386/interface/pcbios/vesafb.c
@@ -419,7 +419,7 @@ static int vesafb_init ( struct console_configuration *config ) {
 	/* Select mode */
 	if ( ( mode_number = vesafb_select_mode ( mode_numbers, config->width,
 						  config->height,
-						  config->bpp ) ) < 0 ) {
+						  config->depth ) ) < 0 ) {
 		rc = mode_number;
 		goto err_select_mode;
 	}
diff --git a/src/hci/commands/console_cmd.c b/src/hci/commands/console_cmd.c
index 9bea27903..a82fa38fe 100644
--- a/src/hci/commands/console_cmd.c
+++ b/src/hci/commands/console_cmd.c
@@ -51,8 +51,8 @@ static struct option_descriptor console_opts[] = {
 		      struct console_options, config.width, parse_integer ),
 	OPTION_DESC ( "y", 'y', required_argument,
 		      struct console_options, config.height, parse_integer ),
-	OPTION_DESC ( "bpp", 'b', required_argument,
-		      struct console_options, config.bpp, parse_integer ),
+	OPTION_DESC ( "depth", 'd', required_argument,
+		      struct console_options, config.depth, parse_integer ),
 	OPTION_DESC ( "picture", 'p', required_argument,
 		      struct console_options, picture, parse_string ),
 	OPTION_DESC ( "keep", 'k', no_argument,
diff --git a/src/include/ipxe/console.h b/src/include/ipxe/console.h
index 6696a5b8d..4b90c9cec 100644
--- a/src/include/ipxe/console.h
+++ b/src/include/ipxe/console.h
@@ -27,7 +27,7 @@ struct console_configuration {
 	/** Height */
 	unsigned int height;
 	/** Colour depth */
-	unsigned int bpp;
+	unsigned int depth;
 	/** Left margin */
 	unsigned int left;
 	/** Right margin */