admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Silence warnings

Browse Source
This commit is contained in:
negativeExponent
2020-02-17 13:43:54 +08:00
parent 7c6aa2d665
commit 18701efb0f
6 changed files with 35 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/boards/BS110.c
View File

@@ -28,7 +28,6 @@ static uint32 WRAMSIZE;
static uint8 mmc3_reg[8]; static uint8 mmc3_reg[8];
static uint8 exRegs[8]; static uint8 exRegs[8];
static uint8 pointer; static uint8 pointer;
static uint8 locked;
static uint8 readDIP; static uint8 readDIP;
static uint16 prgAND; static uint16 prgAND;
static uint16 chrAND; static uint16 chrAND;
@@ -57,15 +56,15 @@ static SFORMAT BS110_StateRegs[] =
int BS110GetPRGBank(int bank) int BS110GetPRGBank(int bank)
{ {
if (~bank & 1 && (pointer & 0x40)) bank ^= 2; if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
return bank & 2 ? 0xFE | bank & 1 : mmc3_reg[6 | bank & 1]; return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
} }
void BS110SyncPRG_GNROM(int A14, int AND, int OR) { void BS110SyncPRG_GNROM(int A14, int AND, int OR) {
setprg8(0x8000, (BS110GetPRGBank(0) &~A14) &AND | OR); setprg8(0x8000, ((BS110GetPRGBank(0) &~A14) &AND) | OR);
setprg8(0xA000, (BS110GetPRGBank(1) &~A14) &AND | OR); setprg8(0xA000, ((BS110GetPRGBank(1) &~A14) &AND) | OR);
setprg8(0xC000, (BS110GetPRGBank(0) | A14) &AND | OR); setprg8(0xC000, ((BS110GetPRGBank(0) | A14) &AND) | OR);
setprg8(0xE000, (BS110GetPRGBank(1) | A14) &AND | OR); setprg8(0xE000, ((BS110GetPRGBank(1) | A14) &AND) | OR);
} }
static void BS110CW(uint32 A, uint8 V) { static void BS110CW(uint32 A, uint8 V) {
@@ -83,18 +82,18 @@ static void BS110PW(uint32 A, uint8 V) {
uint8 block = (exRegs[1] & 3) << 4; uint8 block = (exRegs[1] & 3) << 4;
if ((exRegs[1] >> 3) & 0x01) if ((exRegs[1] >> 3) & 0x01)
{ {
setprg8(0x8000, (BS110GetPRGBank(0)) & mask | block); setprg8(0x8000, ((BS110GetPRGBank(0)) & mask) | block);
setprg8(0xA000, (BS110GetPRGBank(1)) & mask | block); setprg8(0xA000, ((BS110GetPRGBank(1)) & mask) | block);
setprg8(0xC000, (BS110GetPRGBank(0)) & mask | block); setprg8(0xC000, ((BS110GetPRGBank(0)) & mask) | block);
setprg8(0xE000, (BS110GetPRGBank(1)) & mask | block); setprg8(0xE000, ((BS110GetPRGBank(1)) & mask) | block);
} }
else else
{ {
setprg8(0x8000, (BS110GetPRGBank(0)) & mask | block); setprg8(0x8000, ((BS110GetPRGBank(0)) & mask) | block);
setprg8(0xA000, (BS110GetPRGBank(1)) & mask | block); setprg8(0xA000, ((BS110GetPRGBank(1)) & mask) | block);
setprg8(0xC000, (BS110GetPRGBank(0) | 2) & mask | block); setprg8(0xC000, ((BS110GetPRGBank(0) | 2) & mask) | block);
setprg8(0xE000, (BS110GetPRGBank(1) | 2) & mask | block); setprg8(0xE000, ((BS110GetPRGBank(1) | 2) & mask) | block);
} }
} }
else else

12
src/boards/Bs5652.c
View File

@@ -70,15 +70,15 @@ void Bs5652AnalyzeReg()
int Bs5652GetPRGBank(int bank) int Bs5652GetPRGBank(int bank)
{ {
if (~bank & 1 && (pointer & 0x40)) bank ^= 2; if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
return bank & 2 ? 0xFE | bank & 1 : mmc3_reg[6 | bank & 1]; return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
} }
void Bs5652SyncPRG_GNROM(int A14, int AND, int OR) { void Bs5652SyncPRG_GNROM(int A14, int AND, int OR) {
setprg8(0x8000, (Bs5652GetPRGBank(0) &~A14) &AND | OR); setprg8(0x8000, ((Bs5652GetPRGBank(0) &~A14) &AND) | OR);
setprg8(0xA000, (Bs5652GetPRGBank(1) &~A14) &AND | OR); setprg8(0xA000, ((Bs5652GetPRGBank(1) &~A14) &AND) | OR);
setprg8(0xC000, (Bs5652GetPRGBank(0) | A14) &AND | OR); setprg8(0xC000, ((Bs5652GetPRGBank(0) | A14) &AND) | OR);
setprg8(0xE000, (Bs5652GetPRGBank(1) | A14) &AND | OR); setprg8(0xE000, ((Bs5652GetPRGBank(1) | A14) &AND) | OR);
} }
static void Bs5652CW(uint32 A, uint8 V) { static void Bs5652CW(uint32 A, uint8 V) {

12
src/boards/KG256.c
View File

@@ -40,17 +40,17 @@ static void Sync(void)
r = 1; r = 1;
if ((regs[1] >> 4) & 0x01) if ((regs[1] >> 4) & 0x01)
{ {
setprg16(0x8000, regs[1] & 0x07 | (r) << 3); setprg16(0x8000, (regs[1] & 0x07) | (r << 3));
setprg16(0xC000, regs[1] & 0x07 | (r) << 3); setprg16(0xC000, (regs[1] & 0x07) | (r << 3));
setchr8(regs[0] & 0x07 | (r) << 3); setchr8((regs[0] & 0x07) | (r << 3));
} }
else else
{ {
setprg32(0x8000, (regs[1] >> 1) & 0x03 | (r) << 2); setprg32(0x8000, ((regs[1] >> 1) & 0x03) | (r << 2));
setchr8(regs[2] & 0x01 | (r) << 3); setchr8((regs[2] & 0x01) | (r << 3));
} }
mirr = (((regs[0] >> 4 & 0x1))); mirr = (((regs[0] >> 4) & 0x1));
if (mirr) if (mirr)
setmirror(0); setmirror(0);

20
src/boards/NC7000M.c
View File

@@ -64,22 +64,22 @@ void NC7000MAnalyzeReg()
prgAND = (reg & 0x08 ? 0x0F : 0x1F); prgAND = (reg & 0x08 ? 0x0F : 0x1F);
chrAND = (reg & 0x40 ? 0x7F : 0xFF); chrAND = (reg & 0x40 ? 0x7F : 0xFF);
prgOR = (reg << 4 & 0x30); prgOR = (reg << 4 & 0x30);
chrOR = (reg << 3 & 0x080 | reg & 0x100); chrOR = ((reg << 3) & 0x080) | (reg & 0x100);
nrom = (reg & 0x20); nrom = (reg & 0x20);
nrom256 = (reg & 0x04); nrom256 = (reg & 0x04);
} }
int NC7000MGetPRGBank(int bank) int NC7000MGetPRGBank(int bank)
{ {
if (~bank & 1 && (pointer & 0x40)) bank ^= 2; if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
return bank & 2 ? 0xFE | bank & 1 : mmc3_reg[6 | bank & 1]; return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
} }
void NC7000MSyncPRG_GNROM(int A14, int AND, int OR) { void NC7000MSyncPRG_GNROM(int A14, int AND, int OR) {
setprg8(0x8000, (NC7000MGetPRGBank(0) &~A14) &AND | OR); setprg8(0x8000, ((NC7000MGetPRGBank(0) &~A14) &AND) | OR);
setprg8(0xA000, (NC7000MGetPRGBank(1) &~A14) &AND | OR); setprg8(0xA000, ((NC7000MGetPRGBank(1) &~A14) &AND) | OR);
setprg8(0xC000, (NC7000MGetPRGBank(0) | A14) &AND | OR); setprg8(0xC000, ((NC7000MGetPRGBank(0) | A14) &AND) | OR);
setprg8(0xE000, (NC7000MGetPRGBank(1) | A14) &AND | OR); setprg8(0xE000, ((NC7000MGetPRGBank(1) | A14) &AND) | OR);
} }
static void NC7000MCW(uint32 A, uint8 V) { static void NC7000MCW(uint32 A, uint8 V) {
@@ -124,7 +124,7 @@ static DECLFW(NC7000MWriteHi) {
static DECLFW(NC7000MWriteLo) { static DECLFW(NC7000MWriteLo) {
if (!(reg & 0x80)) { if (!(reg & 0x80)) {
reg = V | A & 0x100; reg = V | (A & 0x100);
NC7000MAnalyzeReg(); NC7000MAnalyzeReg();
FixMMC3PRG(MMC3_cmd); FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd); FixMMC3CHR(MMC3_cmd);
@@ -134,10 +134,6 @@ static DECLFW(NC7000MWriteLo) {
WRAM[A - 0x6000] = V; WRAM[A - 0x6000] = V;
} }
} }
static DECLFR(NC7000MReadHi)
{
return CartBR(A);
}
static void NC7000MPower(void) { static void NC7000MPower(void) {
mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02; mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;

9
src/boards/mmc1.c
View File

@@ -66,15 +66,6 @@ static DECLFR(MAWRAM) {
return(Page[A >> 11][A]); return(Page[A >> 11][A]);
} }
static void MMC1WRAM(void) {
if (WRAMSIZE > 8192) {
if (WRAMSIZE > 16384)
setprg8r(0x10, 0x6000, (DRegs[1] >> 2) & 3);
else
setprg8r(0x10, 0x6000, (DRegs[1] >> 3) & 1);
}
}
static void MMC1CHR(void) { static void MMC1CHR(void) {
if (MMC1WRAMHook8) /* Use custom wram hook, currently used for M543 */ if (MMC1WRAMHook8) /* Use custom wram hook, currently used for M543 */
MMC1WRAMHook8(); MMC1WRAMHook8();

2
src/unif.c
View File

@@ -312,7 +312,7 @@ static int SetBoardName(FCEUFILE *fp) {
FCEU_fread(boardname, 1, uchead.info, fp); FCEU_fread(boardname, 1, uchead.info, fp);
boardname[uchead.info] = 0; boardname[uchead.info] = 0;
/* strip whitespaces */ /* strip whitespaces */
boardname = string_trim_whitespace((char const*)boardname); boardname = (uint8*)string_trim_whitespace((char *const)boardname);
FCEU_printf(" Board name: %s\n", boardname); FCEU_printf(" Board name: %s\n", boardname);
sboardname = boardname; sboardname = boardname;
if (!memcmp(boardname, "NES-", 4) || !memcmp(boardname, "UNL-", 4) || if (!memcmp(boardname, "NES-", 4) || !memcmp(boardname, "UNL-", 4) ||