Merge commit 'hdt-erwan/master' into for-erwan

diff --combined com32/hdt/hdt-cli-hdt.c
index 4f96b2d,b0ee034..76785a7
--- 1/com32/hdt/hdt-cli-hdt.c
--- 2/com32/hdt/hdt-cli-hdt.c
+++ b/com32/hdt/hdt-cli-hdt.c
@@@ -285,10 -285,6 +285,10 @@@ struct cli_callback_descr list_hdt_show
                .exec = main_show_cpu,
        },
        {
 +              .name = CLI_DISK,
 +              .exec = main_show_disk,
 +      },
 +      {
                .name = CLI_PXE,
                .exec = main_show_pxe,
        },
@@@ -309,6 -305,11 +309,11 @@@
                .exec = main_show_hdt,
        },
        {
+               .name = CLI_VPD,
+               .exec = main_show_vpd,
+       },
+ 
+       {
                .name = "modes",
                .exec = main_show_modes,
        },

diff --combined com32/hdt/hdt-cli.h
index 6f90e45,c51127e..9a8e15d
--- 1/com32/hdt/hdt-cli.h
--- 2/com32/hdt/hdt-cli.h
+++ b/com32/hdt/hdt-cli.h
@@@ -64,7 -64,6 +64,7 @@@
  #define CLI_COMMANDS "commands"
  #define CLI_DMI  "dmi"
  #define CLI_CPU  "cpu"
 +#define CLI_DISK  "disk"
  #define CLI_SHOW_LIST "list"
  #define CLI_IRQ "irq"
  #define CLI_MODES "modes"
@@@ -81,7 -80,6 +81,7 @@@ typedef enum 
        KERNEL_MODE,
        SYSLINUX_MODE,
        VESA_MODE,
 +      DISK_MODE,
        VPD_MODE,
  } cli_mode_t;
  
@@@ -140,7 -138,6 +140,7 @@@ struct cli_mode_descr kernel_mode
  struct cli_mode_descr cpu_mode;
  struct cli_mode_descr pci_mode;
  struct cli_mode_descr vesa_mode;
 +struct cli_mode_descr disk_mode;
  struct cli_mode_descr vpd_mode;
  
  /* cli helpers */
@@@ -176,9 -173,6 +176,9 @@@ void cli_detect_pci(struct s_hardware *
  // CPU STUFF
  void main_show_cpu(int argc, char **argv, struct s_hardware *hardware);
  
 +// DISK STUFF
 +void main_show_disk(int argc, char **argv, struct s_hardware *hardware);
 +
  // PXE STUFF
  void main_show_pxe(int argc, char **argv, struct s_hardware *hardware);
  
@@@ -190,4 -184,7 +190,7 @@@ void main_show_syslinux(int argc, char 
  
  // 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 --combined com32/hdt/hdt-menu.c
index 5cfe8ed,f2bafa4..a699f72
--- 1/com32/hdt/hdt-menu.c
--- 2/com32/hdt/hdt-menu.c
+++ b/com32/hdt/hdt-menu.c
@@@ -244,7 -244,7 +244,7 @@@ void compute_main_menu(struct s_hdt_men
    }
  
   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++;
    }
@@@ -293,7 -293,7 +293,7 @@@ void detect_hardware(struct s_hardware 
    printf("CPU: Detecting\n");
    cpu_detect(hardware);
  
 -  printf("DISKS: Detecting\n");
 +  printf("DISKS: Detecting");
    detect_disks(hardware);
  
    printf("DMI: Detecting Table\n");