summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-05-23 11:25:14 +0100
committerDave Airlie <airlied@redhat.com>2012-05-23 11:25:14 +0100
commit18bf00600c75b1dc055d174c8ba9ec1dc4ae8b5a (patch)
tree4ede059a37711437e4702e1522c7b131aeb21391
parent76c67b2735a5b0ee1cf231ff85eb3273a30b4ccc (diff)
downloadxorg-driver-xf86-video-vesa-18bf00600c75b1dc055d174c8ba9ec1dc4ae8b5a.tar.gz
vesa: convert to new screen conversion APIs.
Generated by util/modular/x-driver-screen-scrn-conv.sh Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/vesa.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vesa.c b/src/vesa.c
index 9b2f664..ab64060 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -111,7 +111,7 @@ static void *
VESAWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VESAPtr pVesa = VESAGetRec(pScrn);
*size = pVesa->maxBytesPerScanline;
@@ -122,7 +122,7 @@ static void *
VESAWindowWindowed(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VESAPtr pVesa = VESAGetRec(pScrn);
VbeModeInfoBlock *data = ((VbeModeInfoData*)(pScrn->currentMode->Private))->data;
int window;
@@ -903,7 +903,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
vesaCreateScreenResources(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VESAPtr pVesa = VESAGetRec(pScrn);
Bool ret;
@@ -1578,7 +1578,7 @@ RestoreFonts(ScrnInfoPtr pScrn)
static Bool
VESASaveScreen(ScreenPtr pScreen, int mode)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VESAPtr pVesa = VESAGetRec(pScrn);
Bool on = xf86IsUnblank(mode);
@@ -1603,7 +1603,7 @@ VESASaveScreen(ScreenPtr pScreen, int mode)
static int
VESABankSwitch(ScreenPtr pScreen, unsigned int iBank)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VESAPtr pVesa = VESAGetRec(pScrn);
if (pVesa->curBank == iBank)