From ea82e6e679c8a29563116142bc474357c552a353 Mon Sep 17 00:00:00 2001

From: Colin Watson <cjwatson@ubuntu.com>

Date: Sun, 13 Jan 2013 01:10:41 +0000

Subject: [PATCH 102/482] Remove nested functions from PCI iterators.

* grub-core/bus/pci.c (grub_pci_iterate): Add hook_data argument,

passed to hook.  Update all callers to pass appropriate hook data.

* grub-core/bus/emu/pci.c (grub_pci_iterate): Likewise.

* include/grub/pci.h (grub_pci_iteratefunc_t): Add data argument.

Remove NESTED_FUNC_ATTR from here and from all users.

(grub_pci_iterate): Update prototype.

* grub-core/bus/cs5536.c (grub_cs5536_find: hook): Make static

instead of nested.  Rename to ...

(grub_cs5536_find_iter): ... this.

* grub-core/kern/efi/mm.c (stop_broadcom: find_card): Likewise.

* grub-core/kern/mips/loongson/init.c (init_pci: set_card):

Likewise.

* grub-core/kern/vga_init.c (grub_qemu_init_cirrus: find_card):

Likewise.

* grub-core/video/bochs.c (grub_video_bochs_setup: find_card):

Likewise.

* grub-core/video/cirrus.c (grub_video_cirrus_setup: find_card):

Likewise.

* grub-core/video/efi_uga.c (find_framebuf: find_card): Likewise.

* grub-core/video/radeon_fuloong2e.c

(grub_video_radeon_fuloong2e_setup: find_card): Likewise.

* grub-core/video/sis315pro.c (grub_video_sis315pro_setup:

find_card): Likewise.

* grub-core/video/sm712.c (grub_video_sm712_setup: find_card):

Likewise.

---

 ChangeLog                           |  30 +++++++++

 grub-core/bus/cs5536.c              |  45 ++++++++------

 grub-core/bus/emu/pci.c             |   4 +-

 grub-core/bus/pci.c                 |   4 +-

 grub-core/bus/usb/ehci.c            |   7 ++-

 grub-core/bus/usb/ohci.c            |   8 +--

 grub-core/bus/usb/uhci.c            |   7 ++-

 grub-core/commands/efi/fixvideo.c   |   8 ++-

 grub-core/commands/lspci.c          |   8 ++-

 grub-core/commands/setpci.c         |   7 ++-

 grub-core/disk/ahci.c               |   7 ++-

 grub-core/disk/pata.c               |   7 ++-

 grub-core/kern/efi/mm.c             |  53 ++++++++--------

 grub-core/kern/mips/loongson/init.c |  74 +++++++++++-----------

 grub-core/kern/vga_init.c           |  61 +++++++++---------

 grub-core/video/bochs.c             |  46 +++++++-------

 grub-core/video/cirrus.c            |  46 +++++++-------

 grub-core/video/efi_uga.c           | 119 ++++++++++++++++++++----------------

 grub-core/video/radeon_fuloong2e.c  |  50 ++++++++-------

 grub-core/video/sis315pro.c         |  60 +++++++++---------

 grub-core/video/sm712.c             |  50 ++++++++-------

 include/grub/pci.h                  |   7 ++-

 22 files changed, 396 insertions(+), 312 deletions(-)

diff --git a/ChangeLog b/ChangeLog

index b527f7a..14bff81 100644

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,33 @@

+2013-01-13  Colin Watson  <cjwatson@ubuntu.com>

+

+	Remove nested functions from PCI iterators.

+

+	* grub-core/bus/pci.c (grub_pci_iterate): Add hook_data argument,

+	passed to hook.  Update all callers to pass appropriate hook data.

+	* grub-core/bus/emu/pci.c (grub_pci_iterate): Likewise.

+	* include/grub/pci.h (grub_pci_iteratefunc_t): Add data argument.

+	Remove NESTED_FUNC_ATTR from here and from all users.

