eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PSX region detection fixes (#596)

Browse Source 
* PSX: improve game ID detection to support more games

This adds game ID prefixes for some demos, which fixes region detection
for those games.

* PSX: implement region detection based on the license string

This fixes region detection for many games, even if the game ID is not
properly detected.
This commit is contained in:
Marcoen Hirschberg
2022-05-08 19:38:36 +02:00
committed by GitHub
parent 10d1c2f0ce
commit 3db1b1475d
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
support/psx/psx.cpp
View File

@@ -557,6 +557,14 @@ const region_info_t region_info_table[]
{ "SLPM", region_t::JP },
{ "SCPS", region_t::JP },
{ "SLPS", region_t::JP },
// for demo disks
{ "PUPX", region_t::US },
{ "PEPX", region_t::EU },
{ "PAPX", region_t::JP },
{ "PCPX", region_t::JP },
{ "SCZS", region_t::JP },
{ "SCED", region_t::EU },
{ "SLED", region_t::EU },
};
struct game_info_t
@@ -565,6 +573,25 @@ struct game_info_t
region_t region;
};
static region_t psx_get_region()
{
uint8_t buffer[CD_SECTOR_LEN];
int license_sector = 154;
psx_read_cd(buffer, license_sector, 1);
uint8_t* license_start = (uint8_t*)memmem(buffer, CD_SECTOR_LEN, " Licensed by Sony Computer Entertainment ", 60);
if (license_start) {
const uint8_t* region_start = license_start + 60;
if (memcmp(region_start, "Amer ica ", 10) == 0)
return region_t::US;
if (memcmp(region_start, "Inc.", 4) == 0)
return region_t::JP;
if (memcmp(region_start, "Euro pe", 7) == 0)
return region_t::EU;
}
return region_t::UNKNOWN;
}
static game_info_t psx_get_game_info()
{
uint8_t buffer[CD_SECTOR_LEN];
@@ -573,7 +600,7 @@ static game_info_t psx_get_game_info()
memset(game_id, 0, sizeof(game_id));
enum region_t game_region = UNKNOWN;
for (int sector = ROOT_FOLDER_LBA; sector < ROOT_FOLDER_LBA + 3; ++sector)
for (int sector = ROOT_FOLDER_LBA; sector < ROOT_FOLDER_LBA + 25; ++sector)
{
psx_read_cd(buffer, sector, 1);
//hexdump(buffer, CD_SECTOR_LEN);
@@ -651,7 +678,10 @@ void psx_mount_cd(int f_index, int s_index, const char *filename)
int reset = 0;
game_info_t game_info = psx_get_game_info();
const char* game_id = game_info.game_id;
printf("Game ID: %s, region: %s\n", game_id, region_string(game_info.region));
region_t region = psx_get_region();
if (region == region_t::UNKNOWN)
region = game_info.region;
printf("Game ID: %s, region: %s\n", game_id, region_string(region));
int name_len = strlen(filename);
@@ -730,7 +760,7 @@ void psx_mount_cd(int f_index, int s_index, const char *filename)
mask = libCryptMask(&sbi_file);
}
send_cue_and_metadata(&toc, mask, game_info.region, reset);
send_cue_and_metadata(&toc, mask, region, reset);
user_io_set_index(f_index);
process_ss(filename, name_len != 0);