summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-15 15:10:16 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-17 11:07:05 -0800
commita1d33167b9b3f8dc9adb78eade0101c2ac62f033 (patch)
treea71331e069d870b6a4cf423110ae3b22afed57c8
parent19356956a1b67cd00a5fd9ff234dae9b16115da5 (diff)
Quiet -Wmisleading-indentation warning in trident_dac.cHEADmaster
trident_dac.c: In function ‘Tridentddc1Read’: trident_dac.c:1238:5: warning: this ‘while’ clause does not guard... [-Wmisleading-indentation] 1238 | while (!(INB(vgaIOBase + 0xA) & 0x08)); | ^~~~~ In file included from trident_dac.c:36: trident_regs.h:303:1: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘while’ 303 | { \ | ^ trident_dac.c:1241:5: note: in expansion of macro ‘OUTB’ 1241 | OUTB(vgaIOBase + 4, I2C); | ^~~~ Compiled code does not change due to this change Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/trident_regs.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/trident_regs.h b/src/trident_regs.h
index aacfa74..2a5e377 100644
--- a/src/trident_regs.h
+++ b/src/trident_regs.h
@@ -300,21 +300,23 @@
MMIO_IN32(pTrident->IOBase,(r))
#define OUTB(addr, data) \
-{ \
+do { \
if (IsPciCard && UseMMIO) { \
MMIO_OUT8(pTrident->IOBase, addr, data); \
} else { \
outb(pTrident->PIOBase + (addr), data); \
} \
-}
+} while(0)
+
#define OUTW(addr, data) \
-{ \
+do { \
if (IsPciCard && UseMMIO) { \
MMIO_OUT16(pTrident->IOBase, addr, data); \
} else { \
outw(pTrident->PIOBase + (addr), data); \
} \
-}
+} while(0)
+
#define INB(addr) \
( \
(IsPciCard && UseMMIO) ? \