Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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>
  • Loading branch information
mcb30 committed Jan 22, 2014
1 parent 11ad259 commit 43c8c27
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/arch/i386/interface/pcbios/vesafb.c
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/hci/commands/console_cmd.c
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/include/ipxe/console.h
Expand Up @@ -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 */
Expand Down

0 comments on commit 43c8c27

Please sign in to comment.