Merged mainline into pci

diff --git a/commands/efi/fixvideo.c b/commands/efi/fixvideo.c
index f97d83787fcc49cffe116b552203bfded8ee2fbc..68566223753765edfae93888478469c756471ce3 100644 (file)
--- a/commands/efi/fixvideo.c
+++ b/commands/efi/fixvideo.c
@@ -38,11 +38,11 @@ static struct grub_video_patch
   };
 
 static int NESTED_FUNC_ATTR
-scan_card (int bus, int dev, int func, grub_pci_id_t pciid)
+scan_card (grub_pci_device_t dev, grub_pci_id_t pciid)
 {
   grub_pci_address_t addr;
 
-  addr = grub_pci_make_address (bus, dev, func, 2);
+  addr = grub_pci_make_address (dev, 2);
   if (grub_pci_read_byte (addr + 3) == 0x3)
     {
       struct grub_video_patch *p = video_patches;

diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index 9967bb1226cfacbd8f73be10202bf51830ff96c4..23586b269f22f77ac751d4a47f761ba09c02c0c8 100644 (file)
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -41,6 +41,7 @@ enable_rom_area (void)
 {
   grub_pci_address_t addr;
   grub_uint32_t *rom_ptr;
+  grub_pci_device_t dev = { .bus = 0, .device = 0, .function = 0};
 
   rom_ptr = (grub_uint32_t *) VBIOS_ADDR;
   if (*rom_ptr != BLANK_MEM)
@@ -49,7 +50,7 @@ enable_rom_area (void)
       return 0;
     }
 
-  addr = grub_pci_make_address (0, 0, 0, 36);
+  addr = grub_pci_make_address (dev, 36);
   grub_pci_write_byte (addr++, 0x30);
   grub_pci_write_byte (addr++, 0x33);
   grub_pci_write_byte (addr++, 0x33);
@@ -73,8 +74,9 @@ static void
 lock_rom_area (void)
 {
   grub_pci_address_t addr;
+  grub_pci_device_t dev = { .bus = 0, .device = 0, .function = 0};
 
-  addr = grub_pci_make_address (0, 0, 0, 36);
+  addr = grub_pci_make_address (dev, 36);
   grub_pci_write_byte (addr++, 0x10);
   grub_pci_write_byte (addr++, 0x11);
   grub_pci_write_byte (addr++, 0x11);

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index f96c60e114ee52c40f184dd08e40af97911bc8cb..8cd4d23f2c22e6f7ec4c7a321aa3c1b15c80d87d 100644 (file)
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -469,21 +469,22 @@ find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
 {
   int found = 0;
 
-  auto int NESTED_FUNC_ATTR find_card (int bus, int dev, int func,
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
                                       grub_pci_id_t pciid);
 
-  int NESTED_FUNC_ATTR find_card (int bus, int dev, int func,
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
                                  grub_pci_id_t pciid)
     {
       grub_pci_address_t addr;
 
-      addr = grub_pci_make_address (bus, dev, func, 2);
+      addr = grub_pci_make_address (dev, 2);
       if (grub_pci_read (addr) >> 24 == 0x3)
        {
          int i;
 
          grub_printf ("Display controller: %d:%d.%d\nDevice id: %x\n",
-                      bus, dev, func, pciid);
+                      grub_pci_get_bus (dev), grub_pci_get_device (dev),
+                      grub_pci_get_function (dev), pciid);
          addr += 8;
          for (i = 0; i < 6; i++, addr += 4)
            {

diff --git a/loader/i386/efi/xnu.c b/loader/i386/efi/xnu.c
index 5085cdbea6af100deb16b239d32b64e497e16b53..236732804ae626165c106858d18a4174e67ff6ef 100644 (file)
--- a/loader/i386/efi/xnu.c
+++ b/loader/i386/efi/xnu.c
@@ -71,21 +71,22 @@ find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
 {
   int found = 0;
 
-  auto int NESTED_FUNC_ATTR find_card (int bus, int dev, int func,
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
                                       grub_pci_id_t pciid);
 
-  int NESTED_FUNC_ATTR find_card (int bus, int dev, int func,
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
                                  grub_pci_id_t pciid)
     {
       grub_pci_address_t addr;
 
-      addr = grub_pci_make_address (bus, dev, func, 2);
+      addr = grub_pci_make_address (dev, 2);
       if (grub_pci_read (addr) >> 24 == 0x3)
        {
          int i;
 
          grub_printf ("Display controller: %d:%d.%d\nDevice id: %x\n",
-                      bus, dev, func, pciid);
+                      grub_pci_get_bus (dev), grub_pci_get_device (dev),
+                      grub_pci_get_function (dev), pciid);
          addr += 8;
          for (i = 0; i < 6; i++, addr += 4)
            {

diff --git a/video/efi_uga.c b/video/efi_uga.c
index 31062c5f5ae7fe676913b4eeeda7b7d9aecf3b0a..9bca6430652d1ff8755f7b2ff5e042e76d48d73c 100644 (file)
--- a/video/efi_uga.c
+++ b/video/efi_uga.c
@@ -84,21 +84,22 @@ find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
 {
   int found = 0;
 
-  auto int NESTED_FUNC_ATTR find_card (int bus, int dev, int func,
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
                                       grub_pci_id_t pciid);
 
-  int NESTED_FUNC_ATTR find_card (int bus, int dev, int func,
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
                                  grub_pci_id_t pciid)
     {
       grub_pci_address_t addr;
 
-      addr = grub_pci_make_address (bus, dev, func, 2);
+      addr = grub_pci_make_address (dev, 2);
       if (grub_pci_read (addr) >> 24 == 0x3)
        {
          int i;
 
          grub_dprintf ("fb", "Display controller: %d:%d.%d\nDevice id: %x\n",
-                       bus, dev, func, pciid);
+                       grub_pci_get_bus (dev), grub_pci_get_device (dev),
+                       grub_pci_get_function (dev), pciid);
          addr += 8;
          for (i = 0; i < 6; i++, addr += 4)
            {