diff --git a/include/PICA/pica_vertex.hpp b/include/PICA/pica_vertex.hpp index 800dff9aa..bbb32edbc 100644 --- a/include/PICA/pica_vertex.hpp +++ b/include/PICA/pica_vertex.hpp @@ -1,7 +1,8 @@ #pragma once -#include "PICA/float_types.hpp" #include +#include "PICA/float_types.hpp" + namespace PICA { // A representation of the output vertex as it comes out of the vertex shader, with padding and all struct Vertex { diff --git a/include/audio/dsp_core.hpp b/include/audio/dsp_core.hpp index 5a434b91c..5f5efa229 100644 --- a/include/audio/dsp_core.hpp +++ b/include/audio/dsp_core.hpp @@ -8,8 +8,8 @@ #include "helpers.hpp" #include "logger.hpp" -#include "scheduler.hpp" #include "ring_buffer.hpp" +#include "scheduler.hpp" // The DSP core must have access to the DSP service to be able to trigger interrupts properly class DSPService; @@ -39,8 +39,7 @@ namespace Audio { public: enum class Type { Null, Teakra, HLE }; - DSPCore(Memory& mem, Scheduler& scheduler, DSPService& dspService) - : mem(mem), scheduler(scheduler), dspService(dspService) {} + DSPCore(Memory& mem, Scheduler& scheduler, DSPService& dspService) : mem(mem), scheduler(scheduler), dspService(dspService) {} virtual ~DSPCore() {} virtual void reset() = 0; diff --git a/include/audio/null_core.hpp b/include/audio/null_core.hpp index bedec8d39..7a0f368de 100644 --- a/include/audio/null_core.hpp +++ b/include/audio/null_core.hpp @@ -20,7 +20,7 @@ namespace Audio { std::array dspRam; void resetAudioPipe(); - bool loaded = false; // Have we loaded a component? + bool loaded = false; // Have we loaded a component? public: NullDSP(Memory& mem, Scheduler& scheduler, DSPService& dspService) : DSPCore(mem, scheduler, dspService) {} diff --git a/include/renderdoc.hpp b/include/renderdoc.hpp index 94fedd167..02f2ade43 100644 --- a/include/renderdoc.hpp +++ b/include/renderdoc.hpp @@ -59,7 +59,7 @@ namespace Renderdoc { } ~InstantScope() { Renderdoc::endCapture(); } - + InstantScope(const InstantScope&) = delete; InstantScope& operator=(const InstantScope&) = delete; diff --git a/include/services/region_codes.hpp b/include/services/region_codes.hpp index e06894cd4..dba10e346 100644 --- a/include/services/region_codes.hpp +++ b/include/services/region_codes.hpp @@ -9,7 +9,7 @@ enum class Regions : u32 { Australia = 3, China = 4, Korea = 5, - Taiwan = 6 + Taiwan = 6, }; // Used for the language field in the NAND user data @@ -42,137 +42,137 @@ enum class LanguageCodes : u32 { }; enum class CountryCodes : u32 { - JP = 1, - AI = 8, - AG = 9, - AR = 10, - AW = 11, - BS = 12, - BB = 13, - BZ = 14, - BO = 15, - BR = 16, - VG = 17, - CA = 18, - KY = 19, - CL = 20, - CO = 21, - CR = 22, - DM = 23, - DO = 24, - EC = 25, - SV = 26, - GF = 27, - GD = 28, - GP = 29, - GT = 30, - GY = 31, - HT = 32, - HN = 33, - JM = 34, - MQ = 35, - MX = 36, - MS = 37, - AN = 38, - NI = 39, - PA = 40, - PY = 41, - PE = 42, - KN = 43, - LC = 44, - VC = 45, - SR = 46, - TT = 47, - TC = 48, - US = 49, - UY = 50, - VI = 51, - VE = 52, - AL = 64, - AU = 65, - AT = 66, - BE = 67, - BA = 68, - BW = 69, - BG = 70, - HR = 71, - CY = 72, - CZ = 73, - DK = 74, - EE = 75, - FI = 76, - FR = 77, - DE = 78, - GR = 79, - HU = 80, - IS = 81, - IE = 82, - IT = 83, - LV = 84, - LS = 85, - LI = 86, - LT = 87, - LU = 88, - MK = 89, - MT = 90, - ME = 91, - MZ = 92, - NA = 93, - NL = 94, - NZ = 95, - NO = 96, - PL = 97, - PT = 98, - RO = 99, - RU = 100, - RS = 101, - SK = 102, - SI = 103, - ZA = 104, - ES = 105, - SZ = 106, - SE = 107, - CH = 108, - TR = 109, - GB = 110, - ZM = 111, - ZW = 112, - AZ = 113, - MR = 114, - ML = 115, - NE = 116, - TD = 117, - SD = 118, - ER = 119, - DJ = 120, - SO = 121, - AD = 122, - GI = 123, - GG = 124, - IM = 125, - JE = 126, - MC = 127, - TW = 128, - KR = 136, - HK = 144, - MO = 145, - ID = 152, - SG = 153, - TH = 154, - PH = 155, - MY = 156, - CN = 160, - AE = 168, - IND = 169, // We can't use the 2-letter country code for India because the Windows SDK does #define IN... - EG = 170, - OM = 171, - QA = 172, - KW = 173, - SA = 174, - SY = 175, - BH = 176, - JO = 177, - SM = 184, - VA = 185, - BM = 186, + JP = 1, + AI = 8, + AG = 9, + AR = 10, + AW = 11, + BS = 12, + BB = 13, + BZ = 14, + BO = 15, + BR = 16, + VG = 17, + CA = 18, + KY = 19, + CL = 20, + CO = 21, + CR = 22, + DM = 23, + DO = 24, + EC = 25, + SV = 26, + GF = 27, + GD = 28, + GP = 29, + GT = 30, + GY = 31, + HT = 32, + HN = 33, + JM = 34, + MQ = 35, + MX = 36, + MS = 37, + AN = 38, + NI = 39, + PA = 40, + PY = 41, + PE = 42, + KN = 43, + LC = 44, + VC = 45, + SR = 46, + TT = 47, + TC = 48, + US = 49, + UY = 50, + VI = 51, + VE = 52, + AL = 64, + AU = 65, + AT = 66, + BE = 67, + BA = 68, + BW = 69, + BG = 70, + HR = 71, + CY = 72, + CZ = 73, + DK = 74, + EE = 75, + FI = 76, + FR = 77, + DE = 78, + GR = 79, + HU = 80, + IS = 81, + IE = 82, + IT = 83, + LV = 84, + LS = 85, + LI = 86, + LT = 87, + LU = 88, + MK = 89, + MT = 90, + ME = 91, + MZ = 92, + NA = 93, + NL = 94, + NZ = 95, + NO = 96, + PL = 97, + PT = 98, + RO = 99, + RU = 100, + RS = 101, + SK = 102, + SI = 103, + ZA = 104, + ES = 105, + SZ = 106, + SE = 107, + CH = 108, + TR = 109, + GB = 110, + ZM = 111, + ZW = 112, + AZ = 113, + MR = 114, + ML = 115, + NE = 116, + TD = 117, + SD = 118, + ER = 119, + DJ = 120, + SO = 121, + AD = 122, + GI = 123, + GG = 124, + IM = 125, + JE = 126, + MC = 127, + TW = 128, + KR = 136, + HK = 144, + MO = 145, + ID = 152, + SG = 153, + TH = 154, + PH = 155, + MY = 156, + CN = 160, + AE = 168, + IND = 169, // We can't use the 2-letter country code for India because the Windows SDK does #define IN... + EG = 170, + OM = 171, + QA = 172, + KW = 173, + SA = 174, + SY = 175, + BH = 176, + JO = 177, + SM = 184, + VA = 185, + BM = 186, }; \ No newline at end of file diff --git a/src/core/audio/null_core.cpp b/src/core/audio/null_core.cpp index 93c746cb9..7ba584cfa 100644 --- a/src/core/audio/null_core.cpp +++ b/src/core/audio/null_core.cpp @@ -82,7 +82,7 @@ namespace Audio { scheduler.addEvent(Scheduler::EventType::RunDSP, scheduler.currentTimestamp + Audio::cyclesPerFrame); } - + u16 NullDSP::recvData(u32 regId) { if (regId != 0) { Helpers::panic("Audio: invalid register in null frontend"); @@ -116,13 +116,11 @@ namespace Audio { // TODO: Other initialization stuff here dspState = DSPState::On; resetAudioPipe(); - + dspService.triggerPipeEvent(DSPPipeType::Audio); break; - case StateChange::Shutdown: - dspState = DSPState::Off; - break; + case StateChange::Shutdown: dspState = DSPState::Off; break; default: Helpers::panic("Unimplemented DSP audio pipe state change %d", state); }