Attachment 11273 Details for Bug 12160 – this patch fixes the compilation breakage

[patch] this patch fixes the compilation breakage

avivo-pciaccess-compile-patch.txt (text/plain), 3.05 KB, created by Dodji Seketeli on 2007-08-25 12:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dodji Seketeli

Created: 2007-08-25 12:45:09 UTC

Size: 3.05 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index b193b73..b342442 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -66,6 +66,7 @@ AC_SUBST([INCLUDES])
> PKG_CHECK_MODULES(PCIACCESS, pciaccess)
> AC_SUBST([PCIACCESS_CFLAGS])
> AC_SUBST([PCIACCESS_LIBS])
>+AC_DEFINE(PCIACCESS, 1, [Define to 1 if libpciaccess is available])
> 
> # Checks for libraries.
> 
>diff --git a/include/avivo_chipset.h b/include/avivo_chipset.h
>index 5648048..37adbb2 100644
>--- a/include/avivo_chipset.h
>+++ b/include/avivo_chipset.h
>@@ -136,7 +136,7 @@ enum avivo_chip_type {
> };
> 
> #ifdef PCIACCESS
>-extern const struct pci_id_match *avivo_device_match;
>+extern const struct pci_id_match avivo_device_match[];
> #endif
> extern SymTabRec avivo_chips[];
> extern PciChipsets avivo_pci_chips[];
>diff --git a/xorg/avivo.c b/xorg/avivo.c
>index 98d3fd4..d3252c1 100644
>--- a/xorg/avivo.c
>+++ b/xorg/avivo.c
>@@ -276,9 +276,9 @@ avivo_pci_probe(DriverPtr drv, int entity_num, struct pci_device *dev,
>     ScrnInfoPtr screen_info;
>     struct avivo_info *avivo;
>     
>-    pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
>-                                NULL, NULL, NULL, NULL, NULL);
>-    if (pScrn) {
>+    screen_info = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
>+                                      NULL, NULL, NULL, NULL, NULL);
>+    if (screen_info) {
>         avivo = avivo_get_info(screen_info);
>         fill_in_screen(screen_info);
>         avivo->pci_info = dev;
>diff --git a/xorg/avivo_bios.c b/xorg/avivo_bios.c
>index 3ec8422..260ca44 100644
>--- a/xorg/avivo_bios.c
>+++ b/xorg/avivo_bios.c
>@@ -59,7 +59,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr screen_info)
>     unsigned short dptr;
> 
> #ifdef PCIACCESS
>-    if (!(avivo->vbios = xalloc(avivo->pci_avivo->rom_size))) {
>+    if (!(avivo->vbios = xalloc(avivo->pci_info->rom_size))) {
>         xf86DrvMsg(screen_info->scrnIndex, X_ERROR,
>                    "Cannot allocate space for hold Video BIOS!\n");
>         return 1;
>diff --git a/xorg/avivo_chipset.c b/xorg/avivo_chipset.c
>index c6478ec..78bd0e1 100644
>--- a/xorg/avivo_chipset.c
>+++ b/xorg/avivo_chipset.c
>@@ -631,10 +631,18 @@ avivo_get_chipset(struct avivo_info *avivo)
>     int i;
> 
>     for (i = 0; i < sizeof(chipset_family) / sizeof(chipset_family[0]); i++) {
>+#ifdef PCIACCESS
>+        if (chipset_family[i].pci_id == avivo->pci_info->device_id) {
>+#else
>         if (chipset_family[i].pci_id == avivo->pci_info->chipType) {
>+#endif /*PCIACCESS*/
>             avivo->chipset = chipset_family[i].family;
>             return;
>         }
>     }
>+#ifdef PCIACCESS
>+    FatalError("Unknown chipset for %x!\n", avivo->pci_info->device_id);
>+#else
>     FatalError("Unknown chipset for %x!\n", avivo->pci_info->device);
>+#endif /*PCIACCESS*/
> }
>diff --git a/xorg/avivo_cursor.c b/xorg/avivo_cursor.c
>index 5398438..735bdef 100644
>--- a/xorg/avivo_cursor.c
>+++ b/xorg/avivo_cursor.c
>@@ -155,7 +155,6 @@ void
> avivo_cursor_init(ScreenPtr screen)
> {
>     ScrnInfoPtr screen_info = xf86Screens[screen->myNum];
>-    struct avivo_info *avivo = avivo_get_info(screen_info);
>     xf86CursorInfoPtr cursor;
> 
>     cursor = xcalloc(1, sizeof(*cursor));

Actions: View | Splinter Review

Attachments on bug 12160: 11273 | 11282 | 11314

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.