+	(grub_pci_iterate): Update prototype.

+	* grub-core/bus/cs5536.c (grub_cs5536_find: hook): Make static

+	instead of nested.  Rename to ...

+	(grub_cs5536_find_iter): ... this.

+	* grub-core/kern/efi/mm.c (stop_broadcom: find_card): Likewise.

+	* grub-core/kern/mips/loongson/init.c (init_pci: set_card):

+	Likewise.

+	* grub-core/kern/vga_init.c (grub_qemu_init_cirrus: find_card):

+	Likewise.

+	* grub-core/video/bochs.c (grub_video_bochs_setup: find_card):

+	Likewise.

+	* grub-core/video/cirrus.c (grub_video_cirrus_setup: find_card):

+	Likewise.

+	* grub-core/video/efi_uga.c (find_framebuf: find_card): Likewise.

+	* grub-core/video/radeon_fuloong2e.c

+	(grub_video_radeon_fuloong2e_setup: find_card): Likewise.

+	* grub-core/video/sis315pro.c (grub_video_sis315pro_setup:

+	find_card): Likewise.

+	* grub-core/video/sm712.c (grub_video_sm712_setup: find_card):

+	Likewise.

+

 2013-01-12  Vladimir Serbinenko  <phcoder@gmail.com>

 	* grub-core/commands/verify.c: Mark messages for translating.

diff --git a/grub-core/bus/cs5536.c b/grub-core/bus/cs5536.c

index 9e7796e..bb9aa27 100644

--- a/grub-core/bus/cs5536.c

+++ b/grub-core/bus/cs5536.c

@@ -29,28 +29,39 @@

 GRUB_MOD_LICENSE ("GPLv3+");

+/* Context for grub_cs5536_find.  */

+struct grub_cs5536_find_ctx

+{

+  grub_pci_device_t *devp;

+  int found;

+};

+

+/* Helper for grub_cs5536_find.  */

+static int

+grub_cs5536_find_iter (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)

+{

+  struct grub_cs5536_find_ctx *ctx = data;

+

+  if (pciid == GRUB_CS5536_PCIID)

+    {

+      *ctx->devp = dev;

+      ctx->found = 1;

+      return 1;

+    }

+  return 0;

+}

+

 int

 grub_cs5536_find (grub_pci_device_t *devp)

 {

-  int found = 0;

-  auto int NESTED_FUNC_ATTR hook (grub_pci_device_t dev,

-				  grub_pci_id_t pciid);

-

-  int NESTED_FUNC_ATTR hook (grub_pci_device_t dev,

-			     grub_pci_id_t pciid)

-  {

-    if (pciid == GRUB_CS5536_PCIID)

-      {

-	*devp = dev;

-	found = 1;

-	return 1;

-      }

-    return 0;

-  }

+  struct grub_cs5536_find_ctx ctx = {

+    .devp = devp,

+    .found = 0

+  };

-  grub_pci_iterate (hook);

+  grub_pci_iterate (grub_cs5536_find_iter, &ctx;;

-  return found;

+  return ctx.found;

 }

 grub_uint64_t

diff --git a/grub-core/bus/emu/pci.c b/grub-core/bus/emu/pci.c

index d1beb56..9d32963 100644

--- a/grub-core/bus/emu/pci.c

+++ b/grub-core/bus/emu/pci.c

@@ -32,7 +32,7 @@ grub_pci_make_address (grub_pci_device_t dev, int reg)

 }

 void

-grub_pci_iterate (grub_pci_iteratefunc_t hook)

+grub_pci_iterate (grub_pci_iteratefunc_t hook, void *hook_data)

 {

   struct pci_device_iterator *iter;

   struct pci_slot_match slot;

@@ -43,7 +43,7 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)

   slot.func = PCI_MATCH_ANY;

   iter = pci_slot_match_iterator_create (&slot);

   while ((dev = pci_device_next (iter)))

