49 files changed, 339 insertions, 282 deletions

diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index b653523a4..528bb1848 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -186,8 +186,7 @@ void Init() {
     AddService(new AM_U_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace AM
 
diff --git a/src/core/hle/service/am/am_app.cpp b/src/core/hle/service/am/am_app.cpp
index bfc1ca6bd..827e60335 100644
--- a/src/core/hle/service/am/am_app.cpp
+++ b/src/core/hle/service/am/am_app.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_app.h"
+#include "core/hle/service/am/am.h"
 
 namespace Service {
 namespace AM {
diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp
index 3a597a34c..d9d9d78c8 100644
--- a/src/core/hle/service/am/am_net.cpp
+++ b/src/core/hle/service/am/am_net.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_net.h"
+#include "core/hle/service/am/am.h"
 
 namespace Service {
 namespace AM {
diff --git a/src/core/hle/service/am/am_sys.cpp b/src/core/hle/service/am/am_sys.cpp
index 8bb58cab7..6f441f9e7 100644
--- a/src/core/hle/service/am/am_sys.cpp
+++ b/src/core/hle/service/am/am_sys.cpp
@@ -2,33 +2,35 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_sys.h"
+#include "core/hle/service/am/am.h"
 
 namespace Service {
 namespace AM {
 
-const Interface::FunctionInfo FunctionTable[] = {{0x00010040, GetTitleCount, "GetTitleCount"},
-                                                 {0x00020082, GetTitleList, "GetTitleList"},
-                                                 {0x00030084, GetTitleInfo, "GetTitleInfo"},
-                                                 {0x000400C0, nullptr, "DeleteApplicationTitle"},
-                                                 {0x000500C0, nullptr, "GetTitleProductCode"},
-                                                 {0x000600C0, nullptr, "GetTitleExtDataId"},
-                                                 {0x00070080, DeleteTicket, "DeleteTicket"},
-                                                 {0x00080000, GetTicketCount, "GetTicketCount"},
-                                                 {0x00090082, GetTicketList, "GetTicketList"},
-                                                 {0x000A0000, nullptr, "GetDeviceID"},
-                                                 {0x000D0084, nullptr, "GetPendingTitleInfo"},
-                                                 {0x000E00C0, nullptr, "DeletePendingTitle"},
-                                                 {0x00140040, nullptr, "FinalizePendingTitles"},
-                                                 {0x00150040, nullptr, "DeleteAllPendingTitles"},
-                                                 {0x00180080, nullptr, "InitializeTitleDatabase"},
-                                                 {0x00190040, nullptr, "ReloadDBS"},
-                                                 {0x001A00C0, nullptr, "GetDSiWareExportSize"},
-                                                 {0x001B0144, nullptr, "ExportDSiWare"},
-                                                 {0x001C0084, nullptr, "ImportDSiWare"},
-                                                 {0x00230080, nullptr, "GetPendingTitleCount"},
-                                                 {0x002400C2, nullptr, "GetPendingTitleList"}};
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010040, GetTitleCount, "GetTitleCount"},
+    {0x00020082, GetTitleList, "GetTitleList"},
+    {0x00030084, GetTitleInfo, "GetTitleInfo"},
+    {0x000400C0, nullptr, "DeleteApplicationTitle"},
+    {0x000500C0, nullptr, "GetTitleProductCode"},
+    {0x000600C0, nullptr, "GetTitleExtDataId"},
+    {0x00070080, DeleteTicket, "DeleteTicket"},
+    {0x00080000, GetTicketCount, "GetTicketCount"},
+    {0x00090082, GetTicketList, "GetTicketList"},
+    {0x000A0000, nullptr, "GetDeviceID"},
+    {0x000D0084, nullptr, "GetPendingTitleInfo"},
+    {0x000E00C0, nullptr, "DeletePendingTitle"},
+    {0x00140040, nullptr, "FinalizePendingTitles"},
+    {0x00150040, nullptr, "DeleteAllPendingTitles"},
+    {0x00180080, nullptr, "InitializeTitleDatabase"},
+    {0x00190040, nullptr, "ReloadDBS"},
+    {0x001A00C0, nullptr, "GetDSiWareExportSize"},
+    {0x001B0144, nullptr, "ExportDSiWare"},
+    {0x001C0084, nullptr, "ImportDSiWare"},
+    {0x00230080, nullptr, "GetPendingTitleCount"},
+    {0x002400C2, nullptr, "GetPendingTitleList"},
+};
 
 AM_SYS_Interface::AM_SYS_Interface() {
     Register(FunctionTable);
diff --git a/src/core/hle/service/am/am_u.cpp b/src/core/hle/service/am/am_u.cpp
index 32d47741f..c40e56205 100644
--- a/src/core/hle/service/am/am_u.cpp
+++ b/src/core/hle/service/am/am_u.cpp
@@ -2,46 +2,48 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_u.h"
+#include "core/hle/service/am/am.h"
 
 namespace Service {
 namespace AM {
 
-const Interface::FunctionInfo FunctionTable[] = {{0x00010040, GetTitleCount, "GetTitleCount"},
-                                                 {0x00020082, GetTitleList, "GetTitleList"},
-                                                 {0x00030084, GetTitleInfo, "GetTitleInfo"},
-                                                 {0x000400C0, nullptr, "DeleteApplicationTitle"},
-                                                 {0x000500C0, nullptr, "GetTitleProductCode"},
-                                                 {0x000600C0, nullptr, "GetTitleExtDataId"},
-                                                 {0x00070080, DeleteTicket, "DeleteTicket"},
-                                                 {0x00080000, GetTicketCount, "GetTicketCount"},
-                                                 {0x00090082, GetTicketList, "GetTicketList"},
-                                                 {0x000A0000, nullptr, "GetDeviceID"},
-                                                 {0x000D0084, nullptr, "GetPendingTitleInfo"},
-                                                 {0x000E00C0, nullptr, "DeletePendingTitle"},
-                                                 {0x00140040, nullptr, "FinalizePendingTitles"},
-                                                 {0x00150040, nullptr, "DeleteAllPendingTitles"},
-                                                 {0x00180080, nullptr, "InitializeTitleDatabase"},
-                                                 {0x00190040, nullptr, "ReloadDBS"},
-                                                 {0x001A00C0, nullptr, "GetDSiWareExportSize"},
-                                                 {0x001B0144, nullptr, "ExportDSiWare"},
-                                                 {0x001C0084, nullptr, "ImportDSiWare"},
-                                                 {0x00230080, nullptr, "TitleIDListGetTotal2"},
-                                                 {0x002400C2, nullptr, "GetTitleIDList2"},
-                                                 {0x04010080, nullptr, "InstallFIRM"},
-                                                 {0x04020040, nullptr, "StartInstallCIADB0"},
-                                                 {0x04030000, nullptr, "StartInstallCIADB1"},
-                                                 {0x04040002, nullptr, "AbortCIAInstall"},
-                                                 {0x04050002, nullptr, "CloseCIAFinalizeInstall"},
-                                                 {0x04060002, nullptr, "CloseCIA"},
-                                                 {0x040700C2, nullptr, "FinalizeTitlesInstall"},
-                                                 {0x04080042, nullptr, "GetCiaFileInfo"},
-                                                 {0x040E00C2, nullptr, "InstallTitlesFinish"},
-                                                 {0x040F0000, nullptr, "InstallNATIVEFIRM"},
-                                                 {0x041000C0, nullptr, "DeleteTitle"},
-                                                 {0x04120000, nullptr, "Initialize"},
-                                                 {0x041700C0, nullptr, "MigrateAGBtoSAV"}};
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010040, GetTitleCount, "GetTitleCount"},
+    {0x00020082, GetTitleList, "GetTitleList"},
+    {0x00030084, GetTitleInfo, "GetTitleInfo"},
+    {0x000400C0, nullptr, "DeleteApplicationTitle"},
+    {0x000500C0, nullptr, "GetTitleProductCode"},
+    {0x000600C0, nullptr, "GetTitleExtDataId"},
+    {0x00070080, DeleteTicket, "DeleteTicket"},
+    {0x00080000, GetTicketCount, "GetTicketCount"},
+    {0x00090082, GetTicketList, "GetTicketList"},
+    {0x000A0000, nullptr, "GetDeviceID"},
+    {0x000D0084, nullptr, "GetPendingTitleInfo"},
+    {0x000E00C0, nullptr, "DeletePendingTitle"},
+    {0x00140040, nullptr, "FinalizePendingTitles"},
+    {0x00150040, nullptr, "DeleteAllPendingTitles"},
+    {0x00180080, nullptr, "InitializeTitleDatabase"},
+    {0x00190040, nullptr, "ReloadDBS"},
+    {0x001A00C0, nullptr, "GetDSiWareExportSize"},
+    {0x001B0144, nullptr, "ExportDSiWare"},
+    {0x001C0084, nullptr, "ImportDSiWare"},
+    {0x00230080, nullptr, "TitleIDListGetTotal2"},
+    {0x002400C2, nullptr, "GetTitleIDList2"},
+    {0x04010080, nullptr, "InstallFIRM"},
+    {0x04020040, nullptr, "StartInstallCIADB0"},
+    {0x04030000, nullptr, "StartInstallCIADB1"},
+    {0x04040002, nullptr, "AbortCIAInstall"},
+    {0x04050002, nullptr, "CloseCIAFinalizeInstall"},
+    {0x04060002, nullptr, "CloseCIA"},
+    {0x040700C2, nullptr, "FinalizeTitlesInstall"},
+    {0x04080042, nullptr, "GetCiaFileInfo"},
+    {0x040E00C2, nullptr, "InstallTitlesFinish"},
+    {0x040F0000, nullptr, "InstallNATIVEFIRM"},
+    {0x041000C0, nullptr, "DeleteTitle"},
+    {0x04120000, nullptr, "Initialize"},
+    {0x041700C0, nullptr, "MigrateAGBtoSAV"},
+};
 
 AM_U_Interface::AM_U_Interface() {
     Register(FunctionTable);
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index c798e8752..dfc1e9c08 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -90,10 +90,8 @@ void GetSharedFont(Service::Interface* self) {
     cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2);
     cmd_buff[1] = RESULT_SUCCESS.raw; // No error
     // Since the SharedMemory interface doesn't provide the address at which the memory was
-    // allocated,
-    // the real APT service calculates this address by scanning the entire address space (using
-    // svcQueryMemory)
-    // and searches for an allocation of the same size as the Shared Font.
+    // allocated, the real APT service calculates this address by scanning the entire address space
+    // (using svcQueryMemory) and searches for an allocation of the same size as the Shared Font.
     cmd_buff[2] = target_address;
     cmd_buff[3] = IPC::CopyHandleDesc();
     cmd_buff[4] = Kernel::g_handle_table.Create(shared_font_mem).MoveFrom();
diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index fe8b8a7b8..7597b0d3e 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -183,12 +183,10 @@ void GetAppletInfo(Service::Interface* self);
 
 /**
  * APT::IsRegistered service function. This returns whether the specified AppID is registered with
- * NS yet.
- * An AppID is "registered" once the process associated with the AppID uses APT:Enable. Home Menu
- * uses this
- * command to determine when the launched process is running and to determine when to stop using GSP
- * etc,
- * while displaying the "Nintendo 3DS" loading screen.
+ * NS yet. An AppID is "registered" once the process associated with the AppID uses APT:Enable. Home
+ * Menu uses this command to determine when the launched process is running and to determine when to
+ * stop using GSP, etc., while displaying the "Nintendo 3DS" loading screen.
+ *
  *  Inputs:
  *      1 : AppID
  *  Outputs:
@@ -264,10 +262,10 @@ void GlanceParameter(Service::Interface* self);
  * (same flag cleared by APT:ReceiveParameter).
  *  Inputs:
  *      1 : Flag, when non-zero NS will compare the word after this one with a field in the NS
- * state.
+ *          state.
  *      2 : Unknown, this is the same as the first unknown field returned by APT:ReceiveParameter.
  *      3 : Flag, when non-zero NS will compare the word after this one with a field in the NS
- * state.
+ *          state.
  *      4 : AppID
  *  Outputs:
  *      0 : Return header
diff --git a/src/core/hle/service/apt/apt_a.cpp b/src/core/hle/service/apt/apt_a.cpp
index 7d47d7675..09198d52b 100644
--- a/src/core/hle/service/apt/apt_a.cpp
+++ b/src/core/hle/service/apt/apt_a.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_a.h"
+#include "core/hle/service/apt/apt.h"
 
 namespace Service {
 namespace APT {
@@ -36,7 +36,8 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00550040, SetScreenCapPostPermission, "SetScreenCapPostPermission"},
     {0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
     {0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
-    {0x01020000, CheckNew3DS, "CheckNew3DS"}};
+    {0x01020000, CheckNew3DS, "CheckNew3DS"},
+};
 
 APT_A_Interface::APT_A_Interface() {
     Register(FunctionTable);
diff --git a/src/core/hle/service/apt/apt_s.cpp b/src/core/hle/service/apt/apt_s.cpp
index 76e71669c..f5afb78e8 100644
--- a/src/core/hle/service/apt/apt_s.cpp
+++ b/src/core/hle/service/apt/apt_s.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_s.h"
+#include "core/hle/service/apt/apt.h"
 
 namespace Service {
 namespace APT {
@@ -96,7 +96,8 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
     {0x00580002, nullptr, "GetProgramID"},
     {0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
-    {0x01020000, CheckNew3DS, "CheckNew3DS"}};
+    {0x01020000, CheckNew3DS, "CheckNew3DS"},
+};
 
 APT_S_Interface::APT_S_Interface() {
     Register(FunctionTable);
diff --git a/src/core/hle/service/apt/apt_u.cpp b/src/core/hle/service/apt/apt_u.cpp
index 9c6223dd7..184534b01 100644
--- a/src/core/hle/service/apt/apt_u.cpp
+++ b/src/core/hle/service/apt/apt_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_u.h"
+#include "core/hle/service/apt/apt.h"
 
 namespace Service {
 namespace APT {
@@ -96,7 +96,8 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
     {0x00580002, nullptr, "GetProgramID"},
     {0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
-    {0x01020000, CheckNew3DS, "CheckNew3DS"}};
+    {0x01020000, CheckNew3DS, "CheckNew3DS"},
+};
 
 APT_U_Interface::APT_U_Interface() {
     Register(FunctionTable);
diff --git a/src/core/hle/service/boss/boss.cpp b/src/core/hle/service/boss/boss.cpp
index 867b31fbf..757a8c2c7 100644
--- a/src/core/hle/service/boss/boss.cpp
+++ b/src/core/hle/service/boss/boss.cpp
@@ -17,8 +17,7 @@ void Init() {
     AddService(new BOSS_U_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace BOSS
 
diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h
index a87183493..ec9b835f1 100644
--- a/src/core/hle/service/cam/cam.h
+++ b/src/core/hle/service/cam/cam.h
@@ -24,14 +24,31 @@ enum class CameraSelect : u8 {
     In1Out1 = Out1 | In1,
     Out1Out2 = Out1 | Out2,
     In1Out2 = In1 | Out2,
-    All = Out1 | In1 | Out2
+    All = Out1 | In1 | Out2,
 };
 
-enum class Effect : u8 { None = 0, Mono = 1, Sepia = 2, Negative = 3, Negafilm = 4, Sepia01 = 5 };
+enum class Effect : u8 {
+    None = 0,
+    Mono = 1,
+    Sepia = 2,
+    Negative = 3,
+    Negafilm = 4,
+    Sepia01 = 5,
+};
 
-enum class Context : u8 { None = 0, A = 1, B = 2, Both = A | B };
+enum class Context : u8 {
+    None = 0,
+    A = 1,
+    B = 2,
+    Both = A | B,
+};
 
-enum class Flip : u8 { None = 0, Horizontal = 1, Vertical = 2, Reverse = 3 };
+enum class Flip : u8 {
+    None = 0,
+    Horizontal = 1,
+    Vertical = 2,
+    Reverse = 3,
+};
 
 enum class Size : u8 {
     VGA = 0,
@@ -42,7 +59,7 @@ enum class Size : u8 {
     DS_LCD = 5,
     DS_LCDx4 = 6,
     CTR_TOP_LCD = 7,
-    CTR_BOTTOM_LCD = QVGA
+    CTR_BOTTOM_LCD = QVGA,
 };
 
 enum class FrameRate : u8 {
@@ -58,10 +75,14 @@ enum class FrameRate : u8 {
     Rate_30_To_5 = 9,
     Rate_15_To_10 = 10,
     Rate_20_To_10 = 11,
-    Rate_30_To_10 = 12
+    Rate_30_To_10 = 12,
 };
 
-enum class ShutterSoundType : u8 { Normal = 0, Movie = 1, MovieEnd = 2 };
+enum class ShutterSoundType : u8 {
+    Normal = 0,
+    Movie = 1,
+    MovieEnd = 2,
+};
 
 enum class WhiteBalance : u8 {
     BalanceAuto = 0,
@@ -77,10 +98,16 @@ enum class WhiteBalance : u8 {
     BalanceDaylight = Balance5200K,
     BalanceCloudy = Balance6000K,
     BalanceHorizon = Balance6000K,
-    BalanceShade = Balance7000K
+    BalanceShade = Balance7000K,
 };
 
-enum class PhotoMode : u8 { Normal = 0, Portrait = 1, Landscape = 2, Nightview = 3, Letter0 = 4 };
+enum class PhotoMode : u8 {
+    Normal = 0,
+    Portrait = 1,
+    Landscape = 2,
+    Nightview = 3,
+    Letter0 = 4,
+};
 
 enum class LensCorrection : u8 {
     Off = 0,
@@ -88,7 +115,7 @@ enum class LensCorrection : u8 {
     On90 = 2,
     Dark = Off,
     Normal = On70,
-    Bright = On90
+    Bright = On90,
 };
 
 enum class Contrast : u8 {
@@ -105,10 +132,13 @@ enum class Contrast : u8 {
     Pattern11 = 11,
     Low = Pattern05,
     Normal = Pattern06,
-    High = Pattern07
+    High = Pattern07,
 };
 
-enum class OutputFormat : u8 { YUV422 = 0, RGB565 = 1 };
+enum class OutputFormat : u8 {
+    YUV422 = 0,
+    RGB565 = 1,
+};
 
 /// Stereo camera calibration data.
 struct StereoCameraCalibrationData {
diff --git a/src/core/hle/service/cam/cam_u.cpp b/src/core/hle/service/cam/cam_u.cpp
index af2123e5b..125aa7d1f 100644
--- a/src/core/hle/service/cam/cam_u.cpp
+++ b/src/core/hle/service/cam/cam_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_u.h"
+#include "core/hle/service/cam/cam.h"
 
 namespace Service {
 namespace CAM {
diff --git a/src/core/hle/service/cecd/cecd_u.cpp b/src/core/hle/service/cecd/cecd_u.cpp
index 4b747de7b..f220bba12 100644
--- a/src/core/hle/service/cecd/cecd_u.cpp
+++ b/src/core/hle/service/cecd/cecd_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cecd/cecd.h"
 #include "core/hle/service/cecd/cecd_u.h"
+#include "core/hle/service/cecd/cecd.h"
 
 namespace Service {
 namespace CECD {
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index fe97a69d1..aff033bde 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -101,8 +101,9 @@ static const ConsoleCountryInfo COUNTRY_INFO = {{0, 0, 0}, UNITED_STATES_COUNTRY
  * Thanks Normmatt for providing this information
  */
 static const std::array<float, 8> STEREO_CAMERA_SETTINGS = {
-    {62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f, 10.0f, 5.0f, 55.58000183105469f,
-     21.56999969482422f}};
+    62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f,
+    10.0f, 5.0f,   55.58000183105469f, 21.56999969482422f,
+};
 static_assert(sizeof(STEREO_CAMERA_SETTINGS) == 0x20,
               "STEREO_CAMERA_SETTINGS must be exactly 0x20 bytes");
 
@@ -110,8 +111,9 @@ static const u32 CONFIG_SAVEFILE_SIZE = 0x8000;
 static std::array<u8, CONFIG_SAVEFILE_SIZE> cfg_config_file_buffer;
 
 static Service::FS::ArchiveHandle cfg_system_save_data_archive;
-static const std::vector<u8> cfg_system_savedata_id = {0x00, 0x00, 0x00, 0x00,
-                                                       0x17, 0x00, 0x01, 0x00};
+static const std::vector<u8> cfg_system_savedata_id = {
+    0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x01, 0x00,
+};
 
 void GetCountryCodeString(Service::Interface* self) {
     u32* cmd_buff = Kernel::GetCommandBuffer();
@@ -528,8 +530,7 @@ void Init() {
     LoadConfigNANDSaveFile();
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 void SetUsername(const std::u16string& name) {
     ASSERT(name.size() <= 10);
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h
index 8cb231d72..c7c2ab41d 100644
--- a/src/core/hle/service/cfg/cfg.h
+++ b/src/core/hle/service/cfg/cfg.h
@@ -79,7 +79,7 @@ static const std::array<u16, 187> country_codes = {{
     C("CN"), 0,       0,       0,       0,       0,       0,       0,       // 160-167
     C("AE"), C("IN"), C("EG"), C("OM"), C("QA"), C("KW"), C("SA"), C("SY"), // 168-175
     C("BH"), C("JO"), 0,       0,       0,       0,       0,       0,       // 176-183
-    C("SM"), C("VA"), C("BM")                                               // 184-186
+    C("SM"), C("VA"), C("BM"),                                              // 184-186
 }};
 
 /**
@@ -218,8 +218,9 @@ void FormatConfig(Service::Interface* self);
 
 /**
  * Reads a block with the specified id and flag from the Config savegame buffer
- * and writes the output to output.
- * The input size must match exactly the size of the requested block
+ * and writes the output to output. The input size must match exactly the size of the requested
+ * block.
+ *
  * @param block_id The id of the block we want to read
  * @param size The size of the block we want to read
  * @param flag The requested block must have this flag set
@@ -230,8 +231,8 @@ ResultCode GetConfigInfoBlock(u32 block_id, u32 size, u32 flag, void* output);
 
 /**
  * Reads data from input and writes to a block with the specified id and flag
- * in the Config savegame buffer.
- * The input size must match exactly the size of the target block
+ * in the Config savegame buffer. The input size must match exactly the size of the target block.
+ *
  * @param block_id The id of the block we want to write
  * @param size The size of the block we want to write
  * @param flag The target block must have this flag set
@@ -242,8 +243,8 @@ ResultCode SetConfigInfoBlock(u32 block_id, u32 size, u32 flag, const void* inpu
 
 /**
  * Creates a block with the specified id and writes the input data to the cfg savegame buffer in
- * memory.
- * The config savegame file in the filesystem is not updated.
+ * memory. The config savegame file in the filesystem is not updated.
+ *
  * @param block_id The id of the block we want to create
  * @param size The size of the block we want to create
  * @param flags The flags of the new block
diff --git a/src/core/hle/service/cfg/cfg_i.cpp b/src/core/hle/service/cfg/cfg_i.cpp
index 2ff52c8b8..ed0217e53 100644
--- a/src/core/hle/service/cfg/cfg_i.cpp
+++ b/src/core/hle/service/cfg/cfg_i.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_i.h"
+#include "core/hle/service/cfg/cfg.h"
 
 namespace Service {
 namespace CFG {
diff --git a/src/core/hle/service/cfg/cfg_s.cpp b/src/core/hle/service/cfg/cfg_s.cpp
index eed26dec7..51e7b9752 100644
--- a/src/core/hle/service/cfg/cfg_s.cpp
+++ b/src/core/hle/service/cfg/cfg_s.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_s.h"
+#include "core/hle/service/cfg/cfg.h"
 
 namespace Service {
 namespace CFG {
diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp
index f28217134..3f812291b 100644
--- a/src/core/hle/service/cfg/cfg_u.cpp
+++ b/src/core/hle/service/cfg/cfg_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_u.h"
+#include "core/hle/service/cfg/cfg.h"
 
 namespace Service {
 namespace CFG {
diff --git a/src/core/hle/service/dlp/dlp.cpp b/src/core/hle/service/dlp/dlp.cpp
index fd124e819..8f4b67a5d 100644
--- a/src/core/hle/service/dlp/dlp.cpp
+++ b/src/core/hle/service/dlp/dlp.cpp
@@ -17,8 +17,7 @@ void Init() {
     AddService(new DLP_SRVR_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace DLP
 } // namespace Service
diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp
index 2cd8269de..a23f5896d 100644
--- a/src/core/hle/service/err_f.cpp
+++ b/src/core/hle/service/err_f.cpp
@@ -173,7 +173,9 @@ static void ThrowFatalError(Service::Interface* self) {
     cmd_buff[1] = 0; // No error
 }
 
-const Interface::FunctionInfo FunctionTable[] = {{0x00010800, ThrowFatalError, "ThrowFatalError"}};
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010800, ThrowFatalError, "ThrowFatalError"},
+};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Interface class
diff --git a/src/core/hle/service/frd/frd.cpp b/src/core/hle/service/frd/frd.cpp
index 1e9fe178f..050665b48 100644
--- a/src/core/hle/service/frd/frd.cpp
+++ b/src/core/hle/service/frd/frd.cpp
@@ -108,8 +108,7 @@ void Init() {
     AddService(new FRD_U_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace FRD
 
diff --git a/src/core/hle/service/frd/frd_u.cpp b/src/core/hle/service/frd/frd_u.cpp
index bd1c9c16b..92b53f2ef 100644
--- a/src/core/hle/service/frd/frd_u.cpp
+++ b/src/core/hle/service/frd/frd_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/frd/frd.h"
 #include "core/hle/service/frd/frd_u.h"
+#include "core/hle/service/frd/frd.h"
 
 namespace Service {
 namespace FRD {
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 1b851eade..77fe5ab6c 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -90,11 +90,9 @@ enum class DirectoryCommand : u32 {
 };
 
 File::File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
-    : path(path), priority(0), backend(std::move(backend)) {
-}
+    : path(path), priority(0), backend(std::move(backend)) {}
 
-File::~File() {
-}
+File::~File() {}
 
 ResultVal<bool> File::SyncRequest() {
     u32* cmd_buff = Kernel::GetCommandBuffer();
@@ -205,11 +203,9 @@ ResultVal<bool> File::SyncRequest() {
 
 Directory::Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend,
                      const FileSys::Path& path)
-    : path(path), backend(std::move(backend)) {
-}
+    : path(path), backend(std::move(backend)) {}
 
-Directory::~Directory() {
-}
+Directory::~Directory() {}
 
 ResultVal<bool> Directory::SyncRequest() {
     u32* cmd_buff = Kernel::GetCommandBuffer();
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index a0adad634..605832214 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -968,7 +968,8 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x086700C4, nullptr, "ControlSecureSave"},
     {0x08680000, nullptr, "GetMediaType"},
     {0x08690000, nullptr, "GetNandEraseCount"},
-    {0x086A0082, nullptr, "ReadNandReport"}};
+    {0x086A0082, nullptr, "ReadNandReport"},
+};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Interface class
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp
index b273aac47..2dff1e16c 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -29,10 +29,9 @@ const static u32 REGS_BEGIN = 0x1EB00000;
 
 namespace GSP_GPU {
 
-const ResultCode
-    ERR_GSP_REGS_OUTOFRANGE_OR_MISALIGNED(ErrorDescription::OutofRangeOrMisalignedAddress,
-                                          ErrorModule::GX, ErrorSummary::InvalidArgument,
-                                          ErrorLevel::Usage); // 0xE0E02A01
+const ResultCode ERR_GSP_REGS_OUTOFRANGE_OR_MISALIGNED(
+    ErrorDescription::OutofRangeOrMisalignedAddress, ErrorModule::GX, ErrorSummary::InvalidArgument,
+    ErrorLevel::Usage); // 0xE0E02A01
 const ResultCode ERR_GSP_REGS_MISALIGNED(ErrorDescription::MisalignedSize, ErrorModule::GX,
                                          ErrorSummary::InvalidArgument,
                                          ErrorLevel::Usage); // 0xE0E02BF2
diff --git a/src/core/hle/service/gsp_lcd.cpp b/src/core/hle/service/gsp_lcd.cpp
index 3922cd197..b916dd759 100644
--- a/src/core/hle/service/gsp_lcd.cpp
+++ b/src/core/hle/service/gsp_lcd.cpp
@@ -9,11 +9,15 @@
 
 namespace GSP_LCD {
 
-const Interface::FunctionInfo FunctionTable[] = {{0x000F0000, nullptr, "PowerOnAllBacklights"},
-                                                 {0x00100000, nullptr, "PowerOffAllBacklights"},
-                                                 {0x00110040, nullptr, "PowerOnBacklight"},
-                                                 {0x00120040, nullptr, "PowerOffBacklight"},
-                                                 {0x00130040, nullptr, "SetLedForceOff"}};
+const Interface::FunctionInfo FunctionTable[] = {
+    // clang-format off
+    {0x000F0000, nullptr, "PowerOnAllBacklights"},
+    {0x00100000, nullptr, "PowerOffAllBacklights"},
+    {0x00110040, nullptr, "PowerOnBacklight"},
+    {0x00120040, nullptr, "PowerOffBacklight"},
+    {0x00130040, nullptr, "SetLedForceOff"},
+    // clang-format on
+};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Interface class
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index d915a3105..5a2edd3c0 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -40,11 +40,10 @@ static int enable_accelerometer_count = 0; // positive means enabled
 static int enable_gyroscope_count = 0;     // positive means enabled
 
 static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) {
-    constexpr float TAN30 = 0.577350269,
-                    TAN60 =
-                        1 / TAN30; // 30 degree and 60 degree are angular thresholds for directions
-    constexpr int CIRCLE_PAD_THRESHOLD_SQUARE =
-        40 * 40; // a circle pad radius greater than 40 will trigger circle pad direction
+    // 30 degree and 60 degree are angular thresholds for directions
+    constexpr float TAN30 = 0.577350269, TAN60 = 1 / TAN30;
+    // a circle pad radius greater than 40 will trigger circle pad direction
+    constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40;
     PadState state;
     state.hex = 0;
 
diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp
index 09007e304..00a0902c8 100644
--- a/src/core/hle/service/hid/hid_spvr.cpp
+++ b/src/core/hle/service/hid/hid_spvr.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/hid_spvr.h"
+#include "core/hle/service/hid/hid.h"
 
 namespace Service {
 namespace HID {
diff --git a/src/core/hle/service/hid/hid_user.cpp b/src/core/hle/service/hid/hid_user.cpp
index 42591543c..433e175bb 100644
--- a/src/core/hle/service/hid/hid_user.cpp
+++ b/src/core/hle/service/hid/hid_user.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/hid_user.h"
+#include "core/hle/service/hid/hid.h"
 
 namespace Service {
 namespace HID {
diff --git a/src/core/hle/service/ir/ir_rst.cpp b/src/core/hle/service/ir/ir_rst.cpp
index 1f10ebd3d..5e7a011ff 100644
--- a/src/core/hle/service/ir/ir_rst.cpp
+++ b/src/core/hle/service/ir/ir_rst.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_rst.h"
+#include "core/hle/service/ir/ir.h"
 
 namespace Service {
 namespace IR {
diff --git a/src/core/hle/service/ir/ir_u.cpp b/src/core/hle/service/ir/ir_u.cpp
index be4049da9..429615f31 100644
--- a/src/core/hle/service/ir/ir_u.cpp
+++ b/src/core/hle/service/ir/ir_u.cpp
@@ -8,15 +8,26 @@ namespace Service {
 namespace IR {
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010000, nullptr, "Initialize"},           {0x00020000, nullptr, "Shutdown"},
-    {0x00030042, nullptr, "StartSendTransfer"},    {0x00040000, nullptr, "WaitSendTransfer"},
-    {0x000500C2, nullptr, "StartRecvTransfer"},    {0x00060000, nullptr, "WaitRecvTransfer"},
-    {0x00070080, nullptr, "GetRecvTransferCount"}, {0x00080000, nullptr, "GetSendState"},
-    {0x00090040, nullptr, "SetBitRate"},           {0x000A0000, nullptr, "GetBitRate"},
-    {0x000B0040, nullptr, "SetIRLEDState"},        {0x000C0000, nullptr, "GetIRLEDRecvState"},
-    {0x000D0000, nullptr, "GetSendFinishedEvent"}, {0x000E0000, nullptr, "GetRecvFinishedEvent"},
-    {0x000F0000, nullptr, "GetTransferState"},     {0x00100000, nullptr, "GetErrorStatus"},
-    {0x00110040, nullptr, "SetSleepModeActive"},   {0x00120040, nullptr, "SetSleepModeState"},
+    // clang-format off
+    {0x00010000, nullptr, "Initialize"},
+    {0x00020000, nullptr, "Shutdown"},
+    {0x00030042, nullptr, "StartSendTransfer"},
+    {0x00040000, nullptr, "WaitSendTransfer"},
+    {0x000500C2, nullptr, "StartRecvTransfer"},
+    {0x00060000, nullptr, "WaitRecvTransfer"},
+    {0x00070080, nullptr, "GetRecvTransferCount"},
+    {0x00080000, nullptr, "GetSendState"},
+    {0x00090040, nullptr, "SetBitRate"},
+    {0x000A0000, nullptr, "GetBitRate"},
+    {0x000B0040, nullptr, "SetIRLEDState"},
+    {0x000C0000, nullptr, "GetIRLEDRecvState"},
+    {0x000D0000, nullptr, "GetSendFinishedEvent"},
+    {0x000E0000, nullptr, "GetRecvFinishedEvent"},
+    {0x000F0000, nullptr, "GetTransferState"},
+    {0x00100000, nullptr, "GetErrorStatus"},
+    {0x00110040, nullptr, "SetSleepModeActive"},
+    {0x00120040, nullptr, "SetSleepModeState"},
+    // clang-format off
 };
 
 IR_U_Interface::IR_U_Interface() {
diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp
index 6cff1d544..cca71a0dd 100644
--- a/src/core/hle/service/ir/ir_user.cpp
+++ b/src/core/hle/service/ir/ir_user.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_user.h"
+#include "core/hle/service/ir/ir.h"
 
 namespace Service {
 namespace IR {
diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp
index 5757a4e64..b5da9a960 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.cpp
+++ b/src/core/hle/service/ldr_ro/cro_helper.cpp
@@ -22,21 +22,23 @@ static ResultCode CROFormatError(u32 description) {
                       ErrorSummary::WrongArgument, ErrorLevel::Permanent);
 }
 
-const std::array<int, 17> CROHelper::ENTRY_SIZE{
-    {1, // code
-     1, // data
-     1, // module name
-     sizeof(SegmentEntry), sizeof(ExportNamedSymbolEntry), sizeof(ExportIndexedSymbolEntry),
-     1, // export strings
-     sizeof(ExportTreeEntry), sizeof(ImportModuleEntry), sizeof(ExternalRelocationEntry),
-     sizeof(ImportNamedSymbolEntry), sizeof(ImportIndexedSymbolEntry),
-     sizeof(ImportAnonymousSymbolEntry),
-     1, // import strings
-     sizeof(StaticAnonymousSymbolEntry), sizeof(InternalRelocationEntry),
-     sizeof(StaticRelocationEntry)}};
-
-const std::array<CROHelper::HeaderField, 4> CROHelper::FIX_BARRIERS{
-    {Fix0Barrier, Fix1Barrier, Fix2Barrier, Fix3Barrier}};
+const std::array<int, 17> CROHelper::ENTRY_SIZE{{
+    1, // code
+    1, // data
+    1, // module name
+    sizeof(SegmentEntry), sizeof(ExportNamedSymbolEntry), sizeof(ExportIndexedSymbolEntry),
+    1, // export strings
+    sizeof(ExportTreeEntry), sizeof(ImportModuleEntry), sizeof(ExternalRelocationEntry),
+    sizeof(ImportNamedSymbolEntry), sizeof(ImportIndexedSymbolEntry),
+    sizeof(ImportAnonymousSymbolEntry),
+    1, // import strings
+    sizeof(StaticAnonymousSymbolEntry), sizeof(InternalRelocationEntry),
+    sizeof(StaticRelocationEntry),
+}};
+
+const std::array<CROHelper::HeaderField, 4> CROHelper::FIX_BARRIERS{{
+    Fix0Barrier, Fix1Barrier, Fix2Barrier, Fix3Barrier,
+}};
 
 VAddr CROHelper::SegmentTagToAddress(SegmentTag segment_tag) const {
     u32 segment_num = GetField(SegmentNum);
@@ -204,13 +206,14 @@ ResultCode CROHelper::RebaseHeader(u32 cro_size) {
         return error;
 
     // verifies that all offsets are in the correct order
-    constexpr std::array<HeaderField, 18> OFFSET_ORDER = {
-        {CodeOffset, ModuleNameOffset, SegmentTableOffset, ExportNamedSymbolTableOffset,
-         ExportTreeTableOffset, ExportIndexedSymbolTableOffset, ExportStringsOffset,
-         ImportModuleTableOffset, ExternalRelocationTableOffset, ImportNamedSymbolTableOffset,
-         ImportIndexedSymbolTableOffset, ImportAnonymousSymbolTableOffset, ImportStringsOffset,
-         StaticAnonymousSymbolTableOffset, InternalRelocationTableOffset,
-         StaticRelocationTableOffset, DataOffset, FileSize}};
+    constexpr std::array<HeaderField, 18> OFFSET_ORDER = {{
+        CodeOffset, ModuleNameOffset, SegmentTableOffset, ExportNamedSymbolTableOffset,
+        ExportTreeTableOffset, ExportIndexedSymbolTableOffset, ExportStringsOffset,
+        ImportModuleTableOffset, ExternalRelocationTableOffset, ImportNamedSymbolTableOffset,
+        ImportIndexedSymbolTableOffset, ImportAnonymousSymbolTableOffset, ImportStringsOffset,
+        StaticAnonymousSymbolTableOffset, InternalRelocationTableOffset,
+        StaticRelocationTableOffset, DataOffset, FileSize,
+    }};
 
     u32 prev_offset = GetField(OFFSET_ORDER[0]);
     u32 cur_offset;
diff --git a/src/core/hle/service/ldr_ro/cro_helper.h b/src/core/hle/service/ldr_ro/cro_helper.h
index e4457d4be..e1b8221bd 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.h
+++ b/src/core/hle/service/ldr_ro/cro_helper.h
@@ -40,8 +40,7 @@ static constexpr u32 CRO_HASH_SIZE = 0x80;
 /// Represents a loaded module (CRO) with interfaces manipulating it.
 class CROHelper final {
 public:
-    explicit CROHelper(VAddr cro_address) : module_address(cro_address) {
-    }
+    explicit CROHelper(VAddr cro_address) : module_address(cro_address) {}
 
     std::string ModuleName() const {
         return Memory::ReadCString(GetField(ModuleNameOffset), GetField(ModuleNameSize));
@@ -152,8 +151,7 @@ private:
 
     /**
      * Each item in this enum represents a u32 field in the header begin from address+0x80,
-     * successively.
-     * We don't directly use a struct here, to avoid GetPointer, reinterpret_cast, or
+     * successively. We don't directly use a struct here, to avoid GetPointer, reinterpret_cast, or
      * Read/WriteBlock repeatedly.
      */
     enum HeaderField {
@@ -234,8 +232,7 @@ private:
         BitField<4, 28, u32_le> offset_into_segment;
 
         SegmentTag() = default;
-        explicit SegmentTag(u32 raw_) : raw(raw_) {
-        }
+        explicit SegmentTag(u32 raw_) : raw(raw_) {}
     };
 
     /// Information of a segment in this module.
diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp
index ae5d3921f..a8fc2c015 100644
--- a/src/core/hle/service/ldr_ro/ldr_ro.cpp
+++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp
@@ -750,11 +750,17 @@ static void Shutdown(Service::Interface* self) {
 }
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x000100C2, Initialize, "Initialize"},     {0x00020082, LoadCRR, "LoadCRR"},
-    {0x00030042, UnloadCRR, "UnloadCRR"},       {0x000402C2, LoadCRO<false>, "LoadCRO"},
-    {0x000500C2, UnloadCRO, "UnloadCRO"},       {0x00060042, LinkCRO, "LinkCRO"},
-    {0x00070042, UnlinkCRO, "UnlinkCRO"},       {0x00080042, Shutdown, "Shutdown"},
+    // clang-format off
+    {0x000100C2, Initialize, "Initialize"},
+    {0x00020082, LoadCRR, "LoadCRR"},
+    {0x00030042, UnloadCRR, "UnloadCRR"},
+    {0x000402C2, LoadCRO<false>, "LoadCRO"},
+    {0x000500C2, UnloadCRO, "UnloadCRO"},
+    {0x00060042, LinkCRO, "LinkCRO"},
+    {0x00070042, UnlinkCRO, "UnlinkCRO"},
+    {0x00080042, Shutdown, "Shutdown"},
     {0x000902C2, LoadCRO<true>, "LoadCRO_New"},
+    // clang-format on
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/ndm/ndm.cpp b/src/core/hle/service/ndm/ndm.cpp
index 9f1536aef..fcfa4b336 100644
--- a/src/core/hle/service/ndm/ndm.cpp
+++ b/src/core/hle/service/ndm/ndm.cpp
@@ -11,12 +11,16 @@
 namespace Service {
 namespace NDM {
 
-enum : u32 { DEFAULT_RETRY_INTERVAL = 10, DEFAULT_SCAN_INTERVAL = 30 };
+enum : u32 {
+    DEFAULT_RETRY_INTERVAL = 10,
+    DEFAULT_SCAN_INTERVAL = 30,
+};
 
 static DaemonMask daemon_bit_mask = DaemonMask::Default;
 static DaemonMask default_daemon_bit_mask = DaemonMask::Default;
-static std::array<DaemonStatus, 4> daemon_status = {DaemonStatus::Idle, DaemonStatus::Idle,
-                                                    DaemonStatus::Idle, DaemonStatus::Idle};
+static std::array<DaemonStatus, 4> daemon_status = {
+    DaemonStatus::Idle, DaemonStatus::Idle, DaemonStatus::Idle, DaemonStatus::Idle,
+};
 static ExclusiveState exclusive_state = ExclusiveState::None;
 static u32 scan_interval = DEFAULT_SCAN_INTERVAL;
 static u32 retry_interval = DEFAULT_RETRY_INTERVAL;
@@ -227,8 +231,7 @@ void Init() {
     AddService(new NDM_U_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace NDM
 } // namespace Service
diff --git a/src/core/hle/service/ndm/ndm.h b/src/core/hle/service/ndm/ndm.h
index fb574541d..979e7fcf1 100644
--- a/src/core/hle/service/ndm/ndm.h
+++ b/src/core/hle/service/ndm/ndm.h
@@ -12,7 +12,12 @@ class Interface;
 
 namespace NDM {
 
-enum class Daemon : u32 { Cec = 0, Boss = 1, Nim = 2, Friend = 3 };
+enum class Daemon : u32 {
+    Cec = 0,
+    Boss = 1,
+    Nim = 2,
+    Friend = 3,
+};
 
 enum class DaemonMask : u32 {
     None = 0,
@@ -21,7 +26,7 @@ enum class DaemonMask : u32 {
     Nim = (1 << static_cast<u32>(Daemon::Nim)),
     Friend = (1 << static_cast<u32>(Daemon::Friend)),
     Default = Cec | Friend,
-    All = Cec | Boss | Nim | Friend
+    All = Cec | Boss | Nim | Friend,
 };
 
 enum class DaemonStatus : u32 { Busy = 0, Idle = 1, Suspending = 2, Suspended = 3 };
diff --git a/src/core/hle/service/ndm/ndm_u.cpp b/src/core/hle/service/ndm/ndm_u.cpp
index f5c7a341a..4fc93850d 100644
--- a/src/core/hle/service/ndm/ndm_u.cpp
+++ b/src/core/hle/service/ndm/ndm_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/ndm/ndm.h"
 #include "core/hle/service/ndm/ndm_u.h"
+#include "core/hle/service/ndm/ndm.h"
 
 namespace Service {
 namespace NDM {
diff --git a/src/core/hle/service/news/news.cpp b/src/core/hle/service/news/news.cpp
index 983e0777c..e09ea5681 100644
--- a/src/core/hle/service/news/news.cpp
+++ b/src/core/hle/service/news/news.cpp
@@ -19,8 +19,7 @@ void Init() {
     AddService(new NEWS_U_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace NEWS
 
diff --git a/src/core/hle/service/news/news_s.cpp b/src/core/hle/service/news/news_s.cpp
index dda3d0f6a..0e4b650f3 100644
--- a/src/core/hle/service/news/news_s.cpp
+++ b/src/core/hle/service/news/news_s.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/news/news.h"
 #include "core/hle/service/news/news_s.h"
+#include "core/hle/service/news/news.h"
 
 namespace Service {
 namespace NEWS {
diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp
index f3c01d6e6..a7b76ed67 100644
--- a/src/core/hle/service/nim/nim.cpp
+++ b/src/core/hle/service/nim/nim.cpp
@@ -31,8 +31,7 @@ void Init() {
     AddService(new NIM_U_Interface);
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace NIM
 
diff --git a/src/core/hle/service/nim/nim_u.cpp b/src/core/hle/service/nim/nim_u.cpp
index 7e07d02e8..a4fd9781f 100644
--- a/src/core/hle/service/nim/nim_u.cpp
+++ b/src/core/hle/service/nim/nim_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/nim/nim.h"
 #include "core/hle/service/nim/nim_u.h"
+#include "core/hle/service/nim/nim.h"
 
 namespace Service {
 namespace NIM {
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp
index 80fa09f5f..29b9071c8 100644
--- a/src/core/hle/service/ptm/ptm.cpp
+++ b/src/core/hle/service/ptm/ptm.cpp
@@ -144,8 +144,7 @@ void Init() {
     }
 }
 
-void Shutdown() {
-}
+void Shutdown() {}
 
 } // namespace PTM
 } // namespace Service
diff --git a/src/core/hle/service/ptm/ptm_sysm.cpp b/src/core/hle/service/ptm/ptm_sysm.cpp
index 693158dbf..590660f60 100644
--- a/src/core/hle/service/ptm/ptm_sysm.cpp
+++ b/src/core/hle/service/ptm/ptm_sysm.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/ptm/ptm.h"
 #include "core/hle/service/ptm/ptm_sysm.h"
+#include "core/hle/service/ptm/ptm.h"
 
 namespace Service {
 namespace PTM {
diff --git a/src/core/hle/service/ptm/ptm_u.cpp b/src/core/hle/service/ptm/ptm_u.cpp
index 65e868393..155e10df1 100644
--- a/src/core/hle/service/ptm/ptm_u.cpp
+++ b/src/core/hle/service/ptm/ptm_u.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/ptm/ptm.h"
 #include "core/hle/service/ptm/ptm_u.h"
+#include "core/hle/service/ptm/ptm.h"
 
 namespace Service {
 namespace PTM {
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp
index 695b286c0..302ab55b7 100644
--- a/src/core/hle/service/soc_u.cpp
+++ b/src/core/hle/service/soc_u.cpp
@@ -63,82 +63,84 @@ static const s32 SOCKET_ERROR_VALUE = -1;
 namespace SOC_U {
 
 /// Holds the translation from system network errors to 3DS network errors
-static const std::unordered_map<int, int> error_map = {{{E2BIG, 1},
-                                                        {ERRNO(EACCES), 2},
-                                                        {ERRNO(EADDRINUSE), 3},
-                                                        {ERRNO(EADDRNOTAVAIL), 4},
-                                                        {ERRNO(EAFNOSUPPORT), 5},
-                                                        {ERRNO(EAGAIN), 6},
-                                                        {ERRNO(EALREADY), 7},
-                                                        {ERRNO(EBADF), 8},
-                                                        {EBADMSG, 9},
-                                                        {EBUSY, 10},
-                                                        {ECANCELED, 11},
-                                                        {ECHILD, 12},
-                                                        {ERRNO(ECONNABORTED), 13},
-                                                        {ERRNO(ECONNREFUSED), 14},
-                                                        {ERRNO(ECONNRESET), 15},
-                                                        {EDEADLK, 16},
-                                                        {ERRNO(EDESTADDRREQ), 17},
-                                                        {EDOM, 18},
-                                                        {ERRNO(EDQUOT), 19},
-                                                        {EEXIST, 20},
-                                                        {ERRNO(EFAULT), 21},
-                                                        {EFBIG, 22},
-                                                        {ERRNO(EHOSTUNREACH), 23},
-                                                        {EIDRM, 24},
-                                                        {EILSEQ, 25},
-                                                        {ERRNO(EINPROGRESS), 26},
-                                                        {ERRNO(EINTR), 27},
-                                                        {ERRNO(EINVAL), 28},
-                                                        {EIO, 29},
-                                                        {ERRNO(EISCONN), 30},
-                                                        {EISDIR, 31},
-                                                        {ERRNO(ELOOP), 32},
-                                                        {ERRNO(EMFILE), 33},
-                                                        {EMLINK, 34},
-                                                        {ERRNO(EMSGSIZE), 35},
-                                                        {ERRNO(EMULTIHOP), 36},
-                                                        {ERRNO(ENAMETOOLONG), 37},
-                                                        {ERRNO(ENETDOWN), 38},
-                                                        {ERRNO(ENETRESET), 39},
-                                                        {ERRNO(ENETUNREACH), 40},
-                                                        {ENFILE, 41},
-                                                        {ERRNO(ENOBUFS), 42},
-                                                        {ENODATA, 43},
-                                                        {ENODEV, 44},
-                                                        {ENOENT, 45},
-                                                        {ENOEXEC, 46},
-                                                        {ENOLCK, 47},
-                                                        {ENOLINK, 48},
-                                                        {ENOMEM, 49},
-                                                        {ENOMSG, 50},
-                                                        {ERRNO(ENOPROTOOPT), 51},
-                                                        {ENOSPC, 52},
-                                                        {ENOSR, 53},
-                                                        {ENOSTR, 54},
-                                                        {ENOSYS, 55},
-                                                        {ERRNO(ENOTCONN), 56},
-                                                        {ENOTDIR, 57},
-                                                        {ERRNO(ENOTEMPTY), 58},
-                                                        {ERRNO(ENOTSOCK), 59},
-                                                        {ENOTSUP, 60},
-                                                        {ENOTTY, 61},
-                                                        {ENXIO, 62},
-                                                        {ERRNO(EOPNOTSUPP), 63},
-                                                        {EOVERFLOW, 64},
-                                                        {EPERM, 65},
-                                                        {EPIPE, 66},
-                                                        {EPROTO, 67},
-                                                        {ERRNO(EPROTONOSUPPORT), 68},
-                                                        {ERRNO(EPROTOTYPE), 69},
-                                                        {ERANGE, 70},
-                                                        {EROFS, 71},
-                                                        {ESPIPE, 72},
-                                                        {ESRCH, 73},
-                                                        {ERRNO(ESTALE), 74},
-                                                        {ETIME, 75},
-                                                        {ERRNO(ETIMEDOUT), 76}}};
+static const std::unordered_map<int, int> error_map = {{
+    {E2BIG, 1},
+    {ERRNO(EACCES), 2},
+    {ERRNO(EADDRINUSE), 3},
+    {ERRNO(EADDRNOTAVAIL), 4},
+    {ERRNO(EAFNOSUPPORT), 5},
+    {ERRNO(EAGAIN), 6},
+    {ERRNO(EALREADY), 7},
+    {ERRNO(EBADF), 8},
+    {EBADMSG, 9},
+    {EBUSY, 10},
+    {ECANCELED, 11},
+    {ECHILD, 12},
+    {ERRNO(ECONNABORTED), 13},
+    {ERRNO(ECONNREFUSED), 14},
+    {ERRNO(ECONNRESET), 15},
+    {EDEADLK, 16},
+    {ERRNO(EDESTADDRREQ), 17},
+    {EDOM, 18},
+    {ERRNO(EDQUOT), 19},
+    {EEXIST, 20},
+    {ERRNO(EFAULT), 21},
+    {EFBIG, 22},
+    {ERRNO(EHOSTUNREACH), 23},
+    {EIDRM, 24},
+    {EILSEQ, 25},
+    {ERRNO(EINPROGRESS), 26},
+    {ERRNO(EINTR), 27},
+    {ERRNO(EINVAL), 28},
+    {EIO, 29},
+    {ERRNO(EISCONN), 30},
+    {EISDIR, 31},
+    {ERRNO(ELOOP), 32},
+    {ERRNO(EMFILE), 33},
+    {EMLINK, 34},
+    {ERRNO(EMSGSIZE), 35},
+    {ERRNO(EMULTIHOP), 36},
+    {ERRNO(ENAMETOOLONG), 37},
+    {ERRNO(ENETDOWN), 38},
+    {ERRNO(ENETRESET), 39},
+    {ERRNO(ENETUNREACH), 40},
+    {ENFILE, 41},
+    {ERRNO(ENOBUFS), 42},
+    {ENODATA, 43},
+    {ENODEV, 44},
+    {ENOENT, 45},
+    {ENOEXEC, 46},
+    {ENOLCK, 47},
+    {ENOLINK, 48},
+    {ENOMEM, 49},
+    {ENOMSG, 50},
+    {ERRNO(ENOPROTOOPT), 51},
+    {ENOSPC, 52},
+    {ENOSR, 53},
+    {ENOSTR, 54},
+    {ENOSYS, 55},
+    {ERRNO(ENOTCONN), 56},
+    {ENOTDIR, 57},
+    {ERRNO(ENOTEMPTY), 58},
+    {ERRNO(ENOTSOCK), 59},
+    {ENOTSUP, 60},
+    {ENOTTY, 61},
+    {ENXIO, 62},
+    {ERRNO(EOPNOTSUPP), 63},
+    {EOVERFLOW, 64},
+    {EPERM, 65},
+    {EPIPE, 66},
+    {EPROTO, 67},
+    {ERRNO(EPROTONOSUPPORT), 68},
+    {ERRNO(EPROTOTYPE), 69},
+    {ERANGE, 70},
+    {EROFS, 71},
+    {ESPIPE, 72},
+    {ESRCH, 73},
+    {ERRNO(ESTALE), 74},
+    {ETIME, 75},
+    {ERRNO(ETIMEDOUT), 76},
+}};
 
 /// Converts a network error from platform-specific to 3ds-specific
 static int TranslateError(int error) {
diff --git a/src/core/hle/service/ssl_c.cpp b/src/core/hle/service/ssl_c.cpp
index 47c4a8cb0..78ab922ca 100644
--- a/src/core/hle/service/ssl_c.cpp
+++ b/src/core/hle/service/ssl_c.cpp
@@ -79,7 +79,8 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00190080, nullptr, "ContextSetClientCert"},
     {0x001B0080, nullptr, "ContextClearOpt"},
     {0x001E0040, nullptr, "DestroyContext"},
-    {0x001F0082, nullptr, "ContextInitSharedmem"}};
+    {0x001F0082, nullptr, "ContextInitSharedmem"},
+};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Interface class
diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp
index 278548e0e..d3c6d073e 100644
--- a/src/core/hle/service/y2r_u.cpp
+++ b/src/core/hle/service/y2r_u.cpp
@@ -73,8 +73,8 @@ ResultCode ConversionConfiguration::SetInputLines(u16 lines) {
     return RESULT_SUCCESS;
 }
 
-ResultCode
-ConversionConfiguration::SetStandardCoefficient(StandardCoefficient standard_coefficient) {
+ResultCode ConversionConfiguration::SetStandardCoefficient(
+    StandardCoefficient standard_coefficient) {
     size_t index = static_cast<size_t>(standard_coefficient);
     if (index >= ARRAY_SIZE(standard_coefficients)) {
         return ResultCode(ErrorDescription::InvalidEnumValue, ErrorModule::CAM,