From 0cb1c866a17657a7a08c97760e385048714f4b35 Mon Sep 17 00:00:00 2001 From: retro-wertz Date: Tue, 25 Jun 2019 16:56:05 +0800 Subject: [PATCH] Silence clang warnings --- src/boards/90.c | 4 ++-- src/boards/bmc80013b.c | 2 +- src/boards/bmck3036.c | 4 ++-- src/boards/mmc1.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/boards/90.c b/src/boards/90.c index 2bc867a..ff2b0b4 100644 --- a/src/boards/90.c +++ b/src/boards/90.c @@ -130,13 +130,13 @@ static void tekprom(void) { case 0x00: if (tkcom[0] & 0x80) setprg8(0x6000, (((prgb[3] << 2) + 3) & 0x3F) | bankmode); - setprg32(0x8000, last_bank & prgmask | bankmode); + setprg32(0x8000, (last_bank & prgmask) | bankmode); break; case 0x01: if (tkcom[0] & 0x80) setprg8(0x6000, (((prgb[3] << 1) + 1) & 0x3F) | bankmode); setprg16(0x8000, (prgb[1] & prgmask) | bankmode); - setprg16(0xC000, last_bank & prgmask | bankmode); + setprg16(0xC000, (last_bank & prgmask) | bankmode); break; case 0x02: case 0x03: diff --git a/src/boards/bmc80013b.c b/src/boards/bmc80013b.c index 82dc4cf..bfe6b27 100644 --- a/src/boards/bmc80013b.c +++ b/src/boards/bmc80013b.c @@ -35,7 +35,7 @@ static SFORMAT StateRegs[] = static void Sync(void) { if (mode & 0x02) - setprg16(0x8000, regs[0] & 0x0F | regs[1] & 0x70); + setprg16(0x8000, (regs[0] & 0x0F) | (regs[1] & 0x70)); else setprg16r(1, 0x8000, regs[0] & 0x03); setprg16(0xC000, regs[1]); diff --git a/src/boards/bmck3036.c b/src/boards/bmck3036.c index c013579..77ced85 100644 --- a/src/boards/bmck3036.c +++ b/src/boards/bmck3036.c @@ -39,8 +39,8 @@ static void Sync(void) { setprg16(0x8000, regs[0] & 0x1F); setprg16(0xC000, regs[0] & 0x1F); } else { /* UNROM */ - setprg16(0x8000, regs[0] & 0x1F | regs[1] & 0x07); - setprg16(0xC000, regs[0] & 0x1F | 0x07); + setprg16(0x8000, (regs[0] & 0x1F) | (regs[1] & 0x07)); + setprg16(0xC000, (regs[0] & 0x1F) | 0x07); } setchr8(0); setmirror(((regs[0] & 0x25) == 0x25) ? MI_H : MI_V); diff --git a/src/boards/mmc1.c b/src/boards/mmc1.c index 4dc4f69..f3ef3c1 100644 --- a/src/boards/mmc1.c +++ b/src/boards/mmc1.c @@ -440,6 +440,6 @@ void FARIDSLROM8IN1_Init(CartInfo *info) { MMC1PRGHook16 = FARIDSLROM8IN1PRGHook; info->Power = FARIDSLROM8IN1Power; info->Reset = FARIDSLROM8IN1Reset; - AddExState(lock, 1, 0, "LOCK"); - AddExState(reg, 1, 0, "REG6"); + AddExState(&lock, 1, 0, "LOCK"); + AddExState(®, 1, 0, "REG6"); }