-    hook (dev, dev->vendor_id | (dev->device_id << 16));

+    hook (dev, dev->vendor_id | (dev->device_id << 16), hook_data);

   pci_iterator_destroy (iter);

 }

diff --git a/grub-core/bus/pci.c b/grub-core/bus/pci.c

index 17dea30..b388ce5 100644

--- a/grub-core/bus/pci.c

+++ b/grub-core/bus/pci.c

@@ -98,7 +98,7 @@ grub_pci_make_address (grub_pci_device_t dev, int reg)

 }

 void

-grub_pci_iterate (grub_pci_iteratefunc_t hook)

+grub_pci_iterate (grub_pci_iteratefunc_t hook, void *hook_data)

 {

   grub_pci_device_t dev;

   grub_pci_address_t addr;

@@ -125,7 +125,7 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)

 		    continue;

 		}

-	      if (hook (dev, id))

+	      if (hook (dev, id, hook_data))

 		return;

 	      /* Probe only func = 0 if the device if not multifunction */

diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c

index dc5bf71..b9872b6 100644

--- a/grub-core/bus/usb/ehci.c

+++ b/grub-core/bus/usb/ehci.c

@@ -454,8 +454,9 @@ grub_ehci_reset (struct grub_ehci *e)

 }

 /* PCI iteration function... */

-static int NESTED_FUNC_ATTR

-grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)

+static int

+grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,

