catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang: fixed formatting

This commit is contained in:
bax-cz 2024-08-19 20:40:23 +02:00
parent 516a3e7104
commit 8f7b3c2e8c
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/file_format/playgo_chunk.cpp
View File

@ -27,7 +27,7 @@ bool PlaygoFile::LoadChunks(const Common::FS::IOFile& file) {
if (ret) { if (ret) {
chunks.resize(playgoHeader.chunk_count); chunks.resize(playgoHeader.chunk_count);
auto chunk_attrs = auto chunk_attrs =
reinterpret_cast<playgo_chunk_attr_entry_t*>(&chunk_attrs_data[0]); reinterpret_cast<playgo_chunk_attr_entry_t*>(&chunk_attrs_data[0]);
auto chunk_mchunks = reinterpret_cast<u16*>(&chunk_mchunks_data[0]); auto chunk_mchunks = reinterpret_cast<u16*>(&chunk_mchunks_data[0]);
@ -61,7 +61,7 @@ bool PlaygoFile::LoadChunks(const Common::FS::IOFile& file) {
} }
bool PlaygoFile::load_chunk_data(const Common::FS::IOFile& file, const chunk_t& chunk, bool PlaygoFile::load_chunk_data(const Common::FS::IOFile& file, const chunk_t& chunk,
std::string& data) { std::string& data) {
if (file.IsOpen()) { if (file.IsOpen()) {
if (file.Seek(chunk.offset)) { if (file.Seek(chunk.offset)) {
data.resize(chunk.length); data.resize(chunk.length);
@ -70,6 +70,6 @@ bool PlaygoFile::load_chunk_data(const Common::FS::IOFile& file, const chunk_t&
return true; return true;
} }
} }
} }
return false; return false;
} }

6
src/core/file_format/playgo_chunk.h
View File

@ -36,8 +36,8 @@ struct PlaygoHeader {
chunk_t chunk_attrs; // [0;32000] chunk_t chunk_attrs; // [0;32000]
chunk_t chunk_mchunks; chunk_t chunk_mchunks;
chunk_t chunk_labels; // [0;16000] chunk_t chunk_labels; // [0;16000]
chunk_t mchunk_attrs; // [0;12800] chunk_t mchunk_attrs; // [0;12800]
chunk_t scenario_attrs; // [0;1024] chunk_t scenario_attrs; // [0;1024]
chunk_t scenario_chunks; chunk_t scenario_chunks;
chunk_t scenario_labels; chunk_t scenario_labels;
@ -67,7 +67,7 @@ struct playgo_chunk_attr_entry_t {
u16 mchunk_count; u16 mchunk_count;
u64 language_mask; u64 language_mask;
u32 mchunks_offset; //<-chunk_mchunks u32 mchunks_offset; //<-chunk_mchunks
u32 label_offset; //<-chunk_labels u32 label_offset; //<-chunk_labels
} __attribute__((packed)); } __attribute__((packed));
struct playgo_chunk_loc_t { struct playgo_chunk_loc_t {

18
src/core/libraries/playgo/playgo.cpp
View File

@ -103,7 +103,7 @@ s32 PS4_SYSV_ABI scePlayGoGetInstallSpeed(OrbisPlayGoHandle handle,
} }
} }
*outSpeed = playgo->speed; *outSpeed = playgo->speed;
return ORBIS_OK; return ORBIS_OK;
} }
@ -126,8 +126,8 @@ s32 PS4_SYSV_ABI scePlayGoGetLanguageMask(OrbisPlayGoHandle handle,
s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds, s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds,
uint32_t numberOfEntries, OrbisPlayGoLocus* outLoci) { uint32_t numberOfEntries, OrbisPlayGoLocus* outLoci) {
LOG_INFO(Lib_PlayGo, "called handle = {}, chunkIds = {}, numberOfEntries = {}", LOG_INFO(Lib_PlayGo, "called handle = {}, chunkIds = {}, numberOfEntries = {}", handle,
handle, *chunkIds, numberOfEntries); *chunkIds, numberOfEntries);
auto* playgo = Common::Singleton<PlaygoFile>::Instance(); auto* playgo = Common::Singleton<PlaygoFile>::Instance();
@ -142,7 +142,7 @@ s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoCh
if (playgo->GetPlaygoHeader().file_size == 0) if (playgo->GetPlaygoHeader().file_size == 0)
return ORBIS_PLAYGO_ERROR_NOT_SUPPORT_PLAYGO; return ORBIS_PLAYGO_ERROR_NOT_SUPPORT_PLAYGO;
for (uint32_t i = 0; i < numberOfEntries; i++) { for (uint32_t i = 0; i < numberOfEntries; i++) {
if (chunkIds[i] <= playgo->chunks.size()) { if (chunkIds[i] <= playgo->chunks.size()) {
outLoci[i] = OrbisPlayGoLocusValue::ORBIS_PLAYGO_LOCUS_LOCAL_FAST; outLoci[i] = OrbisPlayGoLocusValue::ORBIS_PLAYGO_LOCUS_LOCAL_FAST;
} else { } else {
@ -155,8 +155,8 @@ s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoCh
s32 PS4_SYSV_ABI scePlayGoGetProgress(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds, s32 PS4_SYSV_ABI scePlayGoGetProgress(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds,
uint32_t numberOfEntries, OrbisPlayGoProgress* outProgress) { uint32_t numberOfEntries, OrbisPlayGoProgress* outProgress) {
LOG_INFO(Lib_PlayGo, "called handle = {}, chunkIds = {}, numberOfEntries = {}", LOG_INFO(Lib_PlayGo, "called handle = {}, chunkIds = {}, numberOfEntries = {}", handle,
handle, *chunkIds, numberOfEntries); *chunkIds, numberOfEntries);
auto* playgo = Common::Singleton<PlaygoFile>::Instance(); auto* playgo = Common::Singleton<PlaygoFile>::Instance();
@ -192,8 +192,7 @@ s32 PS4_SYSV_ABI scePlayGoGetProgress(OrbisPlayGoHandle handle, const OrbisPlayG
s32 PS4_SYSV_ABI scePlayGoGetToDoList(OrbisPlayGoHandle handle, OrbisPlayGoToDo* outTodoList, s32 PS4_SYSV_ABI scePlayGoGetToDoList(OrbisPlayGoHandle handle, OrbisPlayGoToDo* outTodoList,
u32 numberOfEntries, u32* outEntries) { u32 numberOfEntries, u32* outEntries) {
LOG_INFO(Lib_PlayGo, "called handle = {} numberOfEntries = {}", handle, LOG_INFO(Lib_PlayGo, "called handle = {} numberOfEntries = {}", handle, numberOfEntries);
numberOfEntries);
auto* playgo = Common::Singleton<PlaygoFile>::Instance(); auto* playgo = Common::Singleton<PlaygoFile>::Instance();
@ -233,8 +232,7 @@ s32 PS4_SYSV_ABI scePlayGoInitialize(OrbisPlayGoInitParams* param) {
sceSystemServiceParamGetInt(ORBIS_SYSTEM_SERVICE_PARAM_ID_LANG, &systemLang); sceSystemServiceParamGetInt(ORBIS_SYSTEM_SERVICE_PARAM_ID_LANG, &systemLang);
playgo->langMask = scePlayGoConvertLanguage(systemLang); playgo->langMask = scePlayGoConvertLanguage(systemLang);
playgo->initialized = true; playgo->initialized = true;
} } else {
else {
return ORBIS_PLAYGO_ERROR_ALREADY_INITIALIZED; return ORBIS_PLAYGO_ERROR_ALREADY_INITIALIZED;
} }
return ORBIS_OK; return ORBIS_OK;

3
src/core/libraries/playgo/playgo.h
View File

@ -19,7 +19,8 @@ s32 PS4_SYSV_ABI scePlayGoGetChunkId(OrbisPlayGoHandle handle, OrbisPlayGoChunkI
u32 numberOfEntries, u32* outEntries); u32 numberOfEntries, u32* outEntries);
s32 PS4_SYSV_ABI scePlayGoGetEta(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds, s32 PS4_SYSV_ABI scePlayGoGetEta(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds,
u32 numberOfEntries, OrbisPlayGoEta* outEta); u32 numberOfEntries, OrbisPlayGoEta* outEta);
s32 PS4_SYSV_ABI scePlayGoGetInstallSpeed(OrbisPlayGoHandle handle, OrbisPlayGoInstallSpeed* outSpeed); s32 PS4_SYSV_ABI scePlayGoGetInstallSpeed(OrbisPlayGoHandle handle,
OrbisPlayGoInstallSpeed* outSpeed);
s32 PS4_SYSV_ABI scePlayGoGetLanguageMask(OrbisPlayGoHandle handle, s32 PS4_SYSV_ABI scePlayGoGetLanguageMask(OrbisPlayGoHandle handle,
OrbisPlayGoLanguageMask* outLanguageMask); OrbisPlayGoLanguageMask* outLanguageMask);
s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds, s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoChunkId* chunkIds,