diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:31 +1000 |
| commit | d0bc81e8d7af7df512e5556a2d1da0c2053c75cd (patch) | |
| tree | aace1b4a6715d22d7822b4457390e4226aad75d3 | |
| parent | 67fbf6932ec59063928925401283958ccdfb98c3 (diff) | |
newport: update for resources/RAC API removal
| -rw-r--r-- | src/newport.h | 3 | ||||
| -rw-r--r-- | src/newport_driver.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/newport.h b/src/newport.h index f7354e9..d4435b7 100644 --- a/src/newport.h +++ b/src/newport.h @@ -23,7 +23,10 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "xf86cmap.h" diff --git a/src/newport_driver.c b/src/newport_driver.c index 757fd12..64b643a 100644 --- a/src/newport_driver.c +++ b/src/newport_driver.c @@ -247,7 +247,9 @@ NewportProbe(DriverPtr drv, int flags) Bool foundScreen = FALSE; GDevPtr *devSections; GDevPtr dev = NULL; +#ifndef XSERVER_LIBPCIACCESS resRange range[] = { {ResExcMemBlock ,0,0}, _END }; +#endif unsigned probedIDs[NEWPORT_MAX_BOARDS]; memType base; @@ -270,10 +272,12 @@ NewportProbe(DriverPtr drv, int flags) ScrnInfoPtr pScrn = NULL; entity = xf86ClaimNoSlot(drv, 0, dev, TRUE); +#ifndef XSERVER_LIBPCIACCESS base = (NEWPORT_BASE_ADDR0 + busID * NEWPORT_BASE_OFFSET); RANGE(range[0], base, base + sizeof(NewportRegs),\ ResExcMemBlock); +#endif pScrn = xf86AllocateScreen(drv, 0); xf86AddEntityToScreen(pScrn, entity); pScrn->driverVersion = NEWPORT_VERSION; |