Avoid a magic number and correct a (currently harmless) ifdef in ResetState().

This commit is contained in:
Eric Anholt 2007-04-09 11:34:57 -07:00
parent 9ed446e12b
commit d2e75d8acd
1 changed files with 2 additions and 2 deletions

View File

@ -1559,7 +1559,7 @@ ResetState(ScrnInfoPtr pScrn, Bool flush)
/* God this is ugly */
#define flush_ring() do { \
temp = INREG(LP_RING + RING_LEN); \
if (temp & 1) { \
if (temp & RING_VALID) { \
I830RefreshRing(pScrn); \
I830Sync(pScrn); \
DO_RING_IDLE(); \
@ -1569,7 +1569,7 @@ ResetState(ScrnInfoPtr pScrn, Bool flush)
if (!pI830->useEXA && flush && pI830->AccelInfoRec)
flush_ring();
#endif
#ifdef I830_USE_XAA
#ifdef I830_USE_EXA
if (pI830->useEXA && flush && pI830->EXADriverPtr)
flush_ring();
#endif