mirror of https://github.com/snes9xgit/snes9x.git
fix multicart link
This commit is contained in:
radius
parent
5a75d5dec8
commit
4154e6b3dd
|
|
@ -680,32 +680,6 @@ static int is_bsx (uint8 *p)
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Remove_Header(uint8_t *&romptr, size_t &romsize, bool multicart_sufami)
|
|
||||||
{
|
|
||||||
if (romptr==0 || romsize==0) return;
|
|
||||||
|
|
||||||
uint32 calc_size = (romsize / 0x2000) * 0x2000;
|
|
||||||
if ((romsize - calc_size == 512 && !Settings.ForceNoHeader) || Settings.ForceHeader)
|
|
||||||
{
|
|
||||||
romptr += 512;
|
|
||||||
romsize -= 512;
|
|
||||||
|
|
||||||
if(log_cb) log_cb(RETRO_LOG_INFO,"[libretro]: ROM header removed\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (multicart_sufami)
|
|
||||||
{
|
|
||||||
if (strncmp((const char*)(romptr+0x100000), "BANDAI SFC-ADX", 14) == 0 &&
|
|
||||||
strncmp((const char*)(romptr+0x000000), "BANDAI SFC-ADX", 14) == 0)
|
|
||||||
{
|
|
||||||
romptr += 0x100000;
|
|
||||||
romsize -= 0x100000;
|
|
||||||
|
|
||||||
if(log_cb) log_cb(RETRO_LOG_INFO,"[libretro]: Sufami Turbo Multi-ROM bios removed\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool8 LoadBIOS(uint8 *biosrom, char *biosname, int biossize)
|
static bool8 LoadBIOS(uint8 *biosrom, char *biosname, int biossize)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
@ -808,17 +782,42 @@ bool retro_load_game(const struct retro_game_info *game)
|
||||||
return rom_loaded;
|
return rom_loaded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void remove_header(uint8_t *&romptr, size_t &romsize, bool multicart_sufami)
|
||||||
|
{
|
||||||
|
if (romptr==0 || romsize==0) return;
|
||||||
|
|
||||||
|
uint32 calc_size = (romsize / 0x2000) * 0x2000;
|
||||||
|
if ((romsize - calc_size == 512 && !Settings.ForceNoHeader) || Settings.ForceHeader)
|
||||||
|
{
|
||||||
|
romptr += 512;
|
||||||
|
romsize -= 512;
|
||||||
|
|
||||||
|
if(log_cb) log_cb(RETRO_LOG_INFO,"[libretro]: ROM header removed\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (multicart_sufami && (romptr + romsize) >= (romptr + 0x100000))
|
||||||
|
{
|
||||||
|
if (strncmp((const char*)(romptr + 0x100000), "BANDAI SFC-ADX", 14) == 0 &&
|
||||||
|
strncmp((const char*)(romptr + 0x000000), "BANDAI SFC-ADX", 14) == 0)
|
||||||
|
{
|
||||||
|
romptr += 0x100000;
|
||||||
|
romsize -= 0x100000;
|
||||||
|
|
||||||
|
if(log_cb) log_cb(RETRO_LOG_INFO,"[libretro]: Sufami Turbo Multi-ROM bios removed\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info)
|
bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info)
|
||||||
{
|
{
|
||||||
uint8_t *romptr[3];
|
uint8_t *romptr[3];
|
||||||
size_t romsize[3];
|
size_t romsize[3];
|
||||||
|
|
||||||
for(size_t lcv=0; lcv<num_info; lcv++)
|
for(size_t i=0; i < num_info; i++)
|
||||||
{
|
{
|
||||||
romptr[lcv] = (uint8_t *) info[lcv].data;
|
romptr[i] = (uint8_t *) info[i].data;
|
||||||
romsize[lcv] = info[lcv].size;
|
romsize[i] = info[i].size;
|
||||||
|
remove_header(romptr[i], romsize[i], true);
|
||||||
Remove_Header(romptr[lcv], romsize[lcv], true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
init_descriptors();
|
init_descriptors();
|
||||||
|
|
@ -826,65 +825,73 @@ bool retro_load_game_special(unsigned game_type, const struct retro_game_info *i
|
||||||
rom_loaded = false;
|
rom_loaded = false;
|
||||||
|
|
||||||
update_variables();
|
update_variables();
|
||||||
|
switch (game_type)
|
||||||
switch (game_type) {
|
{
|
||||||
case RETRO_GAME_TYPE_BSX:
|
case RETRO_GAME_TYPE_BSX:
|
||||||
if(num_info == 1) {
|
if(num_info == 1)
|
||||||
rom_loaded = Memory.LoadROMMem((const uint8_t*)romptr[0],romsize[0]);
|
{
|
||||||
} else if(num_info == 2) {
|
rom_loaded = Memory.LoadROMMem((const uint8_t*)romptr[0],romsize[0]);
|
||||||
memcpy(Memory.BIOSROM,(const uint8_t*)romptr[0],info[0].size);
|
}
|
||||||
rom_loaded = Memory.LoadROMMem((const uint8_t*)romptr[1],info[1].size);
|
else if(num_info == 2)
|
||||||
|
{
|
||||||
|
memcpy(Memory.BIOSROM,(const uint8_t*)romptr[0],info[0].size);
|
||||||
|
rom_loaded = Memory.LoadROMMem((const uint8_t*)romptr[1],info[1].size);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!rom_loaded && log_cb)
|
if (!rom_loaded && log_cb)
|
||||||
log_cb(RETRO_LOG_ERROR, "[libretro]: BSX ROM loading failed...\n");
|
log_cb(RETRO_LOG_ERROR, "[libretro]: BSX ROM loading failed...\n");
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RETRO_GAME_TYPE_BSX_SLOTTED:
|
case RETRO_GAME_TYPE_BSX_SLOTTED:
|
||||||
case RETRO_GAME_TYPE_MULTI_CART:
|
case RETRO_GAME_TYPE_MULTI_CART:
|
||||||
if(num_info == 2) {
|
if(num_info == 2)
|
||||||
if (is_SufamiTurbo_Cart((const uint8_t*)romptr[0], romsize[0])) {
|
{
|
||||||
uint8 *biosrom = new uint8[0x40000];
|
if (is_SufamiTurbo_Cart((const uint8_t*)romptr[0], romsize[0]))
|
||||||
uint8 *biosptr = biosrom;
|
{
|
||||||
|
log_cb(RETRO_LOG_ERROR, "Cart is Sufami Turbo...\n");
|
||||||
|
uint8 *biosrom = new uint8[0x40000];
|
||||||
|
uint8 *biosptr = biosrom;
|
||||||
|
|
||||||
if (LoadBIOS(biosptr,"STBIOS.bin",0x40000)) {
|
if (LoadBIOS(biosptr,"STBIOS.bin",0x40000))
|
||||||
if (log_cb) log_cb(RETRO_LOG_INFO, "[libretro]: Loading Sufami Turbo link game\n");
|
{
|
||||||
|
if (log_cb)
|
||||||
|
log_cb(RETRO_LOG_INFO, "Loading Sufami Turbo link game\n");
|
||||||
|
|
||||||
|
rom_loaded = Memory.LoadMultiCartMem((const uint8_t*)romptr[0], romsize[0],
|
||||||
|
(const uint8_t*)romptr[1], romsize[1], biosptr, 0x40000);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (biosrom)
|
||||||
|
delete[] biosrom;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (log_cb)
|
||||||
|
log_cb(RETRO_LOG_INFO, "[libretro]: Loading Multi-Cart link game\n");
|
||||||
|
|
||||||
rom_loaded = Memory.LoadMultiCartMem((const uint8_t*)romptr[0], romsize[0],
|
rom_loaded = Memory.LoadMultiCartMem((const uint8_t*)romptr[0], romsize[0],
|
||||||
(const uint8_t*)romptr[1], romsize[1], biosptr, 0x40000);
|
(const uint8_t*)romptr[1], romsize[1], NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (biosrom) delete[] biosrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
else {
|
|
||||||
if (log_cb) log_cb(RETRO_LOG_INFO, "[libretro]: Loading Multi-Cart link game\n");
|
|
||||||
|
|
||||||
rom_loaded = Memory.LoadMultiCartMem((const uint8_t*)romptr[0], romsize[0],
|
|
||||||
(const uint8_t*)romptr[1], romsize[1], NULL, 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!rom_loaded && log_cb)
|
if (!rom_loaded && log_cb)
|
||||||
log_cb(RETRO_LOG_ERROR, "[libretro]: Multirom loading failed...\n");
|
log_cb(RETRO_LOG_ERROR, "[libretro]: Multirom loading failed...\n");
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RETRO_GAME_TYPE_SUFAMI_TURBO:
|
case RETRO_GAME_TYPE_SUFAMI_TURBO:
|
||||||
if(num_info == 2) {
|
if(num_info == 2)
|
||||||
uint8 *biosrom = new uint8[0x100000];
|
{
|
||||||
|
uint8 *biosrom = new uint8[0x100000];
|
||||||
|
|
||||||
if ((rom_loaded = LoadBIOS(biosrom,"STBIOS.bin",0x100000)))
|
if ((rom_loaded = LoadBIOS(biosrom,"STBIOS.bin",0x100000)))
|
||||||
rom_loaded = Memory.LoadMultiCartMem((const uint8_t*)romptr[0], romsize[0],
|
rom_loaded = Memory.LoadMultiCartMem((const uint8_t*)romptr[0], romsize[0],
|
||||||
(const uint8_t*)romptr[1], romsize[1], biosrom, 0x40000);
|
(const uint8_t*)romptr[1], romsize[1], biosrom, 0x40000);
|
||||||
|
|
||||||
if (biosrom) delete[] biosrom;
|
if (biosrom)
|
||||||
|
delete[] biosrom;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!rom_loaded && log_cb)
|
if (!rom_loaded && log_cb)
|
||||||
log_cb(RETRO_LOG_ERROR, "[libretro]: Sufami Turbo ROM loading failed...\n");
|
log_cb(RETRO_LOG_ERROR, "[libretro]: Sufami Turbo ROM loading failed...\n");
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
@ -1281,8 +1288,8 @@ void* retro_get_memory_data(unsigned type)
|
||||||
{
|
{
|
||||||
void* data;
|
void* data;
|
||||||
|
|
||||||
switch(type) {
|
switch(type)
|
||||||
case RETRO_MEMORY_SNES_SUFAMI_TURBO_A_RAM:
|
{
|
||||||
case RETRO_MEMORY_SAVE_RAM:
|
case RETRO_MEMORY_SAVE_RAM:
|
||||||
data = Memory.SRAM;
|
data = Memory.SRAM;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue