merge mainline into lspci

diff --cc commands/lspci.c
index 1eba10b,bcaafa4..ddfeb78
--- 1/commands/lspci.c
--- 2/commands/lspci.c
+++ b/commands/lspci.c
@@@ -115,25 -114,17 +115,26 @@@ grub_pci_get_class (int class, int subc
    return 0;
  }
  
 +static const struct grub_arg_option options[] =
 +  {
 +    {"iospace", 'i', 0, "show I/O spaces", 0, 0},
 +    {0, 0, 0, 0, 0, 0}
 +  };
 +
 +static int iospace;
 +
  static int NESTED_FUNC_ATTR
- grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid)
+ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
  {
    grub_uint32_t class;
    const char *sclass;
    grub_pci_address_t addr;
 +  int i, reg;
  
-   grub_printf ("%02x:%02x.%x %04x:%04x", bus, dev, func, pciid & 0xFFFF,
-              pciid >> 16);
-   addr = grub_pci_make_address (bus, dev, func, 2);
+   grub_printf ("%02x:%02x.%x %04x:%04x", grub_pci_get_bus (dev),
+              grub_pci_get_device (dev), grub_pci_get_function (dev),
+              pciid & 0xFFFF, pciid >> 16);
+   addr = grub_pci_make_address (dev, 2);
    class = grub_pci_read (addr);
  
    /* Lookup the class name, if there isn't a specific one,
@@@ -211,15 -155,15 +212,15 @@@ grub_cmd_lspci (grub_extcmd_t cmd
    return GRUB_ERR_NONE;
  }
  
 -static grub_command_t cmd;
 +static grub_extcmd_t cmd;
  
- GRUB_MOD_INIT(pci)
+ GRUB_MOD_INIT(lspci)
  {
 -  cmd = grub_register_command ("lspci", grub_cmd_lspci,
 -                             0, "List PCI devices");
 +  cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, GRUB_COMMAND_FLAG_BOTH,
 +                            "lspci [-i]", "List PCI devices", options);
  }
  
- GRUB_MOD_FINI(pci)
+ GRUB_MOD_FINI(lspci)
  {
 -  grub_unregister_command (cmd);
 +  grub_unregister_extcmd (cmd);
  }