summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c b/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c
index 8c0eb09dc..105c9d444 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c
@@ -1,6 +1,6 @@
/* (c) Itai Nahshon */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.3 2000/09/22 11:12:32 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -13,8 +13,10 @@
#include "vgaHW.h"
#include "cir.h"
+#define _ALP_PRIVATE_
#include "alp.h"
+#ifdef DEBUG
#define minb(p) \
ErrorF("minb(%X)\n", p),\
MMIO_IN8(pCir->IOBase, (p))
@@ -27,7 +29,12 @@
#define moutl(p,v) \
ErrorF("moutl(%X)\n", p),\
MMIO_OUT32(pCir->IOBase, (p),(v))
-
+#else
+#define minb(p) MMIO_IN8(pCir->IOBase, (p))
+#define moutb(p,v) MMIO_OUT8(pCir->IOBase, (p),(v))
+#define minl(p) MMIO_IN32(pCir->IOBase, (p))
+#define moutl(p,v) MMIO_OUT32(pCir->IOBase, (p),(v))
+#endif
#define WAIT while(minb(0x40) & pCir->chip.alp->waitMsk){};
#define WAIT_1 while(minb(0x40) & 0x1){};
@@ -158,7 +165,6 @@ Bool
AlpXAAInitMMIO(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- vgaHWPtr hwp = VGAHWPTR(pScrn);
CirPtr pCir = CIRPTR(pScrn);
XAAInfoRecPtr XAAPtr;