Merge branch 'master' into sd-card

src/core/services/news_u.cpp

@@ -0,0 +1,15 @@
+#include "ipc.hpp"
+#include "services/news_u.hpp"
+
+namespace NewsCommands {
+	enum : u32 {};
+}
+
+void NewsUService::reset() {}
+
+void NewsUService::handleSyncRequest(u32 messagePointer) {
+	const u32 command = mem.read32(messagePointer);
+	switch (command) {
+		default: Helpers::panic("news:u service requested. Command: %08X\n", command);
+	}
+}

src/core/services/nfc.cpp

@@ -5,11 +5,13 @@
 namespace NFCCommands {
 	enum : u32 {
 		Initialize = 0x00010040,
+		StartCommunication = 0x00030000,
 		StopCommunication = 0x00040000,
 		GetTagInRangeEvent = 0x000B0000,
 		GetTagOutOfRangeEvent = 0x000C0000,
 		GetTagState = 0x000D0000,
 		CommunicationGetStatus = 0x000F0000,
+		CommunicationGetResult = 0x00120000,
 	};
 }
 
@@ -19,6 +21,7 @@ void NFCService::reset() {
 
 	adapterStatus = Old3DSAdapterStatus::Idle;
 	tagStatus = TagStatus::NotInitialized;
+	initialized = false;
 }
 
 void NFCService::handleSyncRequest(u32 messagePointer) {
@@ -29,6 +32,7 @@ void NFCService::handleSyncRequest(u32 messagePointer) {
 		case NFCCommands::GetTagInRangeEvent: getTagInRangeEvent(messagePointer); break;
 		case NFCCommands::GetTagOutOfRangeEvent: getTagOutOfRangeEvent(messagePointer); break;
 		case NFCCommands::GetTagState: getTagState(messagePointer); break;
+		case NFCCommands::StartCommunication: startCommunication(messagePointer); break;
 		case NFCCommands::StopCommunication: stopCommunication(messagePointer); break;
 		default: Helpers::panic("NFC service requested. Command: %08X\n", command);
 	}
@@ -40,6 +44,7 @@ void NFCService::initialize(u32 messagePointer) {
 
 	adapterStatus = Old3DSAdapterStatus::InitializationComplete;
 	tagStatus = TagStatus::Initialized;
+	initialized = true;
 	// TODO: This should error if already initialized. Also sanitize type.
 	mem.write32(messagePointer, IPC::responseHeader(0x1, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
@@ -91,7 +96,7 @@ void NFCService::getTagState(u32 messagePointer) {
 void NFCService::communicationGetStatus(u32 messagePointer) {
 	log("NFC::CommunicationGetStatus");
 
-	if (adapterStatus != Old3DSAdapterStatus::InitializationComplete) {
+	if (!initialized) {
 		Helpers::warn("NFC::CommunicationGetStatus: Old 3DS NFC Adapter not initialized\n");
 	}
 
@@ -100,8 +105,18 @@ void NFCService::communicationGetStatus(u32 messagePointer) {
 	mem.write8(messagePointer + 8, static_cast<u32>(adapterStatus));
 }
 
+void NFCService::startCommunication(u32 messagePointer) {
+	log("NFC::StartCommunication\n");
+	// adapterStatus = Old3DSAdapterStatus::Active;
+	// TODO: Actually start communication when we emulate amiibo
+
+	mem.write32(messagePointer, IPC::responseHeader(0x3, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 void NFCService::stopCommunication(u32 messagePointer) {
 	log("NFC::StopCommunication\n");
+	adapterStatus = Old3DSAdapterStatus::InitializationComplete;
 	// TODO: Actually stop communication when we emulate amiibo
 
 	mem.write32(messagePointer, IPC::responseHeader(0x4, 1, 0));

src/core/services/service_manager.cpp

@@ -9,7 +9,7 @@ ServiceManager::ServiceManager(std::span<u32, 16> regs, Memory& mem, GPU& gpu, u
 	: regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), act(mem), apt(mem, kernel), cam(mem, kernel), cecd(mem, kernel), cfg(mem),
 	  dlp_srvr(mem), dsp(mem, kernel), hid(mem, kernel), http(mem), ir_user(mem, kernel), frd(mem), fs(mem, kernel, config),
 	  gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem), mcu_hwc(mem, config), mic(mem), nfc(mem, kernel), nim(mem), ndm(mem),
-	  ptm(mem, config), soc(mem), ssl(mem), y2r(mem, kernel) {}
+	  news_u(mem), ptm(mem, config), soc(mem), ssl(mem), y2r(mem, kernel) {}
 
 static constexpr int MAX_NOTIFICATION_COUNT = 16;
 
@@ -35,8 +35,10 @@ void ServiceManager::reset() {
 	ldr.reset();
 	mcu_hwc.reset();
 	mic.reset();
-	nim.reset();
 	ndm.reset();
+	news_u.reset();
+	nfc.reset();
+	nim.reset();
 	ptm.reset();
 	soc.reset();
 	ssl.reset();
@@ -114,6 +116,7 @@ static std::map<std::string, Handle> serviceMap = {
 	{ "mcu::HWC", KernelHandles::MCU_HWC },
 	{ "mic:u", KernelHandles::MIC },
 	{ "ndm:u", KernelHandles::NDM },
+	{ "news:u", KernelHandles::NEWS_U },
 	{ "nfc:u", KernelHandles::NFC },
 	{ "nim:aoc", KernelHandles::NIM },
 	{ "ptm:u", KernelHandles::PTM }, // TODO: ptm:u and ptm:sysm have very different command sets
@@ -202,6 +205,7 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) {
 		case KernelHandles::NFC: nfc.handleSyncRequest(messagePointer); break;
 		case KernelHandles::NIM: nim.handleSyncRequest(messagePointer); break;
 		case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break;
+		case KernelHandles::NEWS_U: news_u.handleSyncRequest(messagePointer); break;
 		case KernelHandles::PTM: ptm.handleSyncRequest(messagePointer); break;
 		case KernelHandles::SOC: soc.handleSyncRequest(messagePointer); break;
 		case KernelHandles::SSL: ssl.handleSyncRequest(messagePointer); break;