+		    void *data __attribute__ ((unused)))

 {

   grub_uint8_t release;

   grub_uint32_t class_code;

@@ -1814,7 +1815,7 @@ grub_ehci_detect_dev (grub_usb_controller_t dev, int port, int *changed)

 static void

 grub_ehci_inithw (void)

 {

-  grub_pci_iterate (grub_ehci_pci_iter);

+  grub_pci_iterate (grub_ehci_pci_iter, NULL);

 }

 static grub_err_t

diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c

index 6fabb4b..b10a9a3 100644

--- a/grub-core/bus/usb/ohci.c

+++ b/grub-core/bus/usb/ohci.c

@@ -213,9 +213,9 @@ grub_ohci_writereg32 (struct grub_ohci *o,

 /* Iterate over all PCI devices.  Determine if a device is an OHCI

    controller.  If this is the case, initialize it.  */

-static int NESTED_FUNC_ATTR

-grub_ohci_pci_iter (grub_pci_device_t dev,

-		    grub_pci_id_t pciid)

+static int

+grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,

+		    void *data __attribute__ ((unused)))

 {

   grub_uint32_t interf;

   grub_uint32_t base;

@@ -477,7 +477,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,

 static void

 grub_ohci_inithw (void)

 {

-  grub_pci_iterate (grub_ohci_pci_iter);

+  grub_pci_iterate (grub_ohci_pci_iter, NULL);

 }

diff --git a/grub-core/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c

index 8f60850..e405b33 100644

--- a/grub-core/bus/usb/uhci.c

+++ b/grub-core/bus/usb/uhci.c

@@ -185,9 +185,10 @@ grub_uhci_portstatus (grub_usb_controller_t dev,

 /* Iterate over all PCI devices.  Determine if a device is an UHCI

    controller.  If this is the case, initialize it.  */

-static int NESTED_FUNC_ATTR

+static int

 grub_uhci_pci_iter (grub_pci_device_t dev,

-		    grub_pci_id_t pciid __attribute__((unused)))

+		    grub_pci_id_t pciid __attribute__((unused)),

+		    void *data __attribute__ ((unused)))

 {

   grub_uint32_t class_code;

   grub_uint32_t class;

@@ -351,7 +352,7 @@ grub_uhci_pci_iter (grub_pci_device_t dev,

 static void

 grub_uhci_inithw (void)

 {

-  grub_pci_iterate (grub_uhci_pci_iter);

+  grub_pci_iterate (grub_uhci_pci_iter, NULL);

 }

 static grub_uhci_td_t

diff --git a/grub-core/commands/efi/fixvideo.c b/grub-core/commands/efi/fixvideo.c

index 3ed40b3..d9d54a2 100644

--- a/grub-core/commands/efi/fixvideo.c

+++ b/grub-core/commands/efi/fixvideo.c

@@ -23,6 +23,7 @@

 #include <grub/pci.h>

 #include <grub/command.h>

 #include <grub/i18n.h>

+#include <grub/mm.h>

 GRUB_MOD_LICENSE ("GPLv3+");

@@ -40,8 +41,9 @@ static struct grub_video_patch

     {0, 0, 0, 0, 0}

   };

-static int NESTED_FUNC_ATTR

-scan_card (grub_pci_device_t dev, grub_pci_id_t pciid)

+static int

+scan_card (grub_pci_device_t dev, grub_pci_id_t pciid,

+	   void *data __attribute__ ((unused)))

 {

   grub_pci_address_t addr;

@@ -93,7 +95,7 @@ grub_cmd_fixvideo (grub_command_t cmd __attribute__ ((unused)),

 		   int argc __attribute__ ((unused)),

 		   char *argv[] __attribute__ ((unused)))

 {

-  grub_pci_iterate (scan_card);

+  grub_pci_iterate (scan_card, NULL);

   return 0;

 }

diff --git a/grub-core/commands/lspci.c b/grub-core/commands/lspci.c

index 9f83629..65213a3 100644

--- a/grub-core/commands/lspci.c

+++ b/grub-core/commands/lspci.c

@@ -22,6 +22,7 @@

 #include <grub/misc.h>

 #include <grub/extcmd.h>

 #include <grub/i18n.h>

+#include <grub/mm.h>

 GRUB_MOD_LICENSE ("GPLv3+");

@@ -126,8 +127,9 @@ static const struct grub_arg_option options[] =

 static int iospace;

-static int NESTED_FUNC_ATTR

-grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)

+static int

+grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,

+		 void *data __attribute__ ((unused)))

 {

   grub_uint32_t class;

   const char *sclass;

@@ -218,7 +220,7 @@ grub_cmd_lspci (grub_extcmd_context_t ctxt,

 		char **args __attribute__ ((unused)))

 {

   iospace = ctxt->state[0].set;

-  grub_pci_iterate (grub_lspci_iter);

+  grub_pci_iterate (grub_lspci_iter, NULL);

   return GRUB_ERR_NONE;

 }

diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c

index fcfec40..6fdf0e0 100644

--- a/grub-core/commands/setpci.c

+++ b/grub-core/commands/setpci.c

@@ -83,8 +83,9 @@ static int regsize;

 static grub_uint16_t regaddr;

 static const char *varname;

-static int NESTED_FUNC_ATTR

-grub_setpci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)

+static int

+grub_setpci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,

+		  void *data __attribute__ ((unused)))

 {

   grub_uint32_t regval = 0;

   grub_pci_address_t addr;

@@ -320,7 +321,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)

     return grub_error (GRUB_ERR_BAD_ARGUMENT,

 		       "option -v isn't valid for writes");

-  grub_pci_iterate (grub_setpci_iter);

+  grub_pci_iterate (grub_setpci_iter, NULL);

   return GRUB_ERR_NONE;

 }

diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c

index 4ab2d18..f229ff1 100644

--- a/grub-core/disk/ahci.c

+++ b/grub-core/disk/ahci.c

@@ -254,9 +254,10 @@ init_port (struct grub_ahci_device *dev)

   return 1;

 }

-static int NESTED_FUNC_ATTR

+static int

 grub_ahci_pciinit (grub_pci_device_t dev,

-		   grub_pci_id_t pciid __attribute__ ((unused)))

+		   grub_pci_id_t pciid __attribute__ ((unused)),

