diff options
Diffstat (limited to 'driver/xf86-video-nv/src/nv_const.h')
| -rw-r--r-- | driver/xf86-video-nv/src/nv_const.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/driver/xf86-video-nv/src/nv_const.h b/driver/xf86-video-nv/src/nv_const.h index 7a7bdea04..8f9799c0e 100644 --- a/driver/xf86-video-nv/src/nv_const.h +++ b/driver/xf86-video-nv/src/nv_const.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_const.h,v 1.6 2001/12/07 00:09:55 mvojkovi Exp $ */ - #ifndef __NV_CONST_H__ #define __NV_CONST_H__ @@ -7,5 +5,21 @@ #define NV_NAME "NV" #define NV_DRIVER_NAME "nv" +/* libpciaccess gratuitous API changes */ +#if XSERVER_LIBPCIACCESS + #define MEMBASE(p,n) (p)->regions[n].base_addr + #define VENDOR_ID(p) (p)->vendor_id + #define DEVICE_ID(p) (p)->device_id + #define SUBVENDOR_ID(p) (p)->subvendor_id + #define SUBDEVICE_ID(p) (p)->subdevice_id + #define CHIP_REVISION(p) (p)->revision +#else + #define MEMBASE(p,n) (p)->memBase[n] + #define VENDOR_ID(p) (p)->vendor + #define DEVICE_ID(p) (p)->chipType + #define SUBVENDOR_ID(p) (p)->subsysVendor + #define SUBDEVICE_ID(p) (p)->subsysCard + #define CHIP_REVISION(p) (p)->chipRev +#endif + #endif /* __NV_CONST_H__ */ - |