diff options
author | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-04-26 14:37:00 -0700 |
---|---|---|
committer | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-04-26 14:37:00 -0700 |
commit | 777cc79b1a189878c9eeef41cfa396968fa247cd (patch) | |
tree | 830cf458b24ff3558908e41d8e1cf7261e6e9a11 | |
parent | 9c5868d154656e3832822dd24dd9701fe55eb2a4 (diff) | |
parent | fdd21ff85b3fa41641f711311f7e62081442dbe2 (diff) | |
download | syslinux-777cc79b1a189878c9eeef41cfa396968fa247cd.tar.gz |
Merge commit 'hdt-erwan/master' into for-erwan
-rw-r--r-- | com32/hdt/hdt-cli-hdt.c | 5 | ||||
-rw-r--r-- | com32/hdt/hdt-cli.h | 3 | ||||
-rw-r--r-- | com32/hdt/hdt-menu-vpd.c | 70 | ||||
-rw-r--r-- | com32/hdt/hdt-menu.c | 2 | ||||
-rw-r--r-- | com32/hdt/hdt.h | 2 |
5 files changed, 52 insertions, 30 deletions
diff --git a/com32/hdt/hdt-cli-hdt.c b/com32/hdt/hdt-cli-hdt.c index 4f96b2da..76785a79 100644 --- a/com32/hdt/hdt-cli-hdt.c +++ b/com32/hdt/hdt-cli-hdt.c @@ -309,6 +309,11 @@ struct cli_callback_descr list_hdt_show_modules[] = { .exec = main_show_hdt, }, { + .name = CLI_VPD, + .exec = main_show_vpd, + }, + + { .name = "modes", .exec = main_show_modes, }, diff --git a/com32/hdt/hdt-cli.h b/com32/hdt/hdt-cli.h index 6f90e453..9a8e15d7 100644 --- a/com32/hdt/hdt-cli.h +++ b/com32/hdt/hdt-cli.h @@ -190,4 +190,7 @@ void main_show_syslinux(int argc, char **argv, struct s_hardware *hardware); // VESA STUFF void main_show_vesa(int argc, char **argv, struct s_hardware *hardware); + +// VPD STUFF +void main_show_vpd(int argc __unused, char **argv __unused, struct s_hardware *hardware); #endif diff --git a/com32/hdt/hdt-menu-vpd.c b/com32/hdt/hdt-menu-vpd.c index 817c1079..49caf8ea 100644 --- a/com32/hdt/hdt-menu-vpd.c +++ b/com32/hdt/hdt-menu-vpd.c @@ -47,54 +47,68 @@ void compute_vpd(struct s_my_menu *menu, struct s_hardware *hardware) add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - snprintf(buffer, sizeof buffer, "Bios Build ID : %s", + if (strlen(hardware->vpd.bios_build_id) > 0) { + snprintf(buffer, sizeof buffer, "Bios Build ID : %s", hardware->vpd.bios_build_id); - snprintf(statbuffer, sizeof statbuffer, "Bios Build ID: %s", + snprintf(statbuffer, sizeof statbuffer, "Bios Build ID: %s", hardware->vpd.bios_build_id); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - snprintf(buffer, sizeof buffer, "Bios Release Date : %s", + if (strlen(hardware->vpd.bios_release_date) > 0) { + snprintf(buffer, sizeof buffer, "Bios Release Date : %s", hardware->vpd.bios_release_date); - snprintf(statbuffer, sizeof statbuffer, "Bios Release Date: %s", + snprintf(statbuffer, sizeof statbuffer, "Bios Release Date: %s", hardware->vpd.bios_release_date); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - snprintf(buffer, sizeof buffer, "Bios Version : %s", + if (strlen(hardware->vpd.bios_version) > 0) { + snprintf(buffer, sizeof buffer, "Bios Version : %s", hardware->vpd.bios_version); - snprintf(statbuffer, sizeof statbuffer, "Bios Version: %s", + snprintf(statbuffer, sizeof statbuffer, "Bios Version: %s", hardware->vpd.bios_version); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - snprintf(buffer, sizeof buffer, "Default Flash Filename : %s", + if (strlen(hardware->vpd.default_flash_filename) > 0) { + snprintf(buffer, sizeof buffer, "Default Flash Filename : %s", hardware->vpd.default_flash_filename); - snprintf(statbuffer, sizeof statbuffer, "Default Flash Filename: %s", + snprintf(statbuffer, sizeof statbuffer, "Default Flash Filename: %s", hardware->vpd.default_flash_filename); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - snprintf(buffer, sizeof buffer, "Box Serial Number : %s", + if (strlen(hardware->vpd.box_serial_number) > 0) { + snprintf(buffer, sizeof buffer, "Box Serial Number : %s", hardware->vpd.box_serial_number); - snprintf(statbuffer, sizeof statbuffer, "Box Serial Number: %s", + snprintf(statbuffer, sizeof statbuffer, "Box Serial Number: %s", hardware->vpd.box_serial_number); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - snprintf(buffer, sizeof buffer, "Motherboard Serial Number: %s", + if (strlen(hardware->vpd.motherboard_serial_number) > 0) { + snprintf(buffer, sizeof buffer, "Motherboard Serial Number: %s", hardware->vpd.motherboard_serial_number); - snprintf(statbuffer, sizeof statbuffer, "Motherboard Serial Number: %s", + snprintf(statbuffer, sizeof statbuffer, "Motherboard Serial Number: %s", hardware->vpd.motherboard_serial_number); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - snprintf(buffer, sizeof buffer, "Machine Type/Model : %s", + if (strlen(hardware->vpd.machine_type_model) > 0) { + snprintf(buffer, sizeof buffer, "Machine Type/Model : %s", hardware->vpd.machine_type_model); - snprintf(statbuffer, sizeof statbuffer, "Machine Type/Model: %s", + snprintf(statbuffer, sizeof statbuffer, "Machine Type/Model: %s", hardware->vpd.machine_type_model); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } printf("MENU: VPD menu done (%d items)\n", menu->items_count); } diff --git a/com32/hdt/hdt-menu.c b/com32/hdt/hdt-menu.c index 5cfe8eda..a699f72a 100644 --- a/com32/hdt/hdt-menu.c +++ b/com32/hdt/hdt-menu.c @@ -244,7 +244,7 @@ void compute_main_menu(struct s_hdt_menu *hdt_menu, struct s_hardware *hardware) } if (hardware->is_vpd_valid == true) { - add_item("VPD","VPD Information Menu", OPT_SUBMENU, NULL, + add_item("<V>PD","VPD Information Menu", OPT_SUBMENU, NULL, hdt_menu->vpd_menu.menu); hdt_menu->main_menu.items_count++; } diff --git a/com32/hdt/hdt.h b/com32/hdt/hdt.h index ad14923d..dfcb4368 100644 --- a/com32/hdt/hdt.h +++ b/com32/hdt/hdt.h @@ -32,7 +32,7 @@ #define PRODUCT_NAME "Hardware Detection Tool" #define AUTHOR "Erwan Velu" #define CONTACT "hdt@zytor.com" -#define VERSION "0.3.0" +#define VERSION "0.3.1" #define NB_CONTRIBUTORS 2 #define CONTRIBUTORS {"Pierre-Alexandre Meyer", "Sebastien Gonzalve"} |