1 files changed, 12 insertions, 12 deletions

diff --git a/src/i810_accel.c b/src/i810_accel.c
index 660180d9..2b0b594a 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -186,7 +186,7 @@ int
 I810WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
 {
    I810Ptr pI810 = I810PTR(pScrn);
-   I810RingBuffer *ring = &(pI810->LpRing);
+   I810RingBuffer *ring = pI810->LpRing;
    int iters = 0;
    int start = 0;
    int now = 0;
@@ -275,9 +275,9 @@ I810Sync(ScrnInfoPtr pScrn)
       ADVANCE_LP_RING();
    }
 
-   I810WaitLpRing(pScrn, pI810->LpRing.mem.Size - 8, 0);
+   I810WaitLpRing(pScrn, pI810->LpRing->mem.Size - 8, 0);
 
-   pI810->LpRing.space = pI810->LpRing.mem.Size - 8;
+   pI810->LpRing->space = pI810->LpRing->mem.Size - 8;
    pI810->nextColorExpandBuf = 0;
 }
 
@@ -293,7 +293,7 @@ I810SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
 
    /* Color blit, p166 */
    pI810->BR[13] = (BR13_SOLID_PATTERN |
-		    (XAAPatternROP[rop] << 16) |
+		    (XAAGetPatternROP(rop) << 16) |
 		    (pScrn->displayWidth * pI810->cpp));
    pI810->BR[16] = color;
 }
@@ -339,7 +339,7 @@ I810SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir, int rop,
    if (xdir == -1)
       pI810->BR[13] |= BR13_RIGHT_TO_LEFT;
 
-   pI810->BR[13] |= XAACopyROP[rop] << 16;
+   pI810->BR[13] |= XAAGetCopyROP(rop) << 16;
 
    pI810->BR[18] = 0;
 }
@@ -425,7 +425,7 @@ I810SetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int pattx, int patty,
    pI810->BR[18] = bg;
    pI810->BR[19] = fg;
    pI810->BR[13] = (pScrn->displayWidth * pI810->cpp);
-   pI810->BR[13] |= XAAPatternROP[rop] << 16;
+   pI810->BR[13] |= XAAGetPatternROP(rop) << 16;
    if (bg == -1)
       pI810->BR[13] |= BR13_MONO_PATN_TRANS;
 }
@@ -489,7 +489,7 @@ I810SetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
 	     fg, bg, rop, planemask);
 
    pI810->BR[13] = (pScrn->displayWidth * pI810->cpp);
-   pI810->BR[13] |= XAACopyROP[rop] << 16;
+   pI810->BR[13] |= XAAGetCopyROP(rop) << 16;
    pI810->BR[13] |= (1 << 27);
    if (bg == -1)
       pI810->BR[13] |= BR13_MONO_TRANSPCY;
@@ -588,11 +588,11 @@ I810RefreshRing(ScrnInfoPtr pScrn)
 {
    I810Ptr pI810 = I810PTR(pScrn);
 
-   pI810->LpRing.head = INREG(LP_RING + RING_HEAD) & HEAD_ADDR;
-   pI810->LpRing.tail = INREG(LP_RING + RING_TAIL);
-   pI810->LpRing.space = pI810->LpRing.head - (pI810->LpRing.tail + 8);
-   if (pI810->LpRing.space < 0)
-      pI810->LpRing.space += pI810->LpRing.mem.Size;
+   pI810->LpRing->head = INREG(LP_RING + RING_HEAD) & HEAD_ADDR;
+   pI810->LpRing->tail = INREG(LP_RING + RING_TAIL);
+   pI810->LpRing->space = pI810->LpRing->head - (pI810->LpRing->tail + 8);
+   if (pI810->LpRing->space < 0)
+      pI810->LpRing->space += pI810->LpRing->mem.Size;
 
    pI810->AccelInfoRec->NeedToSync = TRUE;
 }