diff --git a/CMakeLists.txt b/CMakeLists.txt index ac557f89..20b6a4ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services src/core/services/frd.cpp src/core/services/nim.cpp src/core/services/shared_font.cpp src/core/services/y2r.cpp src/core/services/cam.cpp src/core/services/ldr_ro.cpp src/core/services/act.cpp src/core/services/nfc.cpp src/core/services/dlp_srvr.cpp - src/core/services/ir_user.cpp + src/core/services/ir_user.cpp src/core/services/http.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 src/core/PICA/dynapica/shader_rec.cpp @@ -174,7 +174,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/crypto/aes_engine.hpp include/metaprogramming.hpp include/PICA/pica_vertex.hpp include/config.hpp include/services/ir_user.hpp include/http_server.hpp include/cheats.hpp include/action_replay.hpp include/renderer_sw/renderer_sw.hpp include/compiler_builtins.hpp - include/fs/romfs.hpp include/fs/ivfc.hpp include/discord_rpc.hpp + include/fs/romfs.hpp include/fs/ivfc.hpp include/discord_rpc.hpp include/services/http.hpp ) set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp diff --git a/include/kernel/handles.hpp b/include/kernel/handles.hpp index 3656beeb..faccf148 100644 --- a/include/kernel/handles.hpp +++ b/include/kernel/handles.hpp @@ -20,7 +20,8 @@ namespace KernelHandles { CFG, // CFG service (Console & region info) DLP_SRVR, // Download Play: Server. Used for network play. DSP, // DSP service (Used for audio decoding and output) - HID, // HID service (Handles everything input-related including gyro) + HID, // HID service (Handles input-related things including gyro. Does NOT handle New3DS controls or CirclePadPro) + HTTP, // HTTP service (Handles HTTP requests) IR_USER, // One of 3 infrared communication services FRD, // Friend service (Miiverse friend service) FS, // Filesystem service @@ -69,6 +70,7 @@ namespace KernelHandles { case DSP: return "DSP"; case DLP_SRVR: return "DLP::SRVR"; case HID: return "HID"; + case HTTP: return "HTTP"; case IR_USER: return "IR:USER"; case FRD: return "FRD"; case FS: return "FS"; diff --git a/include/logger.hpp b/include/logger.hpp index 9dbc4512..a3112dde 100644 --- a/include/logger.hpp +++ b/include/logger.hpp @@ -43,6 +43,7 @@ namespace Log { static Logger frdLogger; static Logger fsLogger; static Logger hidLogger; + static Logger httpLogger; static Logger irUserLogger; static Logger gspGPULogger; static Logger gspLCDLogger; diff --git a/include/services/http.hpp b/include/services/http.hpp new file mode 100644 index 00000000..8dccc0c5 --- /dev/null +++ b/include/services/http.hpp @@ -0,0 +1,21 @@ +#pragma once +#include "helpers.hpp" +#include "kernel_types.hpp" +#include "logger.hpp" +#include "memory.hpp" + +class HTTPService { + Handle handle = KernelHandles::HTTP; + Memory& mem; + MAKE_LOG_FUNCTION(log, httpLogger) + + bool initialized = false; + + // Service commands + void initialize(u32 messagePointer); + + public: + HTTPService(Memory& mem) : mem(mem) {} + void reset(); + void handleSyncRequest(u32 messagePointer); +}; \ No newline at end of file diff --git a/include/services/service_manager.hpp b/include/services/service_manager.hpp index 51d6d554..9e1d9b2f 100644 --- a/include/services/service_manager.hpp +++ b/include/services/service_manager.hpp @@ -21,6 +21,7 @@ #include "services/gsp_gpu.hpp" #include "services/gsp_lcd.hpp" #include "services/hid.hpp" +#include "services/http.hpp" #include "services/ir_user.hpp" #include "services/ldr_ro.hpp" #include "services/mic.hpp" @@ -53,6 +54,7 @@ class ServiceManager { DlpSrvrService dlp_srvr; DSPService dsp; HIDService hid; + HTTPService http; IRUserService ir_user; FRDService frd; FSService fs; diff --git a/src/core/services/http.cpp b/src/core/services/http.cpp new file mode 100644 index 00000000..f61eca3b --- /dev/null +++ b/src/core/services/http.cpp @@ -0,0 +1,42 @@ +#include "services/http.hpp" + +#include "ipc.hpp" +#include "result/result.hpp" + +namespace HTTPCommands { + enum : u32 { + Initialize = 0x00010044, + }; +} + +void HTTPService::reset() { initialized = false; } + +void HTTPService::handleSyncRequest(u32 messagePointer) { + const u32 command = mem.read32(messagePointer); + switch (command) { + case HTTPCommands::Initialize: initialize(messagePointer); break; + default: Helpers::panic("HTTP service requested. Command: %08X\n", command); + } +} + +void HTTPService::initialize(u32 messagePointer) { + const u32 postBufferSize = mem.read32(messagePointer + 4); + const u32 postMemoryBlockHandle = mem.read32(messagePointer + 20); + log("HTTP::Initialize (POST buffer size = %X, POST buffer memory block handle = %X)\n", postBufferSize, postMemoryBlockHandle); + + mem.write32(messagePointer, IPC::responseHeader(0x01, 1, 0)); + + if (initialized) { + Helpers::warn("HTTP: Tried to initialize service while already initialized"); + // TODO: Error code here + } + + // 3DBrew: The provided POST buffer must be page-aligned (0x1000). + if (postBufferSize & 0xfff) { + Helpers::warn("HTTP: POST buffer size is not page-aligned"); + } + + initialized = true; + // We currently don't emulate HTTP properly. TODO: Prepare POST buffer here + mem.write32(messagePointer + 4, Result::Success); +} \ No newline at end of file diff --git a/src/core/services/service_manager.cpp b/src/core/services/service_manager.cpp index 17fdf1da..20beac6d 100644 --- a/src/core/services/service_manager.cpp +++ b/src/core/services/service_manager.cpp @@ -7,8 +7,8 @@ ServiceManager::ServiceManager(std::span regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel) : regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), act(mem), apt(mem, kernel), cam(mem), cecd(mem, kernel), cfg(mem), - dlp_srvr(mem), dsp(mem, kernel), hid(mem, kernel), ir_user(mem, kernel), frd(mem), fs(mem, kernel), gsp_gpu(mem, gpu, kernel, currentPID), - gsp_lcd(mem), ldr(mem), mic(mem), nfc(mem, kernel), nim(mem), ndm(mem), ptm(mem), y2r(mem, kernel) {} + dlp_srvr(mem), dsp(mem, kernel), hid(mem, kernel), http(mem), ir_user(mem, kernel), frd(mem), fs(mem, kernel), + gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem), mic(mem), nfc(mem, kernel), nim(mem), ndm(mem), ptm(mem), y2r(mem, kernel) {} static constexpr int MAX_NOTIFICATION_COUNT = 16; @@ -25,6 +25,7 @@ void ServiceManager::reset() { dlp_srvr.reset(); dsp.reset(); hid.reset(); + http.reset(); ir_user.reset(); frd.reset(); fs.reset(); @@ -98,6 +99,7 @@ static std::map serviceMap = { { "dlp:SRVR", KernelHandles::DLP_SRVR }, { "dsp::DSP", KernelHandles::DSP }, { "hid:USER", KernelHandles::HID }, + { "http:C", KernelHandles::HTTP }, { "ir:USER", KernelHandles::IR_USER }, { "frd:u", KernelHandles::FRD }, { "fs:USER", KernelHandles::FS }, @@ -182,6 +184,7 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) { case KernelHandles::CFG: cfg.handleSyncRequest(messagePointer); break; case KernelHandles::DLP_SRVR: dlp_srvr.handleSyncRequest(messagePointer); break; case KernelHandles::HID: hid.handleSyncRequest(messagePointer); break; + case KernelHandles::HTTP: http.handleSyncRequest(messagePointer); break; case KernelHandles::IR_USER: ir_user.handleSyncRequest(messagePointer); break; case KernelHandles::FRD: frd.handleSyncRequest(messagePointer); break; case KernelHandles::LCD: gsp_lcd.handleSyncRequest(messagePointer); break;