+		   void *data __attribute__ ((unused)))

 {

   grub_pci_address_t addr;

   grub_uint32_t class;

@@ -394,7 +395,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,

 static grub_err_t

 grub_ahci_initialize (void)

 {

-  grub_pci_iterate (grub_ahci_pciinit);

+  grub_pci_iterate (grub_ahci_pciinit, NULL);

   return grub_errno;

 }

diff --git a/grub-core/disk/pata.c b/grub-core/disk/pata.c

index 00b04e2..07c3d7f 100644

--- a/grub-core/disk/pata.c

+++ b/grub-core/disk/pata.c

@@ -338,9 +338,10 @@ grub_pata_device_initialize (int port, int device, int addr)

 }

 #ifndef GRUB_MACHINE_MIPS_QEMU_MIPS

-static int NESTED_FUNC_ATTR

+static int

 grub_pata_pciinit (grub_pci_device_t dev,

-		   grub_pci_id_t pciid)

+		   grub_pci_id_t pciid,

+		   void *data __attribute__ ((unused)))

 {

   static int compat_use[2] = { 0 };

   grub_pci_address_t addr;

@@ -446,7 +447,7 @@ grub_pata_pciinit (grub_pci_device_t dev,

 static grub_err_t

 grub_pata_initialize (void)

 {

-  grub_pci_iterate (grub_pata_pciinit);

+  grub_pci_iterate (grub_pata_pciinit, NULL);

   return 0;

 }

 #else

diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

index a2edc84..351317b 100644

--- a/grub-core/kern/efi/mm.c

+++ b/grub-core/kern/efi/mm.c

@@ -109,37 +109,36 @@ grub_efi_free_pages (grub_efi_physical_address_t address,

 #if defined (__i386__) || defined (__x86_64__)

-static void

-stop_broadcom (void)

+/* Helper for stop_broadcom.  */

+static int

+find_card (grub_pci_device_t dev, grub_pci_id_t pciid,

+	   void *data __attribute__ ((unused)))

 {

-  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,

-				       grub_pci_id_t pciid);

-

-  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,

-				  grub_pci_id_t pciid)

-    {

-      grub_pci_address_t addr;

-      grub_uint8_t cap;

-      grub_uint16_t pm_state;

+  grub_pci_address_t addr;

+  grub_uint8_t cap;

+  grub_uint16_t pm_state;

-      if ((pciid & 0xffff) != GRUB_PCI_VENDOR_BROADCOM)

-	return 0;

+  if ((pciid & 0xffff) != GRUB_PCI_VENDOR_BROADCOM)

+    return 0;

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);

-      if (grub_pci_read (addr) >> 24 != GRUB_PCI_CLASS_NETWORK)

-	return 0;

-      cap = grub_pci_find_capability (dev, GRUB_PCI_CAP_POWER_MANAGEMENT);

-      if (!cap)

-	return 0;

-      addr = grub_pci_make_address (dev, cap + 4);

-      pm_state = grub_pci_read_word (addr);

-      pm_state = pm_state | 0x03;

-      grub_pci_write_word (addr, pm_state);

-      grub_pci_read_word (addr);

-      return 0;

-    }

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);

+  if (grub_pci_read (addr) >> 24 != GRUB_PCI_CLASS_NETWORK)

+    return 0;

+  cap = grub_pci_find_capability (dev, GRUB_PCI_CAP_POWER_MANAGEMENT);

+  if (!cap)

+    return 0;

+  addr = grub_pci_make_address (dev, cap + 4);

+  pm_state = grub_pci_read_word (addr);

+  pm_state = pm_state | 0x03;

+  grub_pci_write_word (addr, pm_state);

+  grub_pci_read_word (addr);

+  return 0;

+}

-  grub_pci_iterate (find_card);

+static void

+stop_broadcom (void)

+{

+  grub_pci_iterate (find_card, NULL);

 }

 #endif

diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c

index 19f2d63..2109a67 100644

--- a/grub-core/kern/mips/loongson/init.c

