diff options
author | Erwan Velu <erwan.velu@free.fr> | 2009-11-24 10:24:49 +0100 |
---|---|---|
committer | Erwan Velu <erwan.velu@free.fr> | 2009-11-24 10:24:49 +0100 |
commit | 990205b434e7652c835cdb2dd86ef1c43eab7b44 (patch) | |
tree | 1b6b13f1871dc6f9e6e100109a8981ac134bc176 /com32/hdt/hdt-menu-summary.c | |
parent | 0179ef2c03b7e9ec5d5dd23fa178387515384fa4 (diff) | |
download | syslinux-990205b434e7652c835cdb2dd86ef1c43eab7b44.tar.gz |
hdt: Running Nindent
Impact: Visual cleanup
HDT now uses the same indent as syslinux
Diffstat (limited to 'com32/hdt/hdt-menu-summary.c')
-rw-r--r-- | com32/hdt/hdt-menu-summary.c | 253 |
1 files changed, 122 insertions, 131 deletions
diff --git a/com32/hdt/hdt-menu-summary.c b/com32/hdt/hdt-menu-summary.c index bd10cb23..53eaf61a 100644 --- a/com32/hdt/hdt-menu-summary.c +++ b/com32/hdt/hdt-menu-summary.c @@ -31,157 +31,148 @@ /* Computing Summary menu */ void compute_summarymenu(struct s_my_menu *menu, struct s_hardware *hardware) { - char buffer[SUBMENULEN + 1]; - char statbuffer[STATLEN + 1]; - - menu->menu = add_menu(" Summary ", -1); - menu->items_count = 0; - - set_menu_pos(SUBMENU_Y, SUBMENU_X); - - snprintf(buffer, sizeof buffer, "CPU Vendor : %s", - hardware->cpu.vendor); - snprintf(statbuffer, sizeof statbuffer, "CPU Vendor: %s", - hardware->cpu.vendor); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; - - snprintf(buffer, sizeof buffer, "CPU Model : %s", - hardware->cpu.model); - snprintf(statbuffer, sizeof statbuffer, "CPU Model: %s", - hardware->cpu.model); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; - - add_item("", "", OPT_SEP, "", 0); - if (hardware->is_dmi_valid == true) { - - snprintf(buffer, sizeof buffer, "System Vendor : %s", - hardware->dmi.system.manufacturer); - snprintf(statbuffer, sizeof statbuffer, "System Vendor: %s", - hardware->dmi.system.manufacturer); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; - - snprintf(buffer, sizeof buffer, "System Product: %s", - hardware->dmi.system.product_name); - snprintf(statbuffer, sizeof statbuffer, - "System Product Name: %s", - hardware->dmi.system.product_name); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + char buffer[SUBMENULEN + 1]; + char statbuffer[STATLEN + 1]; - snprintf(buffer, sizeof buffer, "System Serial : %s", - hardware->dmi.system.serial); - snprintf(statbuffer, sizeof statbuffer, - "System Serial Number: %s", - hardware->dmi.system.serial); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + menu->menu = add_menu(" Summary ", -1); + menu->items_count = 0; - add_item("", "", OPT_SEP, "", 0); + set_menu_pos(SUBMENU_Y, SUBMENU_X); - snprintf(buffer, sizeof buffer, "Bios Version : %s", - hardware->dmi.bios.version); - snprintf(statbuffer, sizeof statbuffer, "Bios Version: %s", - hardware->dmi.bios.version); + snprintf(buffer, sizeof buffer, "CPU Vendor : %s", hardware->cpu.vendor); + snprintf(statbuffer, sizeof statbuffer, "CPU Vendor: %s", + hardware->cpu.vendor); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - snprintf(buffer, sizeof buffer, "Bios Release : %s", - hardware->dmi.bios.release_date); - snprintf(statbuffer, sizeof statbuffer, "Bios Release Date: %s", - hardware->dmi.bios.release_date); + snprintf(buffer, sizeof buffer, "CPU Model : %s", hardware->cpu.model); + snprintf(statbuffer, sizeof statbuffer, "CPU Model: %s", + hardware->cpu.model); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - } - - add_item("", "", OPT_SEP, "", 0); - snprintf(buffer, sizeof buffer, "Memory Size : %lu MiB (%lu KiB)", - (hardware->detected_memory_size + (1<<9))>>10, - hardware->detected_memory_size); - snprintf(statbuffer, sizeof statbuffer, "Detected Memory Size: %lu MiB (%lu KiB)", - (hardware->detected_memory_size+(1<<9))>>10, hardware->detected_memory_size); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; + add_item("", "", OPT_SEP, "", 0); + if (hardware->is_dmi_valid == true) { + + snprintf(buffer, sizeof buffer, "System Vendor : %s", + hardware->dmi.system.manufacturer); + snprintf(statbuffer, sizeof statbuffer, "System Vendor: %s", + hardware->dmi.system.manufacturer); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + + snprintf(buffer, sizeof buffer, "System Product: %s", + hardware->dmi.system.product_name); + snprintf(statbuffer, sizeof statbuffer, + "System Product Name: %s", hardware->dmi.system.product_name); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + + snprintf(buffer, sizeof buffer, "System Serial : %s", + hardware->dmi.system.serial); + snprintf(statbuffer, sizeof statbuffer, + "System Serial Number: %s", hardware->dmi.system.serial); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + + add_item("", "", OPT_SEP, "", 0); + + snprintf(buffer, sizeof buffer, "Bios Version : %s", + hardware->dmi.bios.version); + snprintf(statbuffer, sizeof statbuffer, "Bios Version: %s", + hardware->dmi.bios.version); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + + snprintf(buffer, sizeof buffer, "Bios Release : %s", + hardware->dmi.bios.release_date); + snprintf(statbuffer, sizeof statbuffer, "Bios Release Date: %s", + hardware->dmi.bios.release_date); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - add_item("", "", OPT_SEP, "", 0); + add_item("", "", OPT_SEP, "", 0); - snprintf(buffer, sizeof buffer, "Nb PCI Devices: %d", - hardware->nb_pci_devices); - snprintf(statbuffer, sizeof statbuffer, "Number of PCI Devices: %d", - hardware->nb_pci_devices); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + snprintf(buffer, sizeof buffer, "Memory Size : %lu MiB (%lu KiB)", + (hardware->detected_memory_size + (1 << 9)) >> 10, + hardware->detected_memory_size); + snprintf(statbuffer, sizeof statbuffer, + "Detected Memory Size: %lu MiB (%lu KiB)", + (hardware->detected_memory_size + (1 << 9)) >> 10, + hardware->detected_memory_size); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - if (hardware->is_pxe_valid == true) { add_item("", "", OPT_SEP, "", 0); - struct s_pxe *p = &hardware->pxe; - - snprintf(buffer, sizeof buffer, "PXE MAC Address: %s", - p->mac_addr); - snprintf(statbuffer, sizeof statbuffer, "PXE MAC Address: %s", - p->mac_addr); + snprintf(buffer, sizeof buffer, "Nb PCI Devices: %d", + hardware->nb_pci_devices); + snprintf(statbuffer, sizeof statbuffer, "Number of PCI Devices: %d", + hardware->nb_pci_devices); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; - snprintf(buffer, sizeof buffer, "PXE IP Address : %d.%d.%d.%d", - p->ip_addr[0], p->ip_addr[1], p->ip_addr[2], - p->ip_addr[3]); - snprintf(statbuffer, sizeof statbuffer, - "PXE IP Address: %d.%d.%d.%d", p->ip_addr[0], - p->ip_addr[1], p->ip_addr[2], p->ip_addr[3]); - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); - menu->items_count++; - } + if (hardware->is_pxe_valid == true) { + add_item("", "", OPT_SEP, "", 0); - if (hardware->modules_pcimap_return_code != -ENOMODULESPCIMAP) { - add_item("", "", OPT_SEP, "", 0); + struct s_pxe *p = &hardware->pxe; + + snprintf(buffer, sizeof buffer, "PXE MAC Address: %s", p->mac_addr); + snprintf(statbuffer, sizeof statbuffer, "PXE MAC Address: %s", + p->mac_addr); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + + snprintf(buffer, sizeof buffer, "PXE IP Address : %d.%d.%d.%d", + p->ip_addr[0], p->ip_addr[1], p->ip_addr[2], p->ip_addr[3]); + snprintf(statbuffer, sizeof statbuffer, + "PXE IP Address: %d.%d.%d.%d", p->ip_addr[0], + p->ip_addr[1], p->ip_addr[2], p->ip_addr[3]); + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + } - bool kmod = false; - struct pci_device *pci_device; - char kernel_modules[LINUX_KERNEL_MODULE_SIZE * - MAX_KERNEL_MODULES_PER_PCI_DEVICE]; - - /* - * For every detected pci device, grab its kernel module to compute - * this submenu - */ - for_each_pci_func(pci_device, hardware->pci_domain) { - memset(kernel_modules, 0, sizeof kernel_modules); - for (int i = 0; - i < - pci_device->dev_info->linux_kernel_module_count; - i++) { - if (i > 0) { - strncat(kernel_modules, " | ", 3); - } - strncat(kernel_modules, - pci_device->dev_info-> - linux_kernel_module[i], - LINUX_KERNEL_MODULE_SIZE - 1); - } - /* No need to add unknown kernel modules */ - if (strlen(kernel_modules) > 0) { - snprintf(buffer, sizeof buffer, "%s (%s)", - kernel_modules, - pci_device->dev_info->class_name); - snprintf(statbuffer, sizeof statbuffer, - "%04x:%04x %s : %s", - pci_device->vendor, - pci_device->product, - pci_device->dev_info->vendor_name, - pci_device->dev_info->product_name); - - add_item(buffer, statbuffer, OPT_INACTIVE, NULL, - 0); - menu->items_count++; - kmod = true; - } + if (hardware->modules_pcimap_return_code != -ENOMODULESPCIMAP) { + add_item("", "", OPT_SEP, "", 0); + + bool kmod = false; + struct pci_device *pci_device; + char kernel_modules[LINUX_KERNEL_MODULE_SIZE * + MAX_KERNEL_MODULES_PER_PCI_DEVICE]; + + /* + * For every detected pci device, grab its kernel module to compute + * this submenu + */ + for_each_pci_func(pci_device, hardware->pci_domain) { + memset(kernel_modules, 0, sizeof kernel_modules); + for (int i = 0; + i < pci_device->dev_info->linux_kernel_module_count; i++) { + if (i > 0) { + strncat(kernel_modules, " | ", 3); + } + strncat(kernel_modules, + pci_device->dev_info->linux_kernel_module[i], + LINUX_KERNEL_MODULE_SIZE - 1); + } + /* No need to add unknown kernel modules */ + if (strlen(kernel_modules) > 0) { + snprintf(buffer, sizeof buffer, "%s (%s)", + kernel_modules, pci_device->dev_info->class_name); + snprintf(statbuffer, sizeof statbuffer, + "%04x:%04x %s : %s", + pci_device->vendor, + pci_device->product, + pci_device->dev_info->vendor_name, + pci_device->dev_info->product_name); + + add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); + menu->items_count++; + kmod = true; + } + } } - } - printf("MENU: Summary menu done (%d items)\n", menu->items_count); + printf("MENU: Summary menu done (%d items)\n", menu->items_count); } |