Initial XFree86 4.0.99.1 merge.

1 files changed, 10 insertions, 8 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h
index e19c4019f..3ca64947a 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h,v 1.4 2000/10/11 22:52:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h,v 1.7 2001/02/12 03:31:05 tsi Exp $ */
 /*
- * Copyright 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
+ * Copyright 2000 through 2001 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -46,10 +46,12 @@
  * inm/outm     32-bit R/W through MMIO space.  The register is specified as
  *              the actual MMIO offset (with Block 1 following Block 0), which,
  *              in this case, is equivalent to the register's IOPortTag from
- *              atiregs.h.  Can only be used for those few non-FIFO'ed
- *              registers outside of Block 0's first 256 bytes.  pATI->pBlock
- *              array elements must have been previously set up by
- *              ATIMapApertures().
+ *              atiregs.h.  Can be used for those few non-FIFO'ed registers
+ *              outside of Block 0's first 256 bytes.  inm() can also be used
+ *              for FIFO'ed registers if, and only if, it can be guaranteed to
+ *              not have been previously FIFO'ed (e.g. when the engine is
+ *              idle).  pATI->pBlock array elements must have been previously
+ *              set up by ATIMapApertures().
  *
  * outf         32-bit write through MMIO cache.  Identical to outm() but
  *              intended for FIFO'ed registers.  There is no inf() provided.
@@ -166,11 +168,11 @@ extern void ATIMach64PollEngineStatus FunctionPrototype((ATIPtr));
  */
 #define ATIMach64WaitForFIFO(_pATI, _n)        \
     while (pATI->nAvailableFIFOEntries < (_n)) \
-        ATIMach64PollEngineStatus(pATI);
+        ATIMach64PollEngineStatus(pATI)
 
 #define ATIMach64WaitForIdle(_pATI)      \
     while (pATI->EngineIsBusy)           \
-        ATIMach64PollEngineStatus(pATI);
+        ATIMach64PollEngineStatus(pATI)
 
 extern void ATIAccessMach64PLLReg FunctionPrototype((ATIPtr, const CARD8,
                                                      const Bool));