From c08f7b4ef2e6f93d28c5ff80ae5ed5ea568db949 Mon Sep 17 00:00:00 2001 From: DH Date: Sat, 5 Apr 2025 23:10:22 +0300 Subject: [PATCH] fix formatting --- rpcs3/rpcs3/Crypto/unpkg.h | 2 +- rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp | 6 ++++-- rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 3 ++- rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp | 6 ++++-- rpcs3/rpcs3/Emu/Cell/SPUThread.h | 8 ++++---- rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 2 +- tools/spv-gen/spv-gen.cpp | 3 ++- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/rpcs3/rpcs3/Crypto/unpkg.h b/rpcs3/rpcs3/Crypto/unpkg.h index c103e6d75..cdfeeefbf 100644 --- a/rpcs3/rpcs3/Crypto/unpkg.h +++ b/rpcs3/rpcs3/Crypto/unpkg.h @@ -93,7 +93,7 @@ struct PKGHeader char title_id[48]; // Title ID be_t qa_digest[2]; // This should be the hash of "files + attribs" be_t klicensee; // Nonce - // + some stuff + // + some stuff }; // Extended header in PSP and PSVita packages diff --git a/rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp index 0203cb6b0..b3d4826ee 100644 --- a/rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp +++ b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp @@ -1903,7 +1903,8 @@ error_code cellAudioAdd2chData(u32 portNum, vm::ptr src, u32 samples, flo { dst[i * 8 + 0] += src[i * 2 + 0] * volume; // mix L ch dst[i * 8 + 1] += src[i * 2 + 1] * volume; // mix R ch - // dst[i * 8 + 2] += 0.0f; // center + + // dst[i * 8 + 2] += 0.0f; // center // dst[i * 8 + 3] += 0.0f; // LFE // dst[i * 8 + 4] += 0.0f; // rear L // dst[i * 8 + 5] += 0.0f; // rear R @@ -1956,7 +1957,8 @@ error_code cellAudioAdd6chData(u32 portNum, vm::ptr src, float volume) dst[i * 8 + 3] += src[i * 6 + 5] * volume; // mix LFE dst[i * 8 + 4] += src[i * 6 + 3] * volume; // mix rear L dst[i * 8 + 5] += src[i * 6 + 4] * volume; // mix rear R - // dst[i * 8 + 6] += 0.0f; // side L + + // dst[i * 8 + 6] += 0.0f; // side L // dst[i * 8 + 7] += 0.0f; // side R } } diff --git a/rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index d5f536a37..40e5fe060 100644 --- a/rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -786,7 +786,8 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v { cellSaveData.notice("savedata_op(): dirNamePrefix is '*'. Listing all entries starting with '%s'. operation=%d", Emu.GetTitleID(), operation); prefix_list.front() = Emu.GetTitleID(); // TODO: Let's be cautious for now and only list savedata starting with this game's ID - // prefix_list.front().clear(); // List savedata of all the games of this user + + // prefix_list.front().clear(); // List savedata of all the games of this user } // get the saves matching the supplied prefix diff --git a/rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp index 436bd6ea5..57f888e44 100644 --- a/rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp +++ b/rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp @@ -245,7 +245,8 @@ void populate_music_info(CellSearchMusicInfo& info, const utils::media_info& mi, info.codec = CELL_SEARCH_CODEC_AT3P; break; case 88078: // AV_CODEC_ID_ATRAC3AL - // case 88079: // AV_CODEC_ID_ATRAC3PAL TODO: supported ? + + // case 88079: // AV_CODEC_ID_ATRAC3PAL TODO: supported ? info.codec = CELL_SEARCH_CODEC_ATALL; break; // TODO: Find out if any of this works @@ -332,7 +333,8 @@ void populate_video_info(CellSearchVideoInfo& info, const utils::media_info& mi, info.audioCodec = CELL_SEARCH_CODEC_AT3P; break; case 88078: // AV_CODEC_ID_ATRAC3AL - // case 88079: // AV_CODEC_ID_ATRAC3PAL TODO: supported ? + + // case 88079: // AV_CODEC_ID_ATRAC3PAL TODO: supported ? info.audioCodec = CELL_SEARCH_CODEC_ATALL; break; // TODO: Find out if any of this works diff --git a/rpcs3/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/rpcs3/Emu/Cell/SPUThread.h index 17913bf15..9f0b8a93c 100644 --- a/rpcs3/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/rpcs3/Emu/Cell/SPUThread.h @@ -501,10 +501,10 @@ extern const spu_imm_table_t g_spu_imm; enum FPSCR_EX { // Single-precision exceptions - FPSCR_SOVF = 1 << 2, // Overflow - FPSCR_SUNF = 1 << 1, // Underflow - FPSCR_SDIFF = 1 << 0, // Different (could be IEEE non-compliant) - // Double-precision exceptions + FPSCR_SOVF = 1 << 2, // Overflow + FPSCR_SUNF = 1 << 1, // Underflow + FPSCR_SDIFF = 1 << 0, // Different (could be IEEE non-compliant) + // Double-precision exceptions FPSCR_DOVF = 1 << 13, // Overflow FPSCR_DUNF = 1 << 12, // Underflow FPSCR_DINX = 1 << 11, // Inexact diff --git a/rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index 26ceeaa8f..cb0f15afa 100644 --- a/rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -174,7 +174,7 @@ private: {0x0E6F, 0x200A, 0x200A, "Kamen Rider Summonride Portal", nullptr, nullptr}, // Cameras - // {0x1415, 0x0020, 0x2000, "Sony Playstation Eye", nullptr, nullptr}, // TODO: verifiy + // {0x1415, 0x0020, 0x2000, "Sony Playstation Eye", nullptr, nullptr}, // TODO: verifiy // Music devices {0x1415, 0x0000, 0x0000, "Singstar Microphone", nullptr, nullptr}, diff --git a/tools/spv-gen/spv-gen.cpp b/tools/spv-gen/spv-gen.cpp index 1a1323952..fd3e88a2b 100644 --- a/tools/spv-gen/spv-gen.cpp +++ b/tools/spv-gen/spv-gen.cpp @@ -468,7 +468,8 @@ inline void generateInstructions(std::set &composites, } if (inst["opname"] == "OpTypeVoid") { instructionDecoderBody += " if (voidType != nullptr) {\n"; - instructionDecoderBody += " voidType.replaceAllUsesWith(inst);\n"; + instructionDecoderBody += + " voidType.replaceAllUsesWith(inst);\n"; instructionDecoderBody += " voidType.remove();\n"; instructionDecoderBody += " }\n"; instructionDecoderBody += " voidType = inst;\n";