Merge pull request #2086 from linkmauve/clang-format

Add clang-format as part of our {commit,travis}-time checks

4 files changed, 63 insertions, 62 deletions

diff --git a/src/core/hle/service/ir/ir.cpp b/src/core/hle/service/ir/ir.cpp
index 079a87e48..4d6639ded 100644
--- a/src/core/hle/service/ir/ir.cpp
+++ b/src/core/hle/service/ir/ir.cpp
@@ -4,12 +4,11 @@
 
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-
-#include "core/hle/service/service.h"
 #include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_rst.h"
 #include "core/hle/service/ir/ir_u.h"
 #include "core/hle/service/ir/ir_user.h"
+#include "core/hle/service/service.h"
 
 namespace Service {
 namespace IR {
@@ -32,14 +31,14 @@ void InitializeIrNopShared(Interface* self) {
     u32* cmd_buff = Kernel::GetCommandBuffer();
 
     u32 transfer_buff_size = cmd_buff[1];
-    u32 recv_buff_size     = cmd_buff[2];
-    u32 unk1               = cmd_buff[3];
-    u32 send_buff_size     = cmd_buff[4];
-    u32 unk2               = cmd_buff[5];
-    u8  baud_rate          = cmd_buff[6] & 0xFF;
-    Handle handle          = cmd_buff[8];
-
-    if(Kernel::g_handle_table.IsValid(handle)) {
+    u32 recv_buff_size = cmd_buff[2];
+    u32 unk1 = cmd_buff[3];
+    u32 send_buff_size = cmd_buff[4];
+    u32 unk2 = cmd_buff[5];
+    u8 baud_rate = cmd_buff[6] & 0xFF;
+    Handle handle = cmd_buff[8];
+
+    if (Kernel::g_handle_table.IsValid(handle)) {
         transfer_shared_memory = Kernel::g_handle_table.Get<Kernel::SharedMemory>(handle);
         transfer_shared_memory->name = "IR:TransferSharedMemory";
     }
@@ -47,7 +46,7 @@ void InitializeIrNopShared(Interface* self) {
     cmd_buff[1] = RESULT_SUCCESS.raw;
 
     LOG_WARNING(Service_IR, "(STUBBED) called, transfer_buff_size=%d, recv_buff_size=%d, "
-                "unk1=%d, send_buff_size=%d, unk2=%d, baud_rate=%u, handle=0x%08X",
+                            "unk1=%d, send_buff_size=%d, unk2=%d, baud_rate=%u, handle=0x%08X",
                 transfer_buff_size, recv_buff_size, unk1, send_buff_size, unk2, baud_rate, handle);
 }
 
@@ -94,13 +93,13 @@ void Init() {
     AddService(new IR_User_Interface);
 
     using Kernel::MemoryPermission;
-    shared_memory = SharedMemory::Create(nullptr, 0x1000,
-                                         Kernel::MemoryPermission::ReadWrite, Kernel::MemoryPermission::ReadWrite,
-                                         0, Kernel::MemoryRegion::BASE, "IR:SharedMemory");
+    shared_memory = SharedMemory::Create(nullptr, 0x1000, Kernel::MemoryPermission::ReadWrite,
+                                         Kernel::MemoryPermission::ReadWrite, 0,
+                                         Kernel::MemoryRegion::BASE, "IR:SharedMemory");
     transfer_shared_memory = nullptr;
 
     // Create event handle(s)
-    handle_event  = Event::Create(ResetType::OneShot, "IR:HandleEvent");
+    handle_event = Event::Create(ResetType::OneShot, "IR:HandleEvent");
     conn_status_event = Event::Create(ResetType::OneShot, "IR:ConnectionStatusEvent");
 }
 
diff --git a/src/core/hle/service/ir/ir_rst.cpp b/src/core/hle/service/ir/ir_rst.cpp
index c0300f109..1f10ebd3d 100644
--- a/src/core/hle/service/ir/ir_rst.cpp
+++ b/src/core/hle/service/ir/ir_rst.cpp
@@ -9,10 +9,10 @@ namespace Service {
 namespace IR {
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010000, GetHandles,              "GetHandles"},
-    {0x00020080, nullptr,                 "Initialize"},
-    {0x00030000, nullptr,                 "Shutdown"},
-    {0x00090000, nullptr,                 "WriteToTwoFields"},
+    {0x00010000, GetHandles, "GetHandles"},
+    {0x00020080, nullptr, "Initialize"},
+    {0x00030000, nullptr, "Shutdown"},
+    {0x00090000, nullptr, "WriteToTwoFields"},
 };
 
 IR_RST_Interface::IR_RST_Interface() {
diff --git a/src/core/hle/service/ir/ir_u.cpp b/src/core/hle/service/ir/ir_u.cpp
index 96f76cb83..429615f31 100644
--- a/src/core/hle/service/ir/ir_u.cpp
+++ b/src/core/hle/service/ir/ir_u.cpp
@@ -8,24 +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 06a601029..6cff1d544 100644
--- a/src/core/hle/service/ir/ir_user.cpp
+++ b/src/core/hle/service/ir/ir_user.cpp
@@ -9,32 +9,32 @@ namespace Service {
 namespace IR {
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010182, nullptr,                  "InitializeIrNop"},
-    {0x00020000, FinalizeIrNop,            "FinalizeIrNop"},
-    {0x00030000, nullptr,                  "ClearReceiveBuffer"},
-    {0x00040000, nullptr,                  "ClearSendBuffer"},
-    {0x000500C0, nullptr,                  "WaitConnection"},
-    {0x00060040, RequireConnection,        "RequireConnection"},
-    {0x000702C0, nullptr,                  "AutoConnection"},
-    {0x00080000, nullptr,                  "AnyConnection"},
-    {0x00090000, Disconnect,               "Disconnect"},
-    {0x000A0000, nullptr,                  "GetReceiveEvent"},
-    {0x000B0000, nullptr,                  "GetSendEvent"},
+    {0x00010182, nullptr, "InitializeIrNop"},
+    {0x00020000, FinalizeIrNop, "FinalizeIrNop"},
+    {0x00030000, nullptr, "ClearReceiveBuffer"},
+    {0x00040000, nullptr, "ClearSendBuffer"},
+    {0x000500C0, nullptr, "WaitConnection"},
+    {0x00060040, RequireConnection, "RequireConnection"},
+    {0x000702C0, nullptr, "AutoConnection"},
+    {0x00080000, nullptr, "AnyConnection"},
+    {0x00090000, Disconnect, "Disconnect"},
+    {0x000A0000, nullptr, "GetReceiveEvent"},
+    {0x000B0000, nullptr, "GetSendEvent"},
     {0x000C0000, GetConnectionStatusEvent, "GetConnectionStatusEvent"},
-    {0x000D0042, nullptr,                  "SendIrNop"},
-    {0x000E0042, nullptr,                  "SendIrNopLarge"},
-    {0x000F0040, nullptr,                  "ReceiveIrnop"},
-    {0x00100042, nullptr,                  "ReceiveIrnopLarge"},
-    {0x00110040, nullptr,                  "GetLatestReceiveErrorResult"},
-    {0x00120040, nullptr,                  "GetLatestSendErrorResult"},
-    {0x00130000, nullptr,                  "GetConnectionStatus"},
-    {0x00140000, nullptr,                  "GetTryingToConnectStatus"},
-    {0x00150000, nullptr,                  "GetReceiveSizeFreeAndUsed"},
-    {0x00160000, nullptr,                  "GetSendSizeFreeAndUsed"},
-    {0x00170000, nullptr,                  "GetConnectionRole"},
-    {0x00180182, InitializeIrNopShared,    "InitializeIrNopShared"},
-    {0x00190040, nullptr,                  "ReleaseReceivedData"},
-    {0x001A0040, nullptr,                  "SetOwnMachineId"},
+    {0x000D0042, nullptr, "SendIrNop"},
+    {0x000E0042, nullptr, "SendIrNopLarge"},
+    {0x000F0040, nullptr, "ReceiveIrnop"},
+    {0x00100042, nullptr, "ReceiveIrnopLarge"},
+    {0x00110040, nullptr, "GetLatestReceiveErrorResult"},
+    {0x00120040, nullptr, "GetLatestSendErrorResult"},
+    {0x00130000, nullptr, "GetConnectionStatus"},
+    {0x00140000, nullptr, "GetTryingToConnectStatus"},
+    {0x00150000, nullptr, "GetReceiveSizeFreeAndUsed"},
+    {0x00160000, nullptr, "GetSendSizeFreeAndUsed"},
+    {0x00170000, nullptr, "GetConnectionRole"},
+    {0x00180182, InitializeIrNopShared, "InitializeIrNopShared"},
+    {0x00190040, nullptr, "ReleaseReceivedData"},
+    {0x001A0040, nullptr, "SetOwnMachineId"},
 };
 
 IR_User_Interface::IR_User_Interface() {