summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2003-12-29 05:10:55 +0000
committerEric Anholt <anholt@freebsd.org>2003-12-29 05:10:55 +0000
commit3fcb40f94f2112c3f98abf797616656a878790d3 (patch)
treecd8031dd8cd92d4fb4005720ebc4f6f8c6f7576e
parenta4f352a8df300375a07c2f1110b369a1022f4584 (diff)
- Disable libdrm verbosity. It isn't important enough yet to make adri-0-1-branch
run-time flag for it. - Fix the (void)atic; tricks to quiet unused variable warnings in ATI template files. Mixing statements and variable defines works in newer compilers, but not pdx's.
-rw-r--r--hw/kdrive/ati/ati_drawtmp.h8
-rw-r--r--hw/kdrive/ati/r128_blendtmp.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/kdrive/ati/ati_drawtmp.h b/hw/kdrive/ati/ati_drawtmp.h
index a8a0a7dac..03f88a700 100644
--- a/hw/kdrive/ati/ati_drawtmp.h
+++ b/hw/kdrive/ati/ati_drawtmp.h
@@ -25,15 +25,15 @@
#ifdef USE_DMA
#define TAG(x) x##DMA
-#define LOCALS (void)atic; \
- RING_LOCALS
+#define LOCALS RING_LOCALS; \
+ (void)atic
#define BEGIN(x) BEGIN_RING(x * 2)
#define OUT_REG(reg, val) OUT_RING_REG(reg, val)
#define END() ADVANCE_RING()
#else
#define TAG(x) x##MMIO
-#define LOCALS (void)atis; \
- char *mmio = atic->reg_base
+#define LOCALS char *mmio = atic->reg_base; \
+ (void)atis
#define BEGIN(x) ATIWaitAvailMMIO(x)
#define OUT_REG(reg, val) MMIO_OUT32((mmio), (reg), (val))
#define END()
diff --git a/hw/kdrive/ati/r128_blendtmp.h b/hw/kdrive/ati/r128_blendtmp.h
index ede48fe4c..57eeb21eb 100644
--- a/hw/kdrive/ati/r128_blendtmp.h
+++ b/hw/kdrive/ati/r128_blendtmp.h
@@ -25,8 +25,8 @@
#ifdef USE_DMA
#define TAG(x) x##DMA
-#define LOCALS (void)atic; \
- RING_LOCALS
+#define LOCALS RING_LOCALS; \
+ (void)atic
#define BEGIN(x) BEGIN_RING(x * 2)
#define OUT_REG(reg, val) OUT_RING_REG(reg, val)
#define END() ADVANCE_RING()