From fef34bda907318f68b7ec8d6da29e534fc4e3699 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Sat, 22 Feb 2020 13:04:57 +0800 Subject: [PATCH] cnrom: Minor database cleanup - use existing crc32 database for Bingo 75 (Asia) (Unl), this moves checksum check on mapper side instead of unif overrides. - minor cleanup --- src/boards/datalatch.c | 14 +++----------- src/unif.c | 1 - 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c index 1926cdf..1c6e577 100644 --- a/src/boards/datalatch.c +++ b/src/boards/datalatch.c @@ -153,13 +153,7 @@ static void CNROMSync(void) { } void CNROM_Init(CartInfo *info) { - unsigned _no_busc, _busc; - - _busc = 1; /* by default, CNROM is set to emulate bus conflicts to all games */ - _no_busc = 0; - - if (GameInfo->cspecial == 1) - _no_busc = 1; + uint8 CNROM_busc = 1; /* by default, CNROM is set to emulate bus conflicts to all games */ /* TODO: move these to extended database when implemented. */ switch (info->CRC32) { @@ -171,12 +165,10 @@ void CNROM_Init(CartInfo *info) { case 0xe41b440f: /* Sidewinder (Joy Van) */ case 0xb0c871c5: /* Wei Lai Xiao Zi (Joy Van) */ case 0xb3be2f71: /* Yanshan Chess (Unl) */ - _no_busc = 1; + CNROM_busc = 0; break; } - - if (_no_busc == 1) _busc = 0; - Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, _busc); + Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, CNROM_busc); } /*------------------ Map 7 ---------------------------*/ diff --git a/src/unif.c b/src/unif.c index 9fdf4e4..6f31002 100644 --- a/src/unif.c +++ b/src/unif.c @@ -360,7 +360,6 @@ struct _unif_db { static struct _unif_db unif_db[] = { { 0x8ebad077d08e6c78ULL, "A65AS", 1, -1 }, /* 3-in-1 (N080) [p1][U][!], not a real submapper */ - { 0x117181328eb1ad23ULL, "CNROM", 0, MI_H, NO_BUSC }, /* 75 Bingo (Sachen-English) [U] */ { 0x616851e56946893bULL, "RESETNROM-XIN1", 0, MI_V }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p1].unf */ { 0x4cd729b5ae23a3cfULL, "RESETNROM-XIN1", 0, MI_H }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p2].unf */