Merge remote-tracking branch 'upstream/master' into moar-gpu

include/services/cfg.hpp

@@ -7,7 +7,6 @@
 #include "result/result.hpp"
 
 class CFGService {
-	Handle handle = KernelHandles::CFG;
 	Memory& mem;
 	CountryCodes country = CountryCodes::US; // Default to USA
 	MAKE_LOG_FUNCTION(log, cfgLogger)

include/services/service_manager.hpp

@@ -29,6 +29,7 @@
 #include "services/nfc.hpp"
 #include "services/nim.hpp"
 #include "services/ptm.hpp"
+#include "services/soc.hpp"
 #include "services/y2r.hpp"
 
 // More circular dependencies!!
@@ -66,6 +67,7 @@ class ServiceManager {
     NIMService nim;
 	NDMService ndm;
 	PTMService ptm;
+	SOCService soc;
 	Y2RService y2r;
 
 	// "srv:" commands

include/services/soc.hpp

@@ -0,0 +1,21 @@
+#pragma once
+#include "helpers.hpp"
+#include "kernel_types.hpp"
+#include "logger.hpp"
+#include "memory.hpp"
+
+class SOCService {
+	Handle handle = KernelHandles::SOC;
+	Memory& mem;
+	MAKE_LOG_FUNCTION(log, socLogger)
+
+	bool initialized = false;
+
+	// Service commands
+	void initializeSockets(u32 messagePointer);
+
+public:
+	SOCService(Memory& mem) : mem(mem) {}
+	void reset();
+	void handleSyncRequest(u32 messagePointer);
+};