2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>

	* video/sm712.c (grub_video_sm712_setup): Use GRUB_PCI_REG_CLASS.

diff --git a/ChangeLog b/ChangeLog
index b54f6aeecce0aa55f8c074b8191cf7c034890f3d..d789f821e6112201d3abd29f4f15277f35333df8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
        * loader/i386/efi/linux.c (find_framebuf): Use GRUB_PCI_REG_CLASS.
        * loader/i386/efi/xnu.c (find_framebuf): Likewise.
        * video/efi_uga.c (find_framebuf): Likewise.
+       * video/sm712.c (grub_video_sm712_setup): Likewise.
        * util/pci.c (grub_pci_make_address): Use byte-addressed configuration
        space.
 

diff --git a/video/sm712.c b/video/sm712.c
index 1e0f59b9d38883d2193e046adf759e1581c5cc2f..a86470b7d5903cd86125bf436c5c7f97428435e0 100644 (file)
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -74,7 +74,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
       grub_pci_address_t addr;
       grub_uint32_t class;
 
-      addr = grub_pci_make_address (dev, 2);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       class = grub_pci_read (addr);
 
       if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x0712126f)
@@ -82,7 +82,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
       
       found = 1;
 
-      addr = grub_pci_make_address (dev, 4);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
       framebuffer.base = grub_pci_read (addr);
       framebuffer.dev = dev;