+++ b/grub-core/kern/mips/loongson/init.c

@@ -49,45 +49,47 @@ grub_machine_mmap_iterate (grub_memory_hook_t hook)

   return GRUB_ERR_NONE;

 }

-static void

-init_pci (void)

+/* Helper for init_pci.  */

+static int

+set_card (grub_pci_device_t dev, grub_pci_id_t pciid,

+	  void *data __attribute__ ((unused)))

 {

-  auto int NESTED_FUNC_ATTR set_card (grub_pci_device_t dev, grub_pci_id_t pciid);

-  int NESTED_FUNC_ATTR set_card (grub_pci_device_t dev, grub_pci_id_t pciid)

-  {

-    grub_pci_address_t addr;

-    /* FIXME: autoscan for BARs and devices.  */

-    switch (pciid)

-      {

-      case GRUB_LOONGSON_OHCI_PCIID:

-	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

-	grub_pci_write (addr, 0x5025000);

-	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

-	grub_pci_write_word (addr, GRUB_PCI_COMMAND_SERR_ENABLE

-			     | GRUB_PCI_COMMAND_PARITY_ERROR

-			     | GRUB_PCI_COMMAND_BUS_MASTER

-			     | GRUB_PCI_COMMAND_MEM_ENABLED);

+  grub_pci_address_t addr;

+  /* FIXME: autoscan for BARs and devices.  */

+  switch (pciid)

+    {

+    case GRUB_LOONGSON_OHCI_PCIID:

+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

+      grub_pci_write (addr, 0x5025000);

+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

+      grub_pci_write_word (addr, GRUB_PCI_COMMAND_SERR_ENABLE

+			   | GRUB_PCI_COMMAND_PARITY_ERROR

+			   | GRUB_PCI_COMMAND_BUS_MASTER

+			   | GRUB_PCI_COMMAND_MEM_ENABLED);

-	addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);

-	grub_pci_write_word (addr, 0x0200 | GRUB_PCI_STATUS_CAPABILITIES);

-	break;

-      case GRUB_LOONGSON_EHCI_PCIID:

-	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

-	grub_pci_write (addr, 0x5026000);

-	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

-	grub_pci_write_word (addr, GRUB_PCI_COMMAND_SERR_ENABLE

-			     | GRUB_PCI_COMMAND_PARITY_ERROR

-			     | GRUB_PCI_COMMAND_BUS_MASTER

-			     | GRUB_PCI_COMMAND_MEM_ENABLED);

+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);

+      grub_pci_write_word (addr, 0x0200 | GRUB_PCI_STATUS_CAPABILITIES);

+      break;

+    case GRUB_LOONGSON_EHCI_PCIID:

+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

+      grub_pci_write (addr, 0x5026000);

+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

+      grub_pci_write_word (addr, GRUB_PCI_COMMAND_SERR_ENABLE

+			   | GRUB_PCI_COMMAND_PARITY_ERROR

+			   | GRUB_PCI_COMMAND_BUS_MASTER

+			   | GRUB_PCI_COMMAND_MEM_ENABLED);

-	addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);

-	grub_pci_write_word (addr, (1 << GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT)

-			     | GRUB_PCI_STATUS_CAPABILITIES);

-	break;

-      }

-    return 0;

-  }

+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);

+      grub_pci_write_word (addr, (1 << GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT)

+			   | GRUB_PCI_STATUS_CAPABILITIES);

+      break;

+    }

+  return 0;

+}

+static void

+init_pci (void)

+{

   *((volatile grub_uint32_t *) GRUB_CPU_LOONGSON_PCI_HIT1_SEL_LO) = 0x8000000c;

   *((volatile grub_uint32_t *) GRUB_CPU_LOONGSON_PCI_HIT1_SEL_HI) = 0xffffffff;

@@ -110,7 +112,7 @@ init_pci (void)

   *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 

 				+ GRUB_PCI_REG_ADDRESS_REG1)) = 0;

