diff options
| -rw-r--r-- | src/atibus.c | 3 | ||||
| -rw-r--r-- | src/atipreinit.c | 18 | ||||
| -rw-r--r-- | src/atistruct.h | 8 |
3 files changed, 23 insertions, 6 deletions
diff --git a/src/atibus.c b/src/atibus.c index 69a3089..7b6cb48 100644 --- a/src/atibus.c +++ b/src/atibus.c @@ -59,6 +59,7 @@ ATIClaimResources ) { +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO resRange Resources[2] = {{0, 0, 0}, _END}; @@ -101,7 +102,7 @@ ATIClaimResources } #endif /* AVOID_CPIO */ - +#endif } /* diff --git a/src/atipreinit.c b/src/atipreinit.c index 2b84a6c..6c742fd 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -52,7 +52,9 @@ #include "atixv.h" #include "vbe.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" +#endif /* * FreeScreen handles the clean-up. @@ -507,7 +509,9 @@ ATIPreInit ATIPtr pATI; GDevPtr pGDev; EntityInfoPtr pEntity; +#ifndef XSERVER_LIBPCIACCESS resPtr pResources; +#endif pciVideoPtr pVideo; DisplayModePtr pMode; CARD32 IOValue; @@ -548,7 +552,9 @@ ATIPreInit /* Register resources */ pEntity = xf86GetEntityInfo(pScreenInfo->entityList[0]); pGDev = pEntity->device; +#ifndef XSERVER_LIBPCIACCESS pResources = pEntity->resources; +#endif pATI->iEntity = pEntity->index; pATI->Chip = pEntity->chipset; @@ -556,6 +562,7 @@ ATIPreInit xfree(pEntity); +#ifndef XSERVER_LIBPCIACCESS if (!pResources) pResources = xf86RegisterResources(pATI->iEntity, NULL, ResShared); if (pResources) @@ -565,7 +572,7 @@ ATIPreInit xf86FreeResList(pResources); return FALSE; } - +#endif ConfiguredMonitor = NULL; (void)memset(BIOS, 0, SizeOf(BIOS)); @@ -753,6 +760,7 @@ ATIPreInit #endif /* AVOID_CPIO */ +#ifndef XSERVER_LIBPCIACCESS #ifdef AVOID_CPIO pScreenInfo->racMemFlags = @@ -765,7 +773,7 @@ ATIPreInit pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR; #endif /* AVOID_CPIO */ - +#endif /* Finish private area initialisation */ pATI->nFIFOEntries = 16; /* For now */ @@ -1056,6 +1064,7 @@ ATIPreInit xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "%s.\n", Buffer); } +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->CPIO_VGAWonder) @@ -1064,6 +1073,7 @@ ATIPreInit pATI->CPIO_VGAWonder); #endif /* AVOID_CPIO */ +#endif xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "ATI Mach64 adapter detected.\n"); @@ -1174,6 +1184,7 @@ ATIPreInit xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Using Mach64 accelerator CRTC.\n"); +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->VGAAdapter) @@ -1206,6 +1217,7 @@ ATIPreInit } #endif /* AVOID_CPIO */ +#endif } @@ -1961,6 +1973,7 @@ ATIPreInit } } +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->VGAAdapter) @@ -1981,6 +1994,7 @@ ATIPreInit } #endif /* AVOID_CPIO */ +#endif /* * Remap apertures. Must lock and re-unlock around this in case the diff --git a/src/atistruct.h b/src/atistruct.h index b9f4d08..ac76b1f 100644 --- a/src/atistruct.h +++ b/src/atistruct.h @@ -59,7 +59,9 @@ #endif #include "xf86Cursor.h" #include "xf86Pci.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "atipcirename.h" @@ -269,9 +271,9 @@ typedef struct _ATIRec CARD8 BusType; #ifndef AVOID_CPIO - - resRange VGAWonderResources[2]; - +#ifndef XSERVER_LIBPCIACCESS + resRange VGAWonderResources[2]; +#endif #endif /* AVOID_CPIO */ /* |