diff options
author | Erwan Velu <erwan.velu@free.fr> | 2009-02-22 23:20:53 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 20:58:44 -0800 |
commit | d0eea3df638a40eb32f0679020f7699595624052 (patch) | |
tree | 216913bf6cf42f9ef52cbac32dbc0b5546c21840 /com32/hdt/hdt-menu.c | |
parent | f1a8cf3349a7ceece3153eebe1cb6e4e6b254ab0 (diff) | |
download | syslinux-d0eea3df638a40eb32f0679020f7699595624052.tar.gz |
hdt: Adding CPU mode. cpu> show cpu DMI: Renaming processor to cpu Menu: Displaying number of elements for PCI,DISKS,MEMORY Bump to 0.1.9
Diffstat (limited to 'com32/hdt/hdt-menu.c')
-rw-r--r-- | com32/hdt/hdt-menu.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/com32/hdt/hdt-menu.c b/com32/hdt/hdt-menu.c index 6a8d660c..65129003 100644 --- a/com32/hdt/hdt-menu.c +++ b/com32/hdt/hdt-menu.c @@ -120,8 +120,9 @@ void setup_menu(char *version) { /* Compute Main' Submenus*/ void compute_submenus(struct s_hdt_menu *hdt_menu, struct s_hardware *hardware) { - /* Compute this menus if a DMI table exist */ - if (hardware->is_dmi_valid) { + + /* Compute this menus if a DMI table exist */ + if (hardware->is_dmi_valid) { if (hardware->dmi.base_board.filled==true) compute_motherboard(&(hdt_menu->mobo_menu),&(hardware->dmi)); if (hardware->dmi.chassis.filled==true) compute_chassis(&(hdt_menu->chassis_menu),&(hardware->dmi)); if (hardware->dmi.system.filled==true) compute_system(&(hdt_menu->system_menu),&(hardware->dmi)); @@ -146,7 +147,7 @@ void compute_submenus(struct s_hdt_menu *hdt_menu, struct s_hardware *hardware) } void compute_main_menu(struct s_hdt_menu *hdt_menu,struct s_hardware *hardware) { - + char menu_item[64]; /* Let's count the number of menu we have */ hdt_menu->total_menu_count=0; hdt_menu->main_menu.items_count=0; @@ -155,18 +156,21 @@ void compute_main_menu(struct s_hdt_menu *hdt_menu,struct s_hardware *hardware) set_item_options(-1,24); #ifdef WITH_PCI - add_item("PC<I> Devices","PCI Devices Menu",OPT_SUBMENU,NULL,hdt_menu->pci_menu.menu); + snprintf(menu_item, sizeof (menu_item), "PC<I> Devices(%2d)\n",hardware->nb_pci_devices); + add_item(menu_item,"PCI Devices Menu",OPT_SUBMENU,NULL,hdt_menu->pci_menu.menu); hdt_menu->main_menu.items_count++; hdt_menu->total_menu_count+=hdt_menu->pci_menu.items_count; #endif if (hdt_menu->disk_menu.items_count>0) { - add_item("<D>isks","Disks Menu",OPT_SUBMENU,NULL,hdt_menu->disk_menu.menu); + snprintf(menu_item, sizeof (menu_item), "<D>isks (%2d)\n",hdt_menu->disk_menu.items_count); + add_item(menu_item,"Disks Menu",OPT_SUBMENU,NULL,hdt_menu->disk_menu.menu); hdt_menu->main_menu.items_count++; hdt_menu->total_menu_count+=hdt_menu->disk_menu.items_count; } if (hdt_menu->memory_menu.items_count>0) { - add_item("<M>emory","Memory Menu",OPT_SUBMENU,NULL,hdt_menu->memory_menu.menu); + snprintf(menu_item, sizeof (menu_item), "<M>emory (%2d)\n",hdt_menu->memory_menu.items_count); + add_item(menu_item,"Memory Menu",OPT_SUBMENU,NULL,hdt_menu->memory_menu.menu); hdt_menu->main_menu.items_count++; hdt_menu->total_menu_count+=hdt_menu->memory_menu.items_count; } |