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

Sync unif.c and Fceuwin.dev with upstream

Browse Source
This commit is contained in:
Oggom
2015-06-18 16:50:20 +02:00
parent 4cf16b1887
commit 561848064e
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Fceuwin.dev
View File

@@ -3167,3 +3167,13 @@ Priority=1000
OverrideBuildCmd=0 OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit296]
FileName=src\boards\coolboy.c
CompileCpp=0
Folder=boards/mmc3 based
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

15
src/unif.c
View File

@@ -353,7 +353,7 @@ 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_256KCHRR }, { "FK23C", BMCFK23C_Init, BMCFLAG_256KCHRR },
{ "FK23CA", BMCFK23CA_Init, BMCFLAG_256KCHRR }, { "FK23CA", BMCFK23CA_Init, BMCFLAG_256KCHRR },
{ "FS304", UNLFS304_Init, 0 }, { "FS304", UNLFS304_Init, 0 },
{ "G-146", BMCG146_Init, 0 }, { "G-146", BMCG146_Init, 0 },
@@ -449,7 +449,7 @@ static BMAPPING bmap[] = {
{ "UOROM", UNROM_Init, 0 }, { "UOROM", UNROM_Init, 0 },
{ "VRC7", UNLVRC7_Init, 0 }, { "VRC7", UNLVRC7_Init, 0 },
{ "YOKO", UNLYOKO_Init, 0 }, { "YOKO", UNLYOKO_Init, 0 },
{ "COOLBOY", COOLBOY_Init, BMCFLAG_256KCHRR }, { "COOLBOY", COOLBOY_Init, BMCFLAG_256KCHRR },
{ "158B", UNL158B_Init, 0 }, { "158B", UNL158B_Init, 0 },
#ifdef COPYFAMI #ifdef COPYFAMI
@@ -511,13 +511,16 @@ static int InitializeBoard(void) {
if (!strcmp((char*)sboardname, (char*)bmap[x].name)) { if (!strcmp((char*)sboardname, (char*)bmap[x].name)) {
if (!malloced[16]) { if (!malloced[16]) {
if (bmap[x].flags & BMCFLAG_16KCHRR) if (bmap[x].flags & BMCFLAG_16KCHRR)
CHRRAMSize = 16384; CHRRAMSize = 16;
else if (bmap[x].flags & BMCFLAG_32KCHRR) else if (bmap[x].flags & BMCFLAG_32KCHRR)
CHRRAMSize = 32768; CHRRAMSize = 32;
else if (bmap[x].flags & BMCFLAG_128KCHRR)
CHRRAMSize = 128;
else if (bmap[x].flags & BMCFLAG_256KCHRR) else if (bmap[x].flags & BMCFLAG_256KCHRR)
CHRRAMSize = 256 * 1024; CHRRAMSize = 256;
else else
CHRRAMSize = 8192; CHRRAMSize = 8;
CHRRAMSize <<= 10;
if ((UNIFchrrama = (uint8*)FCEU_malloc(CHRRAMSize))) { if ((UNIFchrrama = (uint8*)FCEU_malloc(CHRRAMSize))) {
SetupCartCHRMapping(0, UNIFchrrama, CHRRAMSize, 1); SetupCartCHRMapping(0, UNIFchrrama, CHRRAMSize, 1);
AddExState(UNIFchrrama, CHRRAMSize, 0, "CHRR"); AddExState(UNIFchrrama, CHRRAMSize, 0, "CHRR");