ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UNIF COOLBOY - small fix 

UNIF FK23C - 256K RAM fix
This commit is contained in:
CaH4e3 2015-02-22 12:23:27 +00:00
parent 6b651e8acf
commit 796f6309c6
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
trunk/src/boards/coolboy.cpp
View File

@ -17,9 +17,14 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* CoolBoy 400-in-1 FK23C-mimic mapper 32Mb PROM + 128K CHR RAM, no wram, no CROM * CoolBoy 400-in-1 FK23C-mimic mapper 16Mb/32Mb PROM + 128K/256K CHR RAM, optional SRAM, optional NTRAM
* only MMC3 mode * only MMC3 mode
* *
* 6000 (õõ76x210) | 0õÑ0
* 6001 (õõõ354õõ)
* 6002 = 0
* 6003 = 0
*
*/ */
#include "mapinc.h" #include "mapinc.h"
@ -28,8 +33,15 @@
static void COOLBOYCW(uint32 A, uint8 V) { static void COOLBOYCW(uint32 A, uint8 V) {
if(EXPREGS[3] & 0x10) if(EXPREGS[3] & 0x10)
setchr8(EXPREGS[2] & 0xF); setchr8(EXPREGS[2] & 0xF);
else else {
setchr1(A, V); uint32 mask = 0xFF;
switch(EXPREGS[0] & 0xC0) {
case 0xC0:
mask = 0x7F;
break;
}
setchr1(A, V & mask);
}
} }
static void COOLBOYPW(uint32 A, uint8 V) { static void COOLBOYPW(uint32 A, uint8 V) {
@ -37,17 +49,12 @@ static void COOLBOYPW(uint32 A, uint8 V) {
uint32 base = ((EXPREGS[0] & 0x07) >> 0) | ((EXPREGS[1] & 0x10) >> 1) | ((EXPREGS[1] & 0x0C) << 2) | ((EXPREGS[0] & 0x30) << 2); uint32 base = ((EXPREGS[0] & 0x07) >> 0) | ((EXPREGS[1] & 0x10) >> 1) | ((EXPREGS[1] & 0x0C) << 2) | ((EXPREGS[0] & 0x30) << 2);
switch(EXPREGS[0] & 0xC0) { switch(EXPREGS[0] & 0xC0) {
case 0x00: case 0x00:
base >>= 2;
mask = 0x3F; mask = 0x3F;
shift = 6;
break; break;
case 0x80: case 0x80:
base >>= 1;
mask = 0x1F; mask = 0x1F;
shift = 5;
break; break;
case 0xC0: case 0xC0:
shift = 4;
if(EXPREGS[3] & 0x10) { if(EXPREGS[3] & 0x10) {
mask = 0x01 | (EXPREGS[1] & 2); mask = 0x01 | (EXPREGS[1] & 2);
} else { } else {
@ -56,19 +63,22 @@ static void COOLBOYPW(uint32 A, uint8 V) {
break; break;
} }
if(EXPREGS[3] & 0x10) if(EXPREGS[3] & 0x10)
setprg8(A, (base << shift) | (V & mask) | ((EXPREGS[3] & (0x0E ^ (EXPREGS[1] & 2))) )); setprg8(A, (base << 4) | (V & mask) | ((EXPREGS[3] & (0x0E ^ (EXPREGS[1] & 2))) ));
else else
setprg8(A, (base << shift) | (V & mask)); setprg8(A, (base << 4) | (V & mask));
} }
static DECLFW(COOLBOYWrite) { static DECLFW(COOLBOYWrite) {
if((EXPREGS[3] & 0x80) == 0) { if(A001B & 0x80)
EXPREGS[A & 3] = V; CartBW(A,V);
FixMMC3PRG(MMC3_cmd); else
FixMMC3CHR(MMC3_cmd); if((EXPREGS[3] & 0x80) == 0) {
uint32 base = ((EXPREGS[0] & 0x07) >> 0) | ((EXPREGS[1] & 0x10) >> 1) | ((EXPREGS[1] & 0x0C) << 2) | ((EXPREGS[0] & 0x30) << 2); EXPREGS[A & 3] = V;
FCEU_printf("exp %02x %02x (base %03d)\n",A,V,base); FixMMC3PRG(MMC3_cmd);
} FixMMC3CHR(MMC3_cmd);
uint32 base = ((EXPREGS[0] & 0x07) >> 0) | ((EXPREGS[1] & 0x10) >> 1) | ((EXPREGS[1] & 0x0C) << 2) | ((EXPREGS[0] & 0x30) << 2);
FCEU_printf("exp %02x %02x (base %03d)\n",A,V,base);
}
} }
static void COOLBOYReset(void) { static void COOLBOYReset(void) {
@ -88,7 +98,7 @@ static void COOLBOYPower(void) {
} }
void COOLBOY_Init(CartInfo *info) { void COOLBOY_Init(CartInfo *info) {
GenMMC3_Init(info, 512, 128, 0, 0); GenMMC3_Init(info, 512, 128, 8, 0);
pwrap = COOLBOYPW; pwrap = COOLBOYPW;
cwrap = COOLBOYCW; cwrap = COOLBOYCW;
info->Power = COOLBOYPower; info->Power = COOLBOYPower;

18
trunk/src/unif.cpp
View File

@ -311,11 +311,11 @@ static int LoadCHR(FCEUFILE *fp) {
return(1); return(1);
} }
#define BMCFLAG_FORCE4 1 #define BMCFLAG_FORCE4 0x01
#define BMCFLAG_16KCHRR 2 #define BMCFLAG_16KCHRR 0x02
#define BMCFLAG_32KCHRR 4 #define BMCFLAG_32KCHRR 0x04
#define BMCFLAG_128KCHRR 8 #define BMCFLAG_128KCHRR 0x08
#define BMCFLAG_EXPCHRR 10 #define BMCFLAG_256KCHRR 0x10
static BMAPPING bmap[] = { static BMAPPING bmap[] = {
{ "11160", BMC11160_Init, 0 }, { "11160", BMC11160_Init, 0 },
@ -355,8 +355,8 @@ static BMAPPING bmap[] = {
{ "ELROM", ELROM_Init, 0 }, { "ELROM", ELROM_Init, 0 },
{ "ETROM", ETROM_Init, 0 }, { "ETROM", ETROM_Init, 0 },
{ "EWROM", EWROM_Init, 0 }, { "EWROM", EWROM_Init, 0 },
{ "FK23C", BMCFK23C_Init, BMCFLAG_EXPCHRR }, { "FK23C", BMCFK23C_Init, BMCFLAG_256KCHRR },
{ "FK23CA", BMCFK23CA_Init, BMCFLAG_EXPCHRR }, { "FK23CA", BMCFK23CA_Init, BMCFLAG_256KCHRR },
{ "FS304", UNLFS304_Init, 0 }, { "FS304", UNLFS304_Init, 0 },
{ "G-146", BMCG146_Init, 0 }, { "G-146", BMCG146_Init, 0 },
{ "GK-192", BMCGK192_Init, 0 }, { "GK-192", BMCGK192_Init, 0 },
@ -457,7 +457,7 @@ static BMAPPING bmap[] = {
{ "VRC7", UNLVRC7_Init, 0 }, { "VRC7", UNLVRC7_Init, 0 },
{ "YOKO", UNLYOKO_Init, 0 }, { "YOKO", UNLYOKO_Init, 0 },
{ "SB-2000", UNLSB2000_Init, 0 }, { "SB-2000", UNLSB2000_Init, 0 },
{ "COOLBOY", COOLBOY_Init, BMCFLAG_128KCHRR }, { "COOLBOY", COOLBOY_Init, BMCFLAG_256KCHRR },
{ 0, 0, 0 } { 0, 0, 0 }
}; };
@ -518,7 +518,7 @@ static int InitializeBoard(void) {
CHRRAMSize = 32; CHRRAMSize = 32;
else if (bmap[x].flags & BMCFLAG_128KCHRR) else if (bmap[x].flags & BMCFLAG_128KCHRR)
CHRRAMSize = 128; CHRRAMSize = 128;
else if (bmap[x].flags & BMCFLAG_EXPCHRR) else if (bmap[x].flags & BMCFLAG_256KCHRR)
CHRRAMSize = 256; CHRRAMSize = 256;
else else
CHRRAMSize = 8; CHRRAMSize = 8;