Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux into...

Conflicts:
	com32/hdt/hdt-cli-pci.c
	com32/hdt/hdt-cli-vesa.c
	com32/hdt/hdt-common.c
	com32/hdt/hdt-menu-dmi.c

diff --cc com32/hdt/hdt-cli-pci.c
index 39bc0fb,87c2bf9..2747b66
--- 1/com32/hdt/hdt-cli-pci.c
--- 2/com32/hdt/hdt-cli-pci.c
+++ b/com32/hdt/hdt-cli-pci.c
@@@ -33,193 -33,175 +33,216 @@@
  #include "hdt-cli.h"
  #include "hdt-common.h"
  
 -void show_pci_device(struct s_hardware *hardware, const char *item)
 +void main_show_pci(int argc __unused, char **argv __unused,
 +                 struct s_hardware *hardware)
  {
 -  int i = 0;
 -  struct pci_device *pci_device = NULL, *temp_pci_device;
 -  long pcidev = strtol(item, (char **)NULL, 10);
 -  bool nopciids = false;
 -  bool nomodulespcimap = false;
 -  char kernel_modules[LINUX_KERNEL_MODULE_SIZE *
 -          MAX_KERNEL_MODULES_PER_PCI_DEVICE];
 -  int bus = 0, slot = 0, func = 0;
 +      cli_detect_pci(hardware);
  
 -  if (errno == ERANGE) {
 -    printf("This PCI device number is incorrect\n");
 -    return;
 -  }
 -  if ((pcidev > hardware->nb_pci_devices) || (pcidev <= 0)) {
 -    printf("PCI device %d  doesn't exists\n", pcidev);
 -    return;
 -  }
 -  if (hardware->pci_ids_return_code == -ENOPCIIDS) {
 -    nopciids = true;
 -  }
 -  if (hardware->modules_pcimap_return_code == -ENOMODULESPCIMAP) {
 -    nomodulespcimap = true;
 -  }
 +      more_printf("PCI\n");
 +      more_printf(" NB Devices   : %d\n", hardware->nb_pci_devices);
 +}
  
 -  for_each_pci_func(temp_pci_device, hardware->pci_domain) {
 -    i++;
 -    if (i == pcidev) {
 -      bus = __pci_bus;
 -      slot = __pci_slot;
 -      func = __pci_func;
 -      pci_device = temp_pci_device;
 -    }
 -  }
 +static void show_pci_device(int argc, char **argv,
 +                          struct s_hardware *hardware)
 +{
 +      int i = 0;
 +      struct pci_device *pci_device = NULL, *temp_pci_device;
 +      int pcidev = -1;
 +      bool nopciids = false;
 +      bool nomodulespcimap = false;
 +      char kernel_modules[LINUX_KERNEL_MODULE_SIZE *
 +                          MAX_KERNEL_MODULES_PER_PCI_DEVICE];
 +      int bus = 0, slot = 0, func = 0;
  
 -  if (pci_device == NULL) {
 -    printf("We were enabled to find PCI device %d\n", pcidev);
 -    return;
 -  }
 +      /* Sanitize arguments */
 +      if (argc <= 0) {
 +              printf("show device <number>\n");
 +              return;
 +      } else
 +              pcidev = strtol(argv[0], (char **)NULL, 10);
  
 -  memset(kernel_modules, 0, sizeof kernel_modules);
 -  for (int kmod = 0;
 -       kmod < pci_device->dev_info->linux_kernel_module_count; kmod++) {
 -    if (kmod > 0) {
 -      strncat(kernel_modules, " | ", 3);
 -    }
 -    strncat(kernel_modules,
 -      pci_device->dev_info->linux_kernel_module[kmod],
 -      LINUX_KERNEL_MODULE_SIZE - 1);
 -  }
 -  if (pci_device->dev_info->linux_kernel_module_count == 0)
 -    strlcpy(kernel_modules, "unknown", 7);
 +      if (errno == ERANGE) {
 +              printf("This PCI device number is incorrect\n");
 +              return;
 +      }
 +      if ((pcidev > hardware->nb_pci_devices) || (pcidev <= 0)) {
 +              printf("PCI device %d doesn't exists\n", pcidev);
 +              return;
 +      }
 +      if (hardware->pci_ids_return_code == -ENOPCIIDS) {
 +              nopciids = true;
 +      }
 +      if (hardware->modules_pcimap_return_code == -ENOMODULESPCIMAP) {
 +              nomodulespcimap = true;
 +      }
  
 -  clear_screen();
 -  printf("PCI Device %d\n", pcidev);
 +      for_each_pci_func(temp_pci_device, hardware->pci_domain) {
 +              i++;
 +              if (i == pcidev) {
 +                      bus = __pci_bus;
 +                      slot = __pci_slot;
 +                      func = __pci_func;
 +                      pci_device = temp_pci_device;
 +              }
 +      }
  
 -  if (nopciids == false) {
 -    more_printf("Vendor Name   : %s\n",
 -          pci_device->dev_info->vendor_name);
 -    more_printf("Product Name  : %s\n",
 -          pci_device->dev_info->product_name);
 -    more_printf("Class Name    : %s\n",
 -          pci_device->dev_info->class_name);
 -  }
 +      if (pci_device == NULL) {
 +              printf("We were enabled to find PCI device %d\n", pcidev);
 +              return;
 +      }
  
 -  if (nomodulespcimap == false) {
 -    more_printf("Kernel module : %s\n", kernel_modules);
 -  }
 +      memset(kernel_modules, 0, sizeof kernel_modules);
 +      for (int kmod = 0;
 +           kmod < pci_device->dev_info->linux_kernel_module_count; kmod++) {
 +              if (kmod > 0) {
 +                      strncat(kernel_modules, " | ", 3);
 +              }
 +              strncat(kernel_modules,
 +                      pci_device->dev_info->linux_kernel_module[kmod],
 +                      LINUX_KERNEL_MODULE_SIZE - 1);
 +      }
 +      if (pci_device->dev_info->linux_kernel_module_count == 0)
 +              strlcpy(kernel_modules, "unknown", 7);
  
 -  more_printf("Vendor ID     : %04x\n", pci_device->vendor);
 -  more_printf("Product ID    : %04x\n", pci_device->product);
 -  more_printf("SubVendor ID  : %04x\n", pci_device->sub_vendor);
 -  more_printf("SubProduct ID : %04x\n", pci_device->sub_product);
 -  more_printf("Class ID      : %02x.%02x.%02x\n", pci_device->class[2],
 -        pci_device->class[1], pci_device->class[0]);
 -  more_printf("Revision      : %02x\n", pci_device->revision);
 -  if ((pci_device->dev_info->irq > 0)
 -      && (pci_device->dev_info->irq < 255))
 -    more_printf("IRQ           : %0d\n", pci_device->dev_info->irq);
 -  more_printf("Latency       : %0d\n",pci_device->dev_info->latency);
 -  more_printf("PCI Bus       : %02d\n", bus);
 -  more_printf("PCI Slot      : %02d\n", slot);
 -  more_printf("PCI Func      : %02d\n", func);
 +      printf("PCI Device %d\n", pcidev);
  
 -  if (hardware->is_pxe_valid == true) {
 -    more_printf("Mac Address   : %s\n", hardware->pxe.mac_addr);
 -    if ((hardware->pxe.pci_device != NULL)
 -        && (hardware->pxe.pci_device == pci_device))
 -      more_printf("PXE           : Current boot device\n");
 -  }
 +      if (nopciids == false) {
 +              printf("Vendor Name   : %s\n",
 +                          pci_device->dev_info->vendor_name);
 +              printf("Product Name  : %s\n",
 +                          pci_device->dev_info->product_name);
 +              printf("Class Name    : %s\n",
 +                          pci_device->dev_info->class_name);
 +      }
 +
 +      if (nomodulespcimap == false) {
 +              printf("Kernel module : %s\n", kernel_modules);
 +      }
 +
 +      printf("Vendor ID     : %04x\n", pci_device->vendor);
 +      printf("Product ID    : %04x\n", pci_device->product);
 +      printf("SubVendor ID  : %04x\n", pci_device->sub_vendor);
 +      printf("SubProduct ID : %04x\n", pci_device->sub_product);
 +      printf("Class ID      : %02x.%02x.%02x\n", pci_device->class[2],
 +                  pci_device->class[1], pci_device->class[0]);
 +      printf("Revision      : %02x\n", pci_device->revision);
 +      if ((pci_device->dev_info->irq > 0)
 +          && (pci_device->dev_info->irq < 255))
 +              more_printf("IRQ           : %0d\n", pci_device->dev_info->irq);
 +      printf("Latency       : %0d\n", pci_device->dev_info->latency);
 +      printf("PCI Bus       : %02d\n", bus);
 +      printf("PCI Slot      : %02d\n", slot);
 +      printf("PCI Func      : %02d\n", func);
 +
 +      if (hardware->is_pxe_valid == true) {
 +              if ((hardware->pxe.pci_device != NULL)
 +                  && (hardware->pxe.pci_device == pci_device)) {
 +                      printf("Mac Address   : %s\n", hardware->pxe.mac_addr);
 +                      printf("PXE           : Current boot device\n");
 +              }
 +      }
  }
  
 -static void show_pci_devices(struct s_hardware *hardware)
 +static void show_pci_devices(int argc __unused, char **argv __unused,
 +                           struct s_hardware *hardware)
  {
 -  int i = 1;
 -  struct pci_device *pci_device;
 -  char kernel_modules[LINUX_KERNEL_MODULE_SIZE *
 -          MAX_KERNEL_MODULES_PER_PCI_DEVICE];
 -  bool nopciids = false;
 -  bool nomodulespcimap = false;
 -  char first_line[81];
 -  char second_line[81];
 +      int i = 1;
 +      struct pci_device *pci_device;
 +      char kernel_modules[LINUX_KERNEL_MODULE_SIZE *
 +                          MAX_KERNEL_MODULES_PER_PCI_DEVICE];
 +      bool nopciids = false;
 +      bool nomodulespcimap = false;
 +      char first_line[81];
 +      char second_line[81];
  
 -  clear_screen();
 -  more_printf("%d PCI devices detected\n", hardware->nb_pci_devices);
 +      reset_more_printf();
 +      more_printf("%d PCI devices detected\n", hardware->nb_pci_devices);
  
 -  if (hardware->pci_ids_return_code == -ENOPCIIDS) {
 -    nopciids = true;
 -  }
 -  if (hardware->modules_pcimap_return_code == -ENOMODULESPCIMAP) {
 -    nomodulespcimap = true;
 -  }
 +      if (hardware->pci_ids_return_code == -ENOPCIIDS) {
 +              nopciids = true;
 +      }
 +      if (hardware->modules_pcimap_return_code == -ENOMODULESPCIMAP) {
 +              nomodulespcimap = true;
 +      }
  
 -  /* For every detected pci device, compute its submenu */
 -  for_each_pci_func(pci_device, hardware->pci_domain) {
 -    memset(kernel_modules, 0, sizeof kernel_modules);
 -    for (int kmod = 0;
 -         kmod < pci_device->dev_info->linux_kernel_module_count;
 -         kmod++) {
 -      if (kmod > 0) {
 -        strncat(kernel_modules, " | ", 3);
 -      }
 -      strncat(kernel_modules,
 -        pci_device->dev_info->linux_kernel_module[kmod],
 -        LINUX_KERNEL_MODULE_SIZE - 1);
 -    }
 -    if (pci_device->dev_info->linux_kernel_module_count == 0)
 -      strlcpy(kernel_modules, "unknown", 7);
 +      /* For every detected pci device, compute its submenu */
 +      for_each_pci_func(pci_device, hardware->pci_domain) {
 +              memset(kernel_modules, 0, sizeof kernel_modules);
 +              for (int kmod = 0;
 +                   kmod < pci_device->dev_info->linux_kernel_module_count;
 +                   kmod++) {
 +                      if (kmod > 0) {
 +                              strncat(kernel_modules, " | ", 3);
 +                      }
 +                      strncat(kernel_modules,
 +                              pci_device->dev_info->linux_kernel_module[kmod],
 +                              LINUX_KERNEL_MODULE_SIZE - 1);
 +              }
 +              if (pci_device->dev_info->linux_kernel_module_count == 0)
 +                      strlcpy(kernel_modules, "unknown", 7);
  
 -    if (nopciids == false) {
 -      snprintf(first_line, sizeof(first_line),
 -         "%02d: %s %s \n", i,
 -         pci_device->dev_info->vendor_name,
 -         pci_device->dev_info->product_name);
 -      if (nomodulespcimap == false)
 -        snprintf(second_line, sizeof(second_line),
 -           "    # %-25s # Kmod: %s\n",
 -           pci_device->dev_info->class_name,
 -           kernel_modules);
 -      else
 -        snprintf(second_line, sizeof(second_line),
 -           "    # %-25s # ID:%04x:%04x[%04x:%04x]\n",
 -           pci_device->dev_info->class_name,
 -           pci_device->vendor,
 -           pci_device->product,
 -           pci_device->sub_vendor,
 -           pci_device->sub_product);
 +              if (nopciids == false) {
 +                      snprintf(first_line, sizeof(first_line),
 +                               "%02d: %s %s \n", i,
 +                               pci_device->dev_info->vendor_name,
 +                               pci_device->dev_info->product_name);
 +                      if (nomodulespcimap == false)
 +                              snprintf(second_line, sizeof(second_line),
 +                                       "    # %-25s # Kmod: %s\n",
 +                                       pci_device->dev_info->class_name,
 +                                       kernel_modules);
 +                      else
 +                              snprintf(second_line, sizeof(second_line),
 +                                       "    # %-25s # ID:%04x:%04x[%04x:%04x]\n",
 +                                       pci_device->dev_info->class_name,
 +                                       pci_device->vendor,
 +                                       pci_device->product,
 +                                       pci_device->sub_vendor,
 +                                       pci_device->sub_product);
  
++<<<<<<< HEAD:com32/hdt/hdt-cli-pci.c
 +                      more_printf(first_line);
 +                      more_printf(second_line);
 +                      more_printf("\n");
 +              } else if (nopciids == true) {
 +                      if (nomodulespcimap == true) {
 +                              more_printf("%02d: %04x:%04x [%04x:%04x] \n",
 +                                          i, pci_device->vendor,
 +                                          pci_device->product,
 +                                          pci_device->sub_vendor,
 +                                          pci_device->sub_product);
 +                      } else {
 +                              more_printf
 +                                  ("%02d: %04x:%04x [%04x:%04x] Kmod:%s\n", i,
 +                                   pci_device->vendor, pci_device->product,
 +                                   pci_device->sub_vendor,
 +                                   pci_device->sub_product, kernel_modules);
 +                      }
 +              }
 +              i++;
 +      }
++=======
+       more_printf(first_line);
+       more_printf(second_line);
+       more_printf("\n");
+     } else if (nopciids == true) {
+       if (nomodulespcimap == true) {
+         more_printf("%02d: %04x:%04x [%04x:%04x] \n",
+               i, pci_device->vendor,
+               pci_device->product,
+               pci_device->sub_vendor,
+               pci_device->sub_product);
+       } else {
+         more_printf
+             ("%02d: %04x:%04x [%04x:%04x] Kmod:%s\n", i,
+              pci_device->vendor, pci_device->product,
+              pci_device->sub_vendor,
+              pci_device->sub_product, kernel_modules);
+       }
+     }
+     i++;
+   }
++>>>>>>> 6af3d0ea72a6f6852bda7519278a0c6fdd16d2b5:com32/hdt/hdt-cli-pci.c
  
  }