Merge branch 'master' into xinput

README.md

@@ -59,13 +59,13 @@ If you have some homebrew that currently doesn't work within the emulator, you c
 
 **Contact**
 
-For help, support, suggestions, or if you just want to get in touch with the team; join our Discord server!
+For help, support, suggestions, or if you just want to get in touch with the team; join our Discord server!  
 https://discord.gg/VkQYXAZ
 
 **Running**
 
-To run this emulator, you need the .NET Core 2.0 (or higher) SDK.
+To run this emulator, you need the .NET Core 2.1 (or higher) SDK *and* the OpenAL 11 Core SDK.  
-Run `dotnet run -c Release -- path\to\homebrew.nro` inside the Ryujinx solution folder to run homebrew apps.
+Run `dotnet run -c Release -- path\to\homebrew.nro` inside the Ryujinx solution folder to run homebrew apps.  
 Run `dotnet run -c Release -- path\to\game_exefs_and_romfs_folder` to run official games (they need to be decrypted and extracted first!)
 
 **Compatibility**
@@ -73,5 +73,5 @@ You can check out the compatibility list within the Wiki. Only a handful of game
 
 **Latest build**
 
-These builds are compiled automatically for each commit on the master branch. They may be unstable or not work at all.
+These builds are compiled automatically for each commit on the master branch. They may be unstable or might not work at all.  
-To download the latest automatic build for Windows (64-bits), [Click Here](https://ci.appveyor.com/api/projects/gdkchan/ryujinx/artifacts/ryujinx_latest_unstable.zip?pr=false).
+The latest automatic build for Windows (64-bit) can be found on the [official website](https://ryujinx.org/#/Build).

Ryujinx.HLE/Gpu/BlockLinearSwizzle.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class BlockLinearSwizzle : ISwizzle
     {

Ryujinx.HLE/Gpu/INvGpuEngine.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     interface INvGpuEngine
     {

Ryujinx.HLE/Gpu/ISwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     interface ISwizzle
     {

Ryujinx.HLE/Gpu/LinearSwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class LinearSwizzle : ISwizzle
     {

Ryujinx.HLE/Gpu/MacroInterpreter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class MacroInterpreter
     {

Ryujinx.HLE/Gpu/NvGpu.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Gal;
 using System.Threading;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpu
     {

Ryujinx.HLE/Gpu/NvGpuBufferType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuBufferType
     {

Ryujinx.HLE/Gpu/NvGpuEngine.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuEngine
     {

Ryujinx.HLE/Gpu/NvGpuEngine2d.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Gal;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuEngine2d : INvGpuEngine
     {

Ryujinx.HLE/Gpu/NvGpuEngine2dReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuEngine2dReg
     {

Ryujinx.HLE/Gpu/NvGpuEngine3d.cs

@@ -2,7 +2,7 @@ using Ryujinx.Graphics.Gal;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuEngine3d : INvGpuEngine
     {

Ryujinx.HLE/Gpu/NvGpuEngine3dReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuEngine3dReg
     {

Ryujinx.HLE/Gpu/NvGpuFifo.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuFifo
     {

Ryujinx.HLE/Gpu/NvGpuFifoMeth.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuFifoMeth
     {

Ryujinx.HLE/Gpu/NvGpuMethod.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry);
 }

Ryujinx.HLE/Gpu/NvGpuPBEntry.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     struct NvGpuPBEntry
     {

Ryujinx.HLE/Gpu/NvGpuPushBuffer.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class NvGpuPushBuffer
     {

Ryujinx.HLE/Gpu/NvGpuVmm.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System.Collections.Concurrent;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuVmm : IAMemory, IGalMemory
     {

Ryujinx.HLE/Gpu/NvGpuVmmCache.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuVmmCache
     {

Ryujinx.HLE/Gpu/Texture.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.Gal;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     struct Texture
     {

Ryujinx.HLE/Gpu/TextureFactory.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureFactory
     {

Ryujinx.HLE/Gpu/TextureHelper.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureHelper
     {

Ryujinx.HLE/Gpu/TextureReader.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureReader
     {

Ryujinx.HLE/Gpu/TextureSwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum TextureSwizzle
     {

Ryujinx.HLE/Gpu/TextureWriter.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureWriter
     {

Ryujinx.HLE/Hid/Hid.cs

@@ -1,9 +1,10 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public class Hid
     {
@@ -85,11 +86,16 @@ namespace Ryujinx.Core.Input
             {
                 ShMemPositions = SharedMem.GetVirtualPositions();
 
-                (AMemory Memory, long Position) ShMem = ShMemPositions[ShMemPositions.Length - 1];
+                (AMemory Memory, long Position) = ShMemPositions[ShMemPositions.Length - 1];
 
-                Log.PrintInfo(LogClass.Hid, $"HID shared memory successfully mapped to 0x{ShMem.Position:x16}!");
+                for (long Offset = 0; Offset < Horizon.HidSize; Offset += 8)
+                {
+                    Memory.WriteInt64Unchecked(Position + Offset, 0);
+                }
 
-                Init(ShMem.Memory, ShMem.Position);
+                Log.PrintInfo(LogClass.Hid, $"HID shared memory successfully mapped to 0x{Position:x16}!");
+
+                Init(Memory, Position);
             }
         }
 
@@ -186,18 +192,22 @@ namespace Ryujinx.Core.Input
 
                     ControllerOffset += HidControllersLayoutHeaderSize;
 
+                    long LastEntryOffset = ControllerOffset + LastEntry * HidControllersInputEntrySize;
+
                     ControllerOffset += CurrEntry * HidControllersInputEntrySize;
 
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x0,  Timestamp);
+                    long SampleCounter = Memory.ReadInt64Unchecked(LastEntryOffset) + 1;
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x8,  Timestamp);
+
+                    Memory.WriteInt64Unchecked(ControllerOffset + 0x0,  SampleCounter);
+                    Memory.WriteInt64Unchecked(ControllerOffset + 0x8,  SampleCounter);
 
                     Memory.WriteInt64Unchecked(ControllerOffset + 0x10, (uint)Buttons);
 
                     Memory.WriteInt32Unchecked(ControllerOffset + 0x18, LeftStick.DX);
                     Memory.WriteInt32Unchecked(ControllerOffset + 0x1c, LeftStick.DY);
 
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x20, RightStick.DX);
+                    Memory.WriteInt32Unchecked(ControllerOffset + 0x20, RightStick.DX);
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x24, RightStick.DY);
+                    Memory.WriteInt32Unchecked(ControllerOffset + 0x24, RightStick.DY);
 
                     Memory.WriteInt64Unchecked(ControllerOffset + 0x28,
                         (uint)HidControllerConnState.Controller_State_Connected |

Ryujinx.HLE/Hid/HidControllerButtons.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerButtons

Ryujinx.HLE/Hid/HidControllerColorDesc.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerColorDesc

Ryujinx.HLE/Hid/HidControllerConnState.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerConnState

Ryujinx.HLE/Hid/HidControllerId.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public enum HidControllerId
     {

Ryujinx.HLE/Hid/HidControllerLayouts.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public enum HidControllerLayouts
     {

Ryujinx.HLE/Hid/HidControllerType.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerType

Ryujinx.HLE/Hid/HidJoystickPosition.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public struct HidJoystickPosition
     {

Ryujinx.HLE/Hid/HidTouchPoint.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public struct HidTouchPoint
     {

Ryujinx.HLE/Hid/JoyCon.cs

@@ -1,5 +1,5 @@
 //TODO: This is only used by Config, it doesn't belong to Core.
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public struct JoyConLeft
     {

Ryujinx.HLE/Hid/JoyConColor.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public enum JoyConColor //Thanks to CTCaer
     {

Ryujinx.HLE/Loaders/Compression/Lz4.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Loaders.Compression
+namespace Ryujinx.HLE.Loaders.Compression
 {
     static class Lz4
     {

Ryujinx.HLE/Loaders/ElfDyn.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     struct ElfDyn
     {

Ryujinx.HLE/Loaders/ElfDynTag.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfDynTag
     {

Ryujinx.HLE/Loaders/ElfRel.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     struct ElfRel
     {

Ryujinx.HLE/Loaders/ElfRelType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfRelType
     {

Ryujinx.HLE/Loaders/ElfSym.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     struct ElfSym
     {
@@ -12,7 +12,7 @@ namespace Ryujinx.Core.Loaders
             Type == ElfSymType.STT_FUNC ||
             Type == ElfSymType.STT_OBJECT;
 
-        public bool IsGlobalOrWeak => 
+        public bool IsGlobalOrWeak =>
             Binding == ElfSymBinding.STB_GLOBAL ||
             Binding == ElfSymBinding.STB_WEAK;
 
@@ -22,7 +22,7 @@ namespace Ryujinx.Core.Loaders
 
         public ElfSym(
             string Name,
-            int    Info, 
+            int    Info,
             int    Other,
             int    SHIdx,
             long   Value,

Ryujinx.HLE/Loaders/ElfSymBinding.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfSymBinding
     {

Ryujinx.HLE/Loaders/ElfSymType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfSymType
     {

Ryujinx.HLE/Loaders/ElfSymVisibility.cs

@@ -1,10 +1,10 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfSymVisibility
     {
         STV_DEFAULT   = 0,
         STV_INTERNAL  = 1,
         STV_HIDDEN    = 2,
-        STV_PROTECTED = 3 
+        STV_PROTECTED = 3
     }
 }

Ryujinx.HLE/Loaders/Executable.cs

@@ -1,9 +1,9 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.Loaders.Executables;
+using Ryujinx.HLE.Loaders.Executables;
-using Ryujinx.Core.OsHle;
+using Ryujinx.HLE.OsHle;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     class Executable
     {

Ryujinx.HLE/Loaders/Executables/IExecutable.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders.Executables
+namespace Ryujinx.HLE.Loaders.Executables
 {
     public interface IExecutable
     {

Ryujinx.HLE/Loaders/Executables/Nro.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.Loaders.Executables
+namespace Ryujinx.HLE.Loaders.Executables
 {
     class Nro : IExecutable
     {

Ryujinx.HLE/Loaders/Executables/Nso.cs

@@ -1,8 +1,8 @@
-using Ryujinx.Core.Loaders.Compression;
+using Ryujinx.HLE.Loaders.Compression;
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.Loaders.Executables
+namespace Ryujinx.HLE.Loaders.Executables
 {
     class Nso : IExecutable
     {

Ryujinx.HLE/Logging/LogClass.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public enum LogClass
     {

Ryujinx.HLE/Logging/LogEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public class LogEventArgs : EventArgs
     {

Ryujinx.HLE/Logging/LogLevel.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public enum LogLevel
     {

Ryujinx.HLE/Logging/Logger.cs

@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public class Logger
     {

Ryujinx.HLE/OsHle/AppletStateMgr.cs

@@ -1,9 +1,9 @@
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
-using Ryujinx.Core.OsHle.Services.Am;
+using Ryujinx.HLE.OsHle.Services.Am;
 using System;
 using System.Collections.Concurrent;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class AppletStateMgr : IDisposable
     {

Ryujinx.HLE/OsHle/Diagnostics/Demangler.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Core.OsHle.Diagnostics
+namespace Ryujinx.HLE.OsHle.Diagnostics
 {
     static class Demangler
     {

Ryujinx.HLE/OsHle/ErrorCode.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     static class ErrorCode
     {

Ryujinx.HLE/OsHle/ErrorModule.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     enum ErrorModule
     {

Ryujinx.HLE/OsHle/Exceptions/GuestBrokeExecutionException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.OsHle.Exceptions
+namespace Ryujinx.HLE.OsHle.Exceptions
 {
     public class GuestBrokeExecutionException : Exception
     {

Ryujinx.HLE/OsHle/Exceptions/UndefinedInstructionException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.OsHle.Exceptions
+namespace Ryujinx.HLE.OsHle.Exceptions
 {
     public class UndefinedInstructionException : Exception
     {

Ryujinx.HLE/OsHle/GlobalStateTable.cs

@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class GlobalStateTable
     {

Ryujinx.HLE/OsHle/Handles/HSharedMem.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class HSharedMem
     {

Ryujinx.HLE/OsHle/Handles/HTransferMem.cs

@@ -1,6 +1,6 @@
 using ChocolArm64.Memory;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class HTransferMem
     {

Ryujinx.HLE/OsHle/Handles/KEvent.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KEvent : KSynchronizationObject { }
 }

Ryujinx.HLE/OsHle/Handles/KProcessHandleTable.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KProcessHandleTable
     {

Ryujinx.HLE/OsHle/Handles/KProcessScheduler.cs

@@ -1,9 +1,9 @@
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KProcessScheduler : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/KSession.cs

@@ -1,7 +1,7 @@
-using Ryujinx.Core.OsHle.Services;
+using Ryujinx.HLE.OsHle.Services;
 using System;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KSession : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/KSynchronizationObject.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KSynchronizationObject : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/KThread.cs

@@ -1,7 +1,7 @@
 using ChocolArm64;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KThread : KSynchronizationObject
     {

Ryujinx.HLE/OsHle/Handles/SchedulerThread.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class SchedulerThread : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/ThreadQueue.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class ThreadQueue
     {

Ryujinx.HLE/OsHle/Homebrew.cs

@@ -1,6 +1,6 @@
 using ChocolArm64.Memory;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     static class Homebrew
     {

Ryujinx.HLE/OsHle/Horizon.cs

@@ -1,11 +1,11 @@
-using Ryujinx.Core.Loaders.Executables;
+using Ryujinx.HLE.Loaders.Executables;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 using System.Collections.Concurrent;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     public class Horizon : IDisposable
     {

Ryujinx.HLE/OsHle/IdDictionary.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class IdDictionary
     {

Ryujinx.HLE/OsHle/Ipc/IpcBuffDesc.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     struct IpcBuffDesc
     {

Ryujinx.HLE/OsHle/Ipc/IpcHandleDesc.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     class IpcHandleDesc
     {

Ryujinx.HLE/OsHle/Ipc/IpcHandler.cs

@@ -1,9 +1,9 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     static class IpcHandler
     {

Ryujinx.HLE/OsHle/Ipc/IpcMagic.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     abstract class IpcMagic
     {

Ryujinx.HLE/OsHle/Ipc/IpcMessage.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     class IpcMessage
     {

Ryujinx.HLE/OsHle/Ipc/IpcMessageType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     enum IpcMessageType
     {

Ryujinx.HLE/OsHle/Ipc/IpcPtrBuffDesc.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     struct IpcPtrBuffDesc
     {

Ryujinx.HLE/OsHle/Ipc/IpcRecvListBuffDesc.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     struct IpcRecvListBuffDesc
     {

Ryujinx.HLE/OsHle/Ipc/ServiceProcessRequest.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     delegate long ServiceProcessRequest(ServiceCtx Context);
 }

Ryujinx.HLE/OsHle/Kernel/KernelErr.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     static class KernelErr
     {

Ryujinx.HLE/OsHle/Kernel/NsTimeConverter.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     static class NsTimeConverter
     {

Ryujinx.HLE/OsHle/Kernel/SvcHandler.cs

@@ -1,14 +1,14 @@
 using ChocolArm64.Events;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
-using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler : IDisposable
     {

Ryujinx.HLE/OsHle/Kernel/SvcMemory.cs

@@ -1,11 +1,11 @@
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {

Ryujinx.HLE/OsHle/Kernel/SvcSystem.cs

@@ -1,16 +1,16 @@
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Exceptions;
+using Ryujinx.HLE.OsHle.Exceptions;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
-using Ryujinx.Core.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Ipc;
-using Ryujinx.Core.OsHle.Services;
+using Ryujinx.HLE.OsHle.Services;
 using System;
 using System.Threading;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {
@@ -352,7 +352,7 @@ namespace Ryujinx.Core.OsHle.Kernel
                 case 15:
                     ThreadState.X1 = MemoryRegions.MapRegionSize;
                     break;
-                    
+
                 case 16:
                     ThreadState.X1 = IsVirtualMemoryEnabled ? 1 : 0;
                     break;

Ryujinx.HLE/OsHle/Kernel/SvcThread.cs

@@ -1,11 +1,11 @@
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System.Threading;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {
@@ -160,7 +160,7 @@ namespace Ryujinx.Core.OsHle.Kernel
                 ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle);
             }
         }
-        
+
         private void SvcSetThreadCoreMask(AThreadState ThreadState)
         {
             //FIXME: This is wrong, but the "correct" way to handle

Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs

@@ -1,14 +1,14 @@
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {

Ryujinx.HLE/OsHle/MemoryAllocator.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class MemoryAllocator
     {

Ryujinx.HLE/OsHle/MemoryRegions.cs

@@ -1,6 +1,6 @@
 using ChocolArm64.Memory;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     static class MemoryRegions
     {

Ryujinx.HLE/OsHle/MemoryType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     enum MemoryType
     {

Ryujinx.HLE/OsHle/Process.cs

@@ -2,20 +2,20 @@ using ChocolArm64;
 using ChocolArm64.Events;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Loaders;
+using Ryujinx.HLE.Loaders;
-using Ryujinx.Core.Loaders.Executables;
+using Ryujinx.HLE.Loaders.Executables;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Diagnostics;
+using Ryujinx.HLE.OsHle.Diagnostics;
-using Ryujinx.Core.OsHle.Exceptions;
+using Ryujinx.HLE.OsHle.Exceptions;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
-using Ryujinx.Core.OsHle.Kernel;
+using Ryujinx.HLE.OsHle.Kernel;
-using Ryujinx.Core.OsHle.Services.Nv;
+using Ryujinx.HLE.OsHle.Services.Nv;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class Process : IDisposable
     {

Ryujinx.HLE/OsHle/ServiceCtx.cs

@@ -1,9 +1,9 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
-using Ryujinx.Core.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Ipc;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class ServiceCtx
     {

Ryujinx.HLE/OsHle/Services/Acc/IAccountServiceForApplication.cs

@@ -1,8 +1,8 @@
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Services.Acc
+namespace Ryujinx.HLE.OsHle.Services.Acc
 {
     class IAccountServiceForApplication : IpcService
     {
@@ -33,7 +33,7 @@ namespace Ryujinx.Core.OsHle.Services.Acc
 
             return 0;
         }
-        
+
         public long GetUserExistence(ServiceCtx Context)
         {
             Context.ResponseData.Write(1);
@@ -49,7 +49,7 @@ namespace Ryujinx.Core.OsHle.Services.Acc
 
             return 0;
         }
-        
+
         public long ListOpenUsers(ServiceCtx Context)
         {
             Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed.");

Ryujinx.HLE/OsHle/Services/Acc/IManagerForApplication.cs

@@ -1,8 +1,8 @@
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Services.Acc
+namespace Ryujinx.HLE.OsHle.Services.Acc
 {
     class IManagerForApplication : IpcService
     {

Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs

@@ -1,8 +1,8 @@
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Services.Acc
+namespace Ryujinx.HLE.OsHle.Services.Acc
 {
     class IProfile : IpcService
     {

Ryujinx.HLE/OsHle/Services/Am/AmErr.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Services.Am
+namespace Ryujinx.HLE.OsHle.Services.Am
 {
     static class AmErr
     {

Ryujinx.HLE/OsHle/Services/Am/FocusState.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Services.Am
+namespace Ryujinx.HLE.OsHle.Services.Am
 {
     enum FocusState
     {