-  grub_pci_iterate (set_card);

+  grub_pci_iterate (set_card, NULL);

 }

 void

diff --git a/grub-core/kern/vga_init.c b/grub-core/kern/vga_init.c

index 889d012..1119bb3 100644

--- a/grub-core/kern/vga_init.c

+++ b/grub-core/kern/vga_init.c

@@ -18,6 +18,7 @@

 #ifndef __mips__

 #include <grub/pci.h>

+#include <grub/mm.h>

 #endif

 #include <grub/machine/kernel.h>

 #include <grub/misc.h>

@@ -87,38 +88,42 @@ load_palette (void)

     grub_vga_palette_write (i, colors[i].r, colors[i].g, colors[i].b);

 }

+#ifndef __mips__

+/* Helper for grub_qemu_init_cirrus.  */

+static int

+find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)),

+	   void *data __attribute__ ((unused)))

+{

+  grub_pci_address_t addr;

+  grub_uint32_t class;

+

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);

+  class = grub_pci_read (addr);

+

+  if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA)

+    return 0;

+  

+  /* FIXME: chooose addresses dynamically.  */

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

+  grub_pci_write (addr, 0xf0000000 | GRUB_PCI_ADDR_MEM_PREFETCH

+		  | GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);

+  grub_pci_write (addr, 0xf2000000

+		  | GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);

+

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

+  grub_pci_write (addr, GRUB_PCI_COMMAND_MEM_ENABLED

+		  | GRUB_PCI_COMMAND_IO_ENABLED);

+  

+  return 1;

+}

+#endif

+

 void

 grub_qemu_init_cirrus (void)

 {

 #ifndef __mips__

-  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid);

-  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))

-    {

-      grub_pci_address_t addr;

-      grub_uint32_t class;

-

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);

-      class = grub_pci_read (addr);

-

-      if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA)

-	return 0;

-      

-      /* FIXME: chooose addresses dynamically.  */

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

-      grub_pci_write (addr, 0xf0000000 | GRUB_PCI_ADDR_MEM_PREFETCH

-		      | GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);

-      grub_pci_write (addr, 0xf2000000

-		      | GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);

- 

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

-      grub_pci_write (addr, GRUB_PCI_COMMAND_MEM_ENABLED

-		      | GRUB_PCI_COMMAND_IO_ENABLED);

-      

-      return 1;

-    }

-

-  grub_pci_iterate (find_card);

+  grub_pci_iterate (find_card, NULL);

 #endif

   grub_outb (GRUB_VGA_IO_MISC_COLOR,

diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c

index f6db137..aea486c 100644

--- a/grub-core/video/bochs.c

+++ b/grub-core/video/bochs.c

@@ -199,6 +199,29 @@ grub_video_bochs_set_palette (unsigned int start, unsigned int count,

   return grub_video_fb_set_palette (start, count, palette_data);

 }

+/* Helper for grub_video_bochs_setup.  */

+static int

+find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)

+{

+  int *found = data;

+  grub_pci_address_t addr;

+  grub_uint32_t class;

+

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);

+  class = grub_pci_read (addr);

+

+  if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234)

+    return 0;

+  

+  *found = 1;

+

+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

+  framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK;

+  framebuffer.dev = dev;

+

+  return 1;

+}

+

 static grub_err_t

 grub_video_bochs_setup (unsigned int width, unsigned int height,

 			grub_video_mode_type_t mode_type,

@@ -210,27 +233,6 @@ grub_video_bochs_setup (unsigned int width, unsigned int height,

   int pitch, bytes_per_pixel;

   grub_size_t page_size;        /* The size of a page in bytes.  */

-  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid);

-  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid)

-    {

-      grub_pci_address_t addr;

-      grub_uint32_t class;

-

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);

-      class = grub_pci_read (addr);

-

-      if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234)

-	return 0;

-      

-      found = 1;

-

-      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);

-      framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK;