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

Add amiibo loading interface

Browse source
This commit is contained in:
wheremyfoodat 2023-09-08 19:01:44 +03:00
parent f52337f90c
commit 3110da1fd6
5 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/emulator.hpp
View file

@ -98,6 +98,7 @@ class Emulator {
void pause(); // Pause the emulator
void togglePause();
bool loadAmiibo(const std::filesystem::path& path);
bool loadROM(const std::filesystem::path& path);
bool loadNCSD(const std::filesystem::path& path, ROMType type);
bool load3DSX(const std::filesystem::path& path);

6
include/services/nfc.hpp
View file

@ -1,4 +1,6 @@
#pragma once
#include <filesystem>
#include "helpers.hpp"
#include "kernel_types.hpp"
#include "logger.hpp"
@ -49,8 +51,10 @@ class NFCService {
void startTagScanning(u32 messagePointer);
void stopCommunication(u32 messagePointer);
public:
public:
NFCService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
void reset();
void handleSyncRequest(u32 messagePointer);
bool loadAmiibo(const std::filesystem::path& path);
};

1
include/services/service_manager.hpp
View file

@ -104,4 +104,5 @@ class ServiceManager {
// Input function wrappers
HIDService& getHID() { return hid; }
NFCService& getNFC() { return nfc; }
};

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

@ -43,6 +43,8 @@ void NFCService::handleSyncRequest(u32 messagePointer) {
}
}
bool NFCService::loadAmiibo(const std::filesystem::path& path) { return true; }
void NFCService::initialize(u32 messagePointer) {
const u8 type = mem.read8(messagePointer + 4);
log("NFC::Initialize (type = %d)\n", type);

14
src/emulator.cpp
View file

@ -353,7 +353,14 @@ void Emulator::run() {
char* droppedDir = event.drop.file;
if (droppedDir) {
loadROM(droppedDir);
const std::filesystem::path path(droppedDir);
if (path.extension() == ".amiibo") {
loadAmiibo(path);
} else {
loadROM(path);
}
SDL_free(droppedDir);
}
break;
@ -478,6 +485,11 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
return success;
}
bool Emulator::loadAmiibo(const std::filesystem::path& path) {
NFCService& nfc = kernel.getServiceManager().getNFC();
return nfc.loadAmiibo(path);
}
// Used for loading both CXI and NCSD files since they are both so similar and use the same interface
// (We promote CXI files to NCSD internally for ease)
bool Emulator::loadNCSD(const std::filesystem::path& path, ROMType type) {