incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assign a specific_version for PC NTE

Browse Source
This commit is contained in:
Martin Michelsen
2025-10-05 11:27:59 -07:00
parent 4074530a71
commit 036b4e9456
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1
View File
@@ -482,6 +482,7 @@ The specific versions are:
| PSO DC v2 JP | 2OJF | SH-4 | | PSO DC v2 JP | 2OJF | SH-4 |
| PSO DC v2 US | 2OEF | SH-4 | | PSO DC v2 US | 2OEF | SH-4 |
| PSO DC v2 EU | 2OPF | SH-4 | | PSO DC v2 EU | 2OPF | SH-4 |
| PSO PC (v2) Trial Edition | 2OJT | Client functions not supported |
| PSO PC (v2) 04/2002 | 2OJW | Client functions not supported | | PSO PC (v2) 04/2002 | 2OJW | Client functions not supported |
| PSO PC (v2) 02/2003 | 2OJZ | Client functions not supported | | PSO PC (v2) 02/2003 | 2OJZ | Client functions not supported |
| PSO GC Trial Edition | 3OJT | PowerPC | | PSO GC Trial Edition | 3OJT | PowerPC |
notes/ar-codes.txt
+1
View File
@@ -17,6 +17,7 @@ Version codes (from README.md):
2OJF: PSO DC v2 JP 2OJF: PSO DC v2 JP
2OEF: PSO DC v2 US 2OEF: PSO DC v2 US
2OPF: PSO DC v2 EU 2OPF: PSO DC v2 EU
2OJT: PSO PC Trial Edition
2OJW: PSO PC (v2) 04/2002 2OJW: PSO PC (v2) 04/2002
2OJZ: PSO PC (v2) 02/2003 2OJZ: PSO PC (v2) 02/2003
3OJT: PSO GC Trial Edition 3OJT: PSO GC Trial Edition
src/Version.cc
+6 -2
View File
@@ -162,6 +162,8 @@ uint32_t default_specific_version_for_version(Version version, int64_t sub_versi
} }
case Version::DC_V2: case Version::DC_V2:
return SPECIFIC_VERSION_DC_V2_INDETERMINATE; // 2___; need to send VersionDetectDC return SPECIFIC_VERSION_DC_V2_INDETERMINATE; // 2___; need to send VersionDetectDC
case Version::PC_NTE:
return SPECIFIC_VERSION_PC_V2_NTE; // 2OJT
case Version::PC_V2: case Version::PC_V2:
return SPECIFIC_VERSION_PC_V2_INDETERMINATE; // 2OJ_; need to send checksum command return SPECIFIC_VERSION_PC_V2_INDETERMINATE; // 2OJ_; need to send checksum command
case Version::GC_NTE: case Version::GC_NTE:
@@ -215,7 +217,6 @@ bool specific_version_is_indeterminate(uint32_t specific_version) {
} }
bool specific_version_is_dc(uint32_t specific_version) { bool specific_version_is_dc(uint32_t specific_version) {
// All v1 and v2 specific_versions are DC except 2OJW and 2OJZ, which are PC
uint8_t major_version = specific_version >> 24; uint8_t major_version = specific_version >> 24;
if (major_version < 0x31 || major_version > 0x32) { if (major_version < 0x31 || major_version > 0x32) {
return false; return false;
@@ -224,7 +225,10 @@ bool specific_version_is_dc(uint32_t specific_version) {
} }
bool specific_version_is_pc_v2(uint32_t specific_version) { bool specific_version_is_pc_v2(uint32_t specific_version) {
return ((specific_version == SPECIFIC_VERSION_PC_V2_DEFAULT) || (specific_version == SPECIFIC_VERSION_PC_V2_FINAL)); // All v1 and v2 specific_versions are DC except these, which are PC
return ((specific_version == SPECIFIC_VERSION_PC_V2_NTE) ||
(specific_version == SPECIFIC_VERSION_PC_V2_DEFAULT) ||
(specific_version == SPECIFIC_VERSION_PC_V2_FINAL));
} }
bool specific_version_is_gc(uint32_t specific_version) { bool specific_version_is_gc(uint32_t specific_version) {
src/Version.hh
+1
View File
@@ -192,6 +192,7 @@ constexpr uint32_t SPECIFIC_VERSION_DC_V1_EU_INDETERMINATE = 0x314F5000; // 1OP_
constexpr uint32_t SPECIFIC_VERSION_DC_V1_INDETERMINATE = 0x31000000; // 1___ constexpr uint32_t SPECIFIC_VERSION_DC_V1_INDETERMINATE = 0x31000000; // 1___
constexpr uint32_t SPECIFIC_VERSION_DC_V2_INDETERMINATE = 0x32000000; // 2___ constexpr uint32_t SPECIFIC_VERSION_DC_V2_INDETERMINATE = 0x32000000; // 2___
constexpr uint32_t SPECIFIC_VERSION_PC_V2_INDETERMINATE = 0x324F4A00; // 2OJ_ constexpr uint32_t SPECIFIC_VERSION_PC_V2_INDETERMINATE = 0x324F4A00; // 2OJ_
constexpr uint32_t SPECIFIC_VERSION_PC_V2_NTE = 0x324F4A54; // 2OJT
constexpr uint32_t SPECIFIC_VERSION_PC_V2_DEFAULT = 0x324F4A57; // 2OJW constexpr uint32_t SPECIFIC_VERSION_PC_V2_DEFAULT = 0x324F4A57; // 2OJW
constexpr uint32_t SPECIFIC_VERSION_PC_V2_FINAL = 0x324F4A5A; // 2OJZ constexpr uint32_t SPECIFIC_VERSION_PC_V2_FINAL = 0x324F4A5A; // 2OJZ
constexpr uint32_t SPECIFIC_VERSION_GC_NTE = 0x334F4A54; // 3OJT constexpr uint32_t SPECIFIC_VERSION_GC_NTE = 0x334F4A54; // 3OJT