diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 00:52:21 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 00:52:21 -0800 |
| commit | 7fcb555735a58e19ccc10875b211402983170a87 (patch) | |
| tree | f1f7531380cf79321c12d90ce613e89467388154 /src/i830_cursor.c | |
| parent | 3ab7f9693217d8fe993bdc94c376b219b0082961 (diff) | |
Rename availablePipes to num_pipes
Diffstat (limited to 'src/i830_cursor.c')
| -rw-r--r-- | src/i830_cursor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/i830_cursor.c b/src/i830_cursor.c index 6b0e58c4..05e93faf 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -86,7 +86,7 @@ I830SetPipeCursorBase (ScrnInfoPtr pScrn, int pipe) int cursor_base = (pipe == 0 ? CURSOR_A_BASE : CURSOR_B_BASE); I830MemRange *cursor_mem; - if (pipe >= pI830->availablePipes) + if (pipe >= pI830->num_pipes) FatalError("Bad pipe number for cursor base setting\n"); if (pI830->CursorIsARGB) @@ -180,11 +180,11 @@ I830InitHWCursor(ScrnInfoPtr pScrn) int i; DPRINTF(PFX, "I830InitHWCursor\n"); - for (i = 0; i < pI830->availablePipes; i++) + for (i = 0; i < pI830->num_pipes; i++) pI830->pipes[i].cursorShown = FALSE; /* Initialise the HW cursor registers, leaving the cursor hidden. */ if (IS_MOBILE(pI830) || IS_I9XX(pI830)) { - for (i = 0; i < pI830->availablePipes; i++) + for (i = 0; i < pI830->num_pipes; i++) { int cursor_control = i == 0 ? CURSOR_A_CONTROL : CURSOR_B_CONTROL; temp = INREG(cursor_control); @@ -484,7 +484,7 @@ I830SetCursorPosition(ScrnInfoPtr pScrn, int x, int y) x -= hotspotx; y -= hotspoty; - for (pipe = 0; pipe < pI830->availablePipes; pipe++) + for (pipe = 0; pipe < pI830->num_pipes; pipe++) { I830PipePtr pI830Pipe = &pI830->pipes[pipe]; DisplayModePtr mode = &pI830Pipe->curMode; @@ -550,7 +550,7 @@ I830ShowCursor(ScrnInfoPtr pScrn) pI830->CursorMemARGB->Physical, pI830->CursorMemARGB->Start); pI830->cursorOn = TRUE; - for (pipe = 0; pipe < pI830->availablePipes; pipe++) + for (pipe = 0; pipe < pI830->num_pipes; pipe++) I830SetPipeCursor (pScrn, pipe, TRUE); } @@ -563,7 +563,7 @@ I830HideCursor(ScrnInfoPtr pScrn) DPRINTF(PFX, "I830HideCursor\n"); pI830->cursorOn = FALSE; - for (pipe = 0; pipe < pI830->availablePipes; pipe++) + for (pipe = 0; pipe < pI830->num_pipes; pipe++) I830SetPipeCursor (pScrn, pipe, TRUE); } |