diff options
| -rw-r--r-- | com32/hdt/hdt-cli.c | 19 | ||||
| -rw-r--r-- | com32/hdt/hdt-menu-about.c | 16 | ||||
| -rw-r--r-- | com32/hdt/hdt.h | 4 |
3 files changed, 34 insertions, 5 deletions
diff --git a/com32/hdt/hdt-cli.c b/com32/hdt/hdt-cli.c index 51f68048..adfbf944 100644 --- a/com32/hdt/hdt-cli.c +++ b/com32/hdt/hdt-cli.c @@ -644,10 +644,25 @@ void show_main_help(struct s_hardware *hardware) more_printf(" %s\n", CLI_KERNEL); more_printf(" %s\n", CLI_SYSLINUX); more_printf(" %s\n", CLI_VESA); + more_printf(" %s\n", CLI_HDT); if (hardware->sv->filesystem == SYSLINUX_FS_PXELINUX) more_printf(" %s\n", CLI_PXE); } +void main_show_hdt(struct s_hardware *hardware) +{ + more_printf("HDT\n"); + more_printf(" Product : %s\n", PRODUCT_NAME); + more_printf(" Version : %s\n", VERSION); + more_printf(" Author : %s\n", AUTHOR); + more_printf(" Contact : %s\n", CONTACT); + char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS; + for (int c=0; c<NB_CONTRIBUTORS; c++) { + more_printf(" Contributor : %s\n", contributors[c]); + } +} + + void main_show(char *item, struct s_hardware *hardware) { if (!strncmp(item, CLI_SUMMARY, sizeof(CLI_SUMMARY))) { @@ -682,5 +697,9 @@ void main_show(char *item, struct s_hardware *hardware) main_show_vesa(hardware); return; } + if (!strncmp(item, CLI_HDT, sizeof(CLI_HDT))) { + main_show_hdt(hardware); + return; + } show_main_help(hardware); } diff --git a/com32/hdt/hdt-menu-about.c b/com32/hdt/hdt-menu-about.c index ad3a820e..a5c1b0e6 100644 --- a/com32/hdt/hdt-menu-about.c +++ b/com32/hdt/hdt-menu-about.c @@ -39,25 +39,33 @@ void compute_aboutmenu(struct s_my_menu *menu) set_menu_pos(SUBMENU_Y, SUBMENU_X); - snprintf(buffer, sizeof buffer, "Product : %s", PRODUCT_NAME); + snprintf(buffer, sizeof buffer, "Product : %s", PRODUCT_NAME); snprintf(statbuffer, sizeof statbuffer, "Product : %s", PRODUCT_NAME); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - snprintf(buffer, sizeof buffer, "Version : %s", VERSION); + snprintf(buffer, sizeof buffer, "Version : %s", VERSION); snprintf(statbuffer, sizeof statbuffer, "Version : %s", VERSION); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - snprintf(buffer, sizeof buffer, "Author : %s", AUTHOR); + snprintf(buffer, sizeof buffer, "Author : %s", AUTHOR); snprintf(statbuffer, sizeof statbuffer, "Author : %s", AUTHOR); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - snprintf(buffer, sizeof buffer, "Contact : %s", CONTACT); + snprintf(buffer, sizeof buffer, "Contact : %s", CONTACT); snprintf(statbuffer, sizeof statbuffer, "Contact : %s", CONTACT); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; + char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS; + for (int c=0; c<NB_CONTRIBUTORS; c++) { + snprintf(buffer, sizeof buffer, "Contributor : %s", contributors[c]); + snprintf(statbuffer, sizeof statbuffer, "Contributor : %s", contributors[c]); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } + printf("MENU: About menu done (%d items)\n", menu->items_count); } diff --git a/com32/hdt/hdt.h b/com32/hdt/hdt.h index 9f96200b..a3a58771 100644 --- a/com32/hdt/hdt.h +++ b/com32/hdt/hdt.h @@ -32,7 +32,9 @@ #define PRODUCT_NAME "Hardware Detection Tool" #define AUTHOR "Erwan Velu" #define CONTACT "erwan(dot)velu(point)free(dot)fr" -#define VERSION "0.2.4" +#define VERSION "0.2.5" +#define NB_CONTRIBUTORS 2 +#define CONTRIBUTORS {"Pierre-Alexandre Meyer", "Sebastien Gonzalve"} #define ATTR_PACKED __attribute__((packed)) |