XLibre/xf86-video-cirrus
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-cirrus.git synced 2026-03-24 01:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

cirrus: update for resources/RAC API removal

Browse Source
This commit is contained in:
Dave Airlie
2009-07-28 13:32:29 +10:00
parent ecdf94e86d
commit 2765aba56f
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/alp_driver.c
View File

@@ -36,8 +36,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -695,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
(unsigned long)pCir->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n");
#ifndef XSERVER_LIBPCIACCESS
/*
* XXX Check if this is correct
*/
@@ -712,6 +715,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
#endif
if (!xf86LoadSubModule(pScrn, "i2c")) {
AlpFreeRec(pScrn);

3
src/cir_driver.c
View File

@@ -21,8 +21,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
#endif
/* All drivers need this */
/* Drivers for PCI hardware need this */

1
src/cir_shadow.c
View File

@@ -11,7 +11,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"

5
src/lg_driver.c
View File

@@ -39,8 +39,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -571,6 +573,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
pCir->FbMapSize = pScrn->videoRam * 1024;
pCir->IoMapSize = 0x4000; /* 16K for moment, will increase */
#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_COLORMAP
#ifndef EXPERIMENTAL
| RAC_VIEWPORT
@@ -584,7 +587,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
#endif
if (!xf86LoadSubModule(pScrn, "ddc")) {
LgFreeRec(pScrn);
return FALSE;