[CAM] Add service skeleton

CMakeLists.txt

@@ -60,7 +60,7 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services
                          src/core/services/ptm.cpp src/core/services/mic.cpp src/core/services/cecd.cpp
                          src/core/services/ac.cpp src/core/services/am.cpp src/core/services/boss.cpp
                          src/core/services/frd.cpp src/core/services/nim.cpp src/core/services/shared_font.cpp
-                         src/core/services/y2r.cpp
+                         src/core/services/y2r.cpp src/core/services/cam.cpp
 )
 set(PICA_SOURCE_FILES src/core/PICA/gpu.cpp src/core/PICA/regs.cpp src/core/PICA/shader_unit.cpp
                       src/core/PICA/shader_interpreter.cpp
@@ -88,7 +88,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/opengl.hpp inc
                  include/renderer_gl/surfaces.hpp include/renderer_gl/surface_cache.hpp include/services/ac.hpp
                  include/services/am.hpp include/services/boss.hpp include/services/frd.hpp include/services/nim.hpp
                  include/fs/archive_ext_save_data.hpp include/services/shared_font.hpp include/fs/archive_ncch.hpp
-                 include/renderer_gl/textures.hpp include/colour.hpp include/services/y2r.hpp
+                 include/renderer_gl/textures.hpp include/colour.hpp include/services/y2r.hpp include/services/cam.hpp
 )
 
 set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp

include/kernel/handles.hpp

@@ -14,6 +14,7 @@ namespace KernelHandles {
 		AM,   // Application manager
 		APT,  // App Title something service?
 		BOSS, // Streetpass stuff?
+		CAM,  // Camera service
 		CECD, // More Streetpass stuff?
 		CFG,  // CFG service (Console & region info)
 		HID,  // HID service (Handles everything input-related including gyro)
@@ -26,7 +27,7 @@ namespace KernelHandles {
 		NIM,  // Updates, DLC, etc
 		NDM,  // ?????
 		PTM,  // PTM service (Used for accessing various console info, such as battery, shell and pedometer state)
-		Y2R,
+		Y2R,  // Also does camera stuff
 
 		MinServiceHandle = AC,
 		MaxServiceHandle = Y2R,
@@ -62,6 +63,7 @@ namespace KernelHandles {
 			case AM: return "AM";
 			case APT: return "APT";
 			case BOSS: return "BOSS";
+			case CAM: return "CAM";
 			case CECD: return "CECD";
 			case CFG: return "CFG";
 			case HID: return "HID";

include/logger.hpp

@@ -32,6 +32,7 @@ namespace Log {
     static Logger<false> amLogger;
     static Logger<false> aptLogger;
     static Logger<false> bossLogger;
+    static Logger<false> camLogger;
     static Logger<false> cecdLogger;
     static Logger<false> cfgLogger;
     static Logger<false> dspServiceLogger;
@@ -44,6 +45,7 @@ namespace Log {
     static Logger<false> nimLogger;
     static Logger<false> ndmLogger;
     static Logger<false> ptmLogger;
+    static Logger<false> y2rLogger;
     static Logger<false> srvLogger;
 
     #define MAKE_LOG_FUNCTION(functionName, logger)      \

include/services/cam.hpp

@@ -0,0 +1,19 @@
+#pragma once
+#include "helpers.hpp"
+#include "kernel_types.hpp"
+#include "logger.hpp"
+#include "memory.hpp"
+
+class CAMService {
+	Handle handle = KernelHandles::CAM;
+	Memory& mem;
+	MAKE_LOG_FUNCTION(log, camLogger)
+
+	// Service commands
+	void driverInitialize(u32 messagePointer);
+
+public:
+	CAMService(Memory& mem) : mem(mem) {}
+	void reset();
+	void handleSyncRequest(u32 messagePointer);
+};

include/services/service_manager.hpp

@@ -8,6 +8,7 @@
 #include "services/am.hpp"
 #include "services/apt.hpp"
 #include "services/boss.hpp"
+#include "services/cam.hpp"
 #include "services/cecd.hpp"
 #include "services/cfg.hpp"
 #include "services/dsp.hpp"
@@ -38,6 +39,7 @@ class ServiceManager {
     AMService am;
 	APTService apt;
     BOSSService boss;
+	CAMService cam;
 	CECDService cecd;
 	CFGService cfg;
 	DSPService dsp;

src/core/services/cam.cpp

@@ -0,0 +1,28 @@
+#include "services/cam.hpp"
+
+namespace CAMCommands {
+	enum : u32 {
+		DriverInitialize = 0x00390000
+	};
+}
+
+namespace Result {
+	enum : u32 {
+		Success = 0,
+	};
+}
+
+void CAMService::reset() {}
+
+void CAMService::handleSyncRequest(u32 messagePointer) {
+	const u32 command = mem.read32(messagePointer);
+	switch (command) {
+		case CAMCommands::DriverInitialize: driverInitialize(messagePointer); break;
+		default: Helpers::panic("CAM service requested. Command: %08X\n", command);
+	}
+}
+
+void CAMService::driverInitialize(u32 messagePointer) {
+	log("CAM::DriverInitialize\n");
+	mem.write32(messagePointer + 4, Result::Success);
+}

src/core/services/service_manager.cpp

@@ -2,7 +2,7 @@
 #include "kernel.hpp"
 
 ServiceManager::ServiceManager(std::array<u32, 16>& regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel)
-	: regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), apt(mem, kernel), cecd(mem), cfg(mem), 
+	: regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), apt(mem, kernel), cam(mem), cecd(mem), cfg(mem), 
 	dsp(mem), hid(mem), frd(mem), fs(mem, kernel), gsp_gpu(mem, gpu, currentPID), gsp_lcd(mem), mic(mem),
 	nim(mem), ndm(mem), ptm(mem), y2r(mem) {}
 
@@ -14,6 +14,7 @@ void ServiceManager::reset() {
 	am.reset();
 	apt.reset();
 	boss.reset();
+	cam.reset();
 	cecd.reset();
 	cfg.reset();
 	dsp.reset();
@@ -88,6 +89,7 @@ void ServiceManager::getServiceHandle(u32 messagePointer) {
 	std::string service = mem.readString(messagePointer + 4, 8);
 	log("srv::getServiceHandle (Service: %s, nameLength: %d, flags: %d)\n", service.c_str(), nameLength, flags);
 
+	// TODO: Use a map here
 	if (service == "ac:u") {
         handle = KernelHandles::AC;
     } else if (service == "am:app") {
@@ -100,6 +102,8 @@ void ServiceManager::getServiceHandle(u32 messagePointer) {
 		handle = KernelHandles::APT;
 	} else if (service == "boss:U") {
 		handle = KernelHandles::BOSS;
+	} else if (service == "cam:u") {
+		handle = KernelHandles::CAM;
 	} else if (service == "cecd:u") {
 		handle = KernelHandles::CECD;
 	} else if (service == "cfg:u") {
@@ -164,17 +168,18 @@ void ServiceManager::subscribe(u32 messagePointer) {
 
 void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) {
 	switch (handle) {
+		case KernelHandles::GPU: [[likely]] gsp_gpu.handleSyncRequest(messagePointer); break;
         case KernelHandles::AC: ac.handleSyncRequest(messagePointer); break;
         case KernelHandles::AM: am.handleSyncRequest(messagePointer); break;
 		case KernelHandles::APT: apt.handleSyncRequest(messagePointer); break;
         case KernelHandles::BOSS: boss.handleSyncRequest(messagePointer); break;
+		case KernelHandles::CAM: cam.handleSyncRequest(messagePointer); break;
 		case KernelHandles::CECD: cecd.handleSyncRequest(messagePointer); break;
 		case KernelHandles::CFG: cfg.handleSyncRequest(messagePointer); break;
 		case KernelHandles::DSP: dsp.handleSyncRequest(messagePointer); break;
 		case KernelHandles::HID: hid.handleSyncRequest(messagePointer); break;
         case KernelHandles::FRD: frd.handleSyncRequest(messagePointer); break;
 		case KernelHandles::FS: fs.handleSyncRequest(messagePointer); break;
-		case KernelHandles::GPU: [[likely]] gsp_gpu.handleSyncRequest(messagePointer); break;
 		case KernelHandles::LCD: gsp_lcd.handleSyncRequest(messagePointer); break;
 		case KernelHandles::MIC: mic.handleSyncRequest(messagePointer); break;
         case KernelHandles::NIM: nim.handleSyncRequest(messagePointer); break;