Few fixes

XorTroll · Jun 21, 2019 · badb783 · badb783
1 parent 9cb34e4
commit badb783
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 66 deletions.
diff --git a/emuiibo.json b/emuiibo.json
@@ -29,65 +29,98 @@
 		{
             "type": "syscalls",
             "value": {
-			"svcSetHeapSize":	"0x01",
-			"svcSetMemoryPermission":	"0x02",
-			"svcSetMemoryAttribute":	"0x03",
-			"svcMapMemory":	"0x04",
-			"svcUnmapMemory":	"0x05",
-			"svcQueryMemory":	"0x06",
-			"svcExitProcess":	"0x07",
-			"svcCreateThread":	"0x08",
-			"svcStartThread":	"0x09",
-			"svcExitThread":	"0x0a",
-			"svcSleepThread":	"0x0b",
-			"svcGetThreadPriority":	"0x0c",
-			"svcSetThreadPriority":	"0x0d",
-			"svcGetThreadCoreMask":	"0x0e",
-			"svcSetThreadCoreMask":	"0x0f",
-			"svcGetCurrentProcessorNumber":	"0x10",
-			"svcSignalEvent":	"0x11",
-			"svcClearEvent":	"0x12",
-			"svcMapSharedMemory":	"0x13",
-			"svcUnmapSharedMemory":	"0x14",
-			"svcCreateTransferMemory":	"0x15",
-			"svcCloseHandle":	"0x16",
-			"svcResetSignal":	"0x17",
-			"svcWaitSynchronization":	"0x18",
-			"svcCancelSynchronization":	"0x19",
-			"svcArbitrateLock":	"0x1a",
-			"svcArbitrateUnlock":	"0x1b",
-			"svcWaitProcessWideKeyAtomic":	"0x1c",
-			"svcSignalProcessWideKey":	"0x1d",
-			"svcGetSystemTick":	"0x1e",
-			"svcConnectToNamedPort":	"0x1f",
-			"svcSendSyncRequestLight":	"0x20",
-			"svcSendSyncRequest":	"0x21",
-			"svcSendSyncRequestWithUserBuffer":	"0x22",
-			"svcSendAsyncRequestWithUserBuffer":	"0x23",
-			"svcGetProcessId":	"0x24",
-			"svcGetThreadId":	"0x25",
-			"svcBreak":	"0x26",
-			"svcOutputDebugString":	"0x27",
-			"svcReturnFromException":	"0x28",
-			"svcGetInfo":	"0x29",
-			"svcWaitForAddress":	"0x34",
-			"svcSignalToAddress":	"0x35",
-			"svcCreateSession":	"0x40",
-			"svcAcceptSession":	"0x41",
-			"svcReplyAndReceiveLight":	"0x42",
-			"svcReplyAndReceive":	"0x43",
-			"svcReplyAndReceiveWithUserBuffer":	"0x44",
-			"svcCreateEvent":	"0x45",
-			"svcCreateInterruptEvent":	"0x53",
-			"svcReadWriteRegister":	"0x4E",
-			"svcQueryIoMapping":	"0x55",
-			"svcCreateDeviceAddressSpace":	"0x56",
-			"svcAttachDeviceAddressSpace":	"0x57",
-			"svcDetachDeviceAddressSpace":	"0x58",
-			"svcMapDeviceAddressSpaceAligned":	"0x5a",
-			"svcUnmapDeviceAddressSpace":	"0x5c",
-			"svcGetSystemInfo":	"0x6f",
-			"svcCallSecureMonitor":	"0x7f"
+				"svcSetHeapSize":	"0x01",
+				"svcSetMemoryPermission":	"0x02",
+				"svcSetMemoryAttribute":	"0x03",
+				"svcMapMemory":	"0x04",
+				"svcUnmapMemory":	"0x05",
+				"svcQueryMemory":	"0x06",
+				"svcExitProcess":	"0x07",
+				"svcCreateThread":	"0x08",
+				"svcStartThread":	"0x09",
+				"svcExitThread":	"0x0a",
+				"svcSleepThread":	"0x0b",
+				"svcGetThreadPriority":	"0x0c",
+				"svcSetThreadPriority":	"0x0d",
+				"svcGetThreadCoreMask":	"0x0e",
+				"svcSetThreadCoreMask":	"0x0f",
+				"svcGetCurrentProcessorNumber":	"0x10",
+				"svcSignalEvent":	"0x11",
+				"svcClearEvent":	"0x12",
+				"svcMapSharedMemory":	"0x13",
+				"svcUnmapSharedMemory":	"0x14",
+				"svcCreateTransferMemory":	"0x15",
+				"svcCloseHandle":	"0x16",
+				"svcResetSignal":	"0x17",
+				"svcWaitSynchronization":	"0x18",
+				"svcCancelSynchronization":	"0x19",
+				"svcArbitrateLock":	"0x1a",
+				"svcArbitrateUnlock":	"0x1b",
+				"svcWaitProcessWideKeyAtomic":	"0x1c",
+				"svcSignalProcessWideKey":	"0x1d",
+				"svcGetSystemTick":	"0x1e",
+				"svcConnectToNamedPort":	"0x1f",
+				"svcSendSyncRequestLight":	"0x20",
+				"svcSendSyncRequest":	"0x21",
+				"svcSendSyncRequestWithUserBuffer":	"0x22",
+				"svcSendAsyncRequestWithUserBuffer":	"0x23",
+				"svcGetProcessId":	"0x24",
+				"svcGetThreadId":	"0x25",
+				"svcBreak":	"0x26",
+				"svcOutputDebugString":	"0x27",
+				"svcReturnFromException":	"0x28",
+				"svcGetInfo":	"0x29",
+				"svcWaitForAddress":	"0x34",
+				"svcSignalToAddress":	"0x35",
+				"svcCreateSession":	"0x40",
+				"svcAcceptSession":	"0x41",
+				"svcReplyAndReceiveLight":	"0x42",
+				"svcReplyAndReceive":	"0x43",
+				"svcReplyAndReceiveWithUserBuffer":	"0x44",
+				"svcCreateEvent":	"0x45",
+				"svcCreateInterruptEvent":	"0x53",
+				"svcReadWriteRegister":	"0x4E",
+				"svcQueryIoMapping":	"0x55",
+				"svcCreateDeviceAddressSpace":	"0x56",
+				"svcAttachDeviceAddressSpace":	"0x57",
+				"svcDetachDeviceAddressSpace":	"0x58",
+				"svcMapDeviceAddressSpaceAligned":	"0x5a",
+				"svcUnmapDeviceAddressSpace":	"0x5c",
+				"svcGetSystemInfo":	"0x6f",
+				"svcCallSecureMonitor":	"0x7f",
+				"svcUnknown46": "0x46",
+                "svcUnknown47": "0x47",
+                "svcMapPhysicalMemoryUnsafe": "0x48",
+                "svcUnmapPhysicalMemoryUnsafe": "0x49",
+                "svcSetUnsafeLimit": "0x4A",
+                "svcCreateCodeMemory": "0x4B",
+                "svcControlCodeMemory": "0x4C",
+                "svcSleepSystem": "0x4D",
+                "svcSetProcessActivity": "0x4F",
+                "svcCreateSharedMemory": "0x50",
+                "svcMapTransferMemory": "0x51",
+                "svcUnmapTransferMemory": "0x52",
+                "svcDebugActiveProcess": "0x60",
+                "svcBreakDebugProcess": "0x61",
+                "svcTerminateDebugProcess": "0x62",
+                "svcGetDebugEvent": "0x63",
+                "svcContinueDebugEvent": "0x64",
+                "svcGetProcessList": "0x65",
+                "svcGetThreadList": "0x66",
+                "svcGetDebugThreadContext": "0x67",
+                "svcSetDebugThreadContext": "0x68",
+                "svcQueryDebugProcessMemory": "0x69",
+                "svcReadDebugProcessMemory": "0x6A",
+                "svcWriteDebugProcessMemory": "0x6B",
+                "svcSetHardwareBreakPoint": "0x6C",
+                "svcGetDebugThreadParam": "0x6D",
+                "svcConnectToPort": "0x72",
+                "svcSetProcessMemoryPermission": "0x73",
+                "svcMapProcessMemory": "0x74",
+                "svcUnmapProcessMemory": "0x75",
+                "svcQueryProcessMemory": "0x76",
+                "svcMapProcessCodeMemory": "0x77",
+                "svcUnmapProcessCodeMemory": "0x78"
             }
         },
         {

diff --git a/libstratosphere b/libstratosphere
diff --git a/source/emu-amiibo.cpp b/source/emu-amiibo.cpp
@@ -62,12 +62,11 @@ NfpuCommonInfo AmiiboLayout::ProcessCommonInfo()
     return cinfo;
 }
 
-void AmiiboEmulator::Initialize(bool external_call)
+void AmiiboEmulator::Initialize(bool ExternalCall)
 {
     g_curAmiibo = "";
     g_curIdx = UINT32_MAX;
-    if(!external_call)
-        DumpConsoleMiis();
+    if(!ExternalCall) DumpConsoleMiis();
     u32 c = GetCount();
     if(c > 0)
     {

diff --git a/source/emu-amiibo.hpp b/source/emu-amiibo.hpp
@@ -48,7 +48,7 @@ struct AmiiboLayout
 class AmiiboEmulator
 {
     public:
-        static void Initialize(bool external_call=false);
+        static void Initialize(bool ExternalCall = false);
         static void Toggle();
         static void ToggleOnce();
         static void Untoggle();

diff --git a/source/main.cpp b/source/main.cpp
@@ -165,7 +165,6 @@ void ComboCheckerThread(void* arg)
     }
 }
 
-
 int main()
 {
     AmiiboEmulator::Initialize();

diff --git a/source/nfp-iuser.hpp b/source/nfp-iuser.hpp
@@ -105,4 +105,4 @@ class NfpIUser : public IServiceObject
             MakeServiceCommandMeta<NfpIUserCmd_GetApplicationAreaSize, &NfpIUser::GetApplicationAreaSize>(),
             MakeServiceCommandMeta<NfpIUserCmd_RecreateApplicationArea, &NfpIUser::RecreateApplicationArea, FirmwareVersion_500>(), /* TODO: What version was this added in? */
         };
-};
+};