merge with experimental

diff --git a/commands/lspci.c b/commands/lspci.c
index 5b3360a378023b7494d002e6b9e958f651e7954e..fd07ad8d64ca79fe1b8cf6ff46bbbd09078050fb 100644 (file)
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -20,7 +20,7 @@
 #include <grub/pci.h>
 #include <grub/dl.h>
 #include <grub/misc.h>
-#include <grub/command.h>
+#include <grub/extcmd.h>
 
 struct grub_pci_classname
 {
@@ -84,6 +84,7 @@ static const struct grub_pci_classname grub_pci_classes[] =
     { 11, 0x30, "MIPS Processor" },
     { 11, 0x40, "Co-Processor" },
     { 11, 0x80, "Unknown Processor" },
+    { 12, 3, "USB Controller" },
     { 12, 0x80, "Serial Bus Controller" },
     { 13, 0x80, "Wireless Controller" },
     { 14, 0, "I2O" },
@@ -114,12 +115,21 @@ grub_pci_get_class (int class, int subclass)
   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_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);
@@ -142,27 +152,73 @@ grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid)
 
   grub_printf ("\n");
 
+  if (iospace)
+    {
+      reg = 4;
+      for (i = 0; i < 6; i++)
+       {
+         grub_uint64_t space;
+         addr = grub_pci_make_address (dev, reg);
+         space = grub_pci_read (addr);
+
+         reg++;
+         
+         if (space == 0)
+           continue;
+         
+         switch (space & GRUB_PCI_ADDR_SPACE_MASK)
+           {
+           case GRUB_PCI_ADDR_SPACE_IO:
+             grub_printf ("\tIO space %d at 0x%llx\n", i, (unsigned long long) 
+                          (space & GRUB_PCI_ADDR_IO_MASK));
+             break;
+           case GRUB_PCI_ADDR_SPACE_MEMORY:
+             if ((space & GRUB_PCI_ADDR_MEM_TYPE_MASK) 
+                 == GRUB_PCI_ADDR_MEM_TYPE_64)
+               {
+                 space |= grub_pci_make_address (dev, reg);
+                 reg++;
+                 grub_printf ("\t64-bit memory space %d at 0x%016llx [%s]\n",
+                              i, (unsigned long long)
+                              (space & GRUB_PCI_ADDR_MEM_MASK),
+                              space & GRUB_PCI_ADDR_MEM_PREFETCH
+                              ? "prefetchable" : "non-prefetchable");
+                 
+               }
+             else
+               grub_printf ("\t32-bit memory space %d at 0x%016llx [%s]\n", i,
+                            (unsigned long long) 
+                            (space & GRUB_PCI_ADDR_MEM_MASK),
+                            space & GRUB_PCI_ADDR_MEM_PREFETCH
+                            ? "prefetchable" : "non-prefetchable");
+             break;
+           }
+       }
+    }
+
+
   return 0;
 }
 
 static grub_err_t
-grub_cmd_lspci (grub_command_t cmd __attribute__ ((unused)),
+grub_cmd_lspci (grub_extcmd_t cmd,
                int argc __attribute__ ((unused)),
                char **args __attribute__ ((unused)))
 {
+  iospace = cmd->state[0].set;
   grub_pci_iterate (grub_lspci_iter);
   return GRUB_ERR_NONE;
 }
 
-static grub_command_t cmd;
+static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(pci)
 {
-  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_unregister_command (cmd);
+  grub_unregister_extcmd (cmd);
 }