155 lines
4.9 KiB
Diff
155 lines
4.9 KiB
Diff
diff --git a/src/vmware.c b/src/vmware.c
|
|
index 12f12ede..aec9b9ee 100644
|
|
--- a/src/vmware.c
|
|
+++ b/src/vmware.c
|
|
@@ -322,7 +322,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
|
|
SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32);
|
|
} else {
|
|
/* Note: This setting of valueReg causes unaligned I/O */
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
pVMWARE->portIOBase = pVMWARE->PciInfo->regions[0].base_addr;
|
|
#else
|
|
pVMWARE->portIOBase = pVMWARE->PciInfo->ioBase[0];
|
|
@@ -364,7 +364,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
|
|
}
|
|
pVMWARE->suspensionSavedRegId = id;
|
|
|
|
-#if !XSERVER_LIBPCIACCESS
|
|
+#ifndef XSERVER_LIBPCIACCESS
|
|
pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device,
|
|
pVMWARE->PciInfo->func);
|
|
#endif
|
|
@@ -708,13 +708,13 @@ static Bool
|
|
VMWAREMapMem(ScrnInfoPtr pScrn)
|
|
{
|
|
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
int err;
|
|
struct pci_device *const device = pVMWARE->PciInfo;
|
|
void *fbBase;
|
|
#endif
|
|
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
err = pci_device_map_range(device,
|
|
pVMWARE->memPhysBase,
|
|
pVMWARE->videoRam,
|
|
@@ -751,7 +751,7 @@ VMWAREUnmapMem(ScrnInfoPtr pScrn)
|
|
|
|
VmwareLog(("Unmapped: %p/%u\n", pVMWARE->FbBase, pVMWARE->videoRam));
|
|
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->FbBase, pVMWARE->videoRam);
|
|
#else
|
|
xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->FbBase, pVMWARE->videoRam);
|
|
@@ -1026,7 +1026,7 @@ static void
|
|
VMWAREInitFIFO(ScrnInfoPtr pScrn)
|
|
{
|
|
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
struct pci_device *const device = pVMWARE->PciInfo;
|
|
int err;
|
|
void *mmioVirtBase;
|
|
@@ -1039,7 +1039,7 @@ VMWAREInitFIFO(ScrnInfoPtr pScrn)
|
|
|
|
pVMWARE->mmioPhysBase = vmwareReadReg(pVMWARE, SVGA_REG_MEM_START);
|
|
pVMWARE->mmioSize = vmwareReadReg(pVMWARE, SVGA_REG_MEM_SIZE) & ~3;
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
err = pci_device_map_range(device, pVMWARE->mmioPhysBase,
|
|
pVMWARE->mmioSize,
|
|
PCI_DEV_MAP_FLAG_WRITABLE,
|
|
@@ -1080,7 +1080,7 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
|
|
TRACEPOINT
|
|
|
|
vmwareWriteReg(pVMWARE, SVGA_REG_CONFIG_DONE, 0);
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize);
|
|
#else
|
|
xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize);
|
|
diff --git a/src/vmware.h b/src/vmware.h
|
|
index 028dff35..f08a2830 100644
|
|
--- a/src/vmware.h
|
|
+++ b/src/vmware.h
|
|
@@ -83,7 +83,7 @@ typedef xXineramaScreenInfo VMWAREXineramaRec, *VMWAREXineramaPtr;
|
|
|
|
typedef struct {
|
|
EntityInfoPtr pEnt;
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
struct pci_device *PciInfo;
|
|
#else
|
|
pciVideoPtr PciInfo;
|
|
@@ -207,7 +207,7 @@ typedef struct {
|
|
/* Undefine this to kill all acceleration */
|
|
#define ACCELERATE_OPS
|
|
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
#define VENDOR_ID(p) (p)->vendor_id
|
|
#define DEVICE_ID(p) (p)->device_id
|
|
#define SUBVENDOR_ID(p) (p)->subvendor_id
|
|
diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c
|
|
index a74ef519..7f06cb34 100644
|
|
--- a/src/vmware_bootstrap.c
|
|
+++ b/src/vmware_bootstrap.c
|
|
@@ -120,7 +120,7 @@ static resRange vmwareLegacyRes[] = {
|
|
#define vmwareLegacyRes NULL
|
|
#endif
|
|
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
#define VENDOR_ID(p) (p)->vendor_id
|
|
#define DEVICE_ID(p) (p)->device_id
|
|
#define SUBVENDOR_ID(p) (p)->subvendor_id
|
|
@@ -134,7 +134,7 @@ static resRange vmwareLegacyRes[] = {
|
|
#define CHIP_REVISION(p) (p)->chipRev
|
|
#endif
|
|
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
|
|
#define VMWARE_DEVICE_MATCH(d, i) \
|
|
{PCI_VENDOR_ID_VMWARE, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
|
|
@@ -213,7 +213,7 @@ vmwgfx_hosted_detect(void);
|
|
static Bool
|
|
VMwarePreinitStub(ScrnInfoPtr pScrn, int flags)
|
|
{
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
struct pci_device *pciInfo;
|
|
#else
|
|
pciVideoPtr pciInfo;
|
|
@@ -261,7 +261,7 @@ VMwarePreinitStub(ScrnInfoPtr pScrn, int flags)
|
|
return (*pScrn->PreInit)(pScrn, flags);
|
|
};
|
|
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
static Bool
|
|
VMwarePciProbe (DriverPtr drv,
|
|
int entity_num,
|
|
@@ -511,7 +511,7 @@ _X_EXPORT DriverRec vmware = {
|
|
VMWARE_DRIVER_VERSION,
|
|
VMWARE_DRIVER_NAME,
|
|
VMWAREIdentify,
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
NULL,
|
|
#else
|
|
VMWAREProbe,
|
|
@@ -523,7 +523,7 @@ _X_EXPORT DriverRec vmware = {
|
|
VMWareDriverFunc,
|
|
#endif
|
|
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 4
|
|
-#if XSERVER_LIBPCIACCESS
|
|
+#ifdef XSERVER_LIBPCIACCESS
|
|
VMwareDeviceMatch,
|
|
VMwarePciProbe,
|
|
#else
|