Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-20 20:49:12 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start adding SD card support

Browse source
This commit is contained in:
wheremyfoodat 2023-08-20 13:22:48 +03:00
parent 3292b051be
commit 7ada8da8a8
6 changed files with 62 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/services/fs.cpp
View file

@ -2,6 +2,7 @@
#include "kernel/kernel.hpp"
#include "io_file.hpp"
#include "ipc.hpp"
#include "result/result.hpp"
#ifdef CreateFile // windows.h defines CreateFile & DeleteFile because of course it does.
#undef CreateDirectory
@ -338,7 +339,8 @@ void FSService::openFileDirectly(u32 messagePointer) {
std::optional<Handle> handle = openFileHandle(archive, filePath, archivePath, perms);
mem.write32(messagePointer, IPC::responseHeader(0x803, 1, 2));
if (!handle.has_value()) {
Helpers::panic("OpenFileDirectly: Failed to open file with given path");
printf("OpenFileDirectly failed\n");
mem.write32(messagePointer + 4, Result::FS::FileNotFound);
} else {
mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 12, handle.value());
@ -582,22 +584,21 @@ void FSService::setPriority(u32 messagePointer) {
priority = value;
}
// Shows whether an SD card is inserted. At the moment stubbed to no
constexpr bool sdInserted = false;
void FSService::isSdmcDetected(u32 messagePointer) {
log("FS::IsSdmcDetected\n");
mem.write32(messagePointer, IPC::responseHeader(0x817, 2, 0));
mem.write32(messagePointer + 4, Result::Success);
mem.write8(messagePointer + 8, sdInserted ? 1 : 0);
mem.write8(messagePointer + 8, config.sdCardInserted ? 1 : 0);
}
// We consider our SD card to always be writable if oen is inserted for now
// So isSdmcWritable returns 1 if an SD card is inserted (because it's always writable) and 0 if not.
// We consider our SD card to always be writable if one is inserted for now
// However we do make sure to respect the configs and properly return the correct value here
void FSService::isSdmcWritable(u32 messagePointer) {
log("FS::isSdmcWritable\n");
const bool writeProtected = (!config.sdCardInserted) || (config.sdCardInserted && config.sdWriteProtected);
mem.write32(messagePointer, IPC::responseHeader(0x818, 2, 0));
mem.write32(messagePointer + 4, Result::Success);
mem.write8(messagePointer + 8, sdInserted ? 1 : 0);
mem.write8(messagePointer + 8, writeProtected ? 0 : 1);
}

2
src/core/services/service_manager.cpp
View file

@ -7,7 +7,7 @@
ServiceManager::ServiceManager(std::span<u32, 16> regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel, const EmulatorConfig& config)
: 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),
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) {}