diff --git a/src/NDS.cpp b/src/NDS.cpp index 9c6a7f03..4118836a 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -2012,7 +2012,7 @@ void debug(u32 param) fclose(shit); /*FILE* - shit = fopen("debug/camera9.bin", "wb"); + shit = fopen("debug/directboot9.bin", "wb"); for (u32 i = 0x02000000; i < 0x04000000; i+=4) { u32 val = DSi::ARM9Read32(i); diff --git a/src/frontend/qt_sdl/Platform.cpp b/src/frontend/qt_sdl/Platform.cpp index 5a746147..6534bcef 100644 --- a/src/frontend/qt_sdl/Platform.cpp +++ b/src/frontend/qt_sdl/Platform.cpp @@ -41,10 +41,10 @@ std::string EmuDirectory; -void emuStop(); - extern CameraManager* camManager[2]; +void emuStop(); + namespace Platform { @@ -103,7 +103,6 @@ void IPCDeInit() IPCBuffer->detach(); delete IPCBuffer; } - IPCBuffer = nullptr; } @@ -496,6 +495,16 @@ u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask) return LocalMP::RecvReplies(data, timestamp, aidmask); } +int MP_RecvHostPacket(u8* data, u64* timestamp) +{ + return LocalMP::RecvHostPacket(data, timestamp); +} + +u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask) +{ + return LocalMP::RecvReplies(data, timestamp, aidmask); +} + bool LAN_Init() { if (Config::DirectLAN) diff --git a/src/frontend/qt_sdl/main.h b/src/frontend/qt_sdl/main.h index b62619bb..1977b7f7 100644 --- a/src/frontend/qt_sdl/main.h +++ b/src/frontend/qt_sdl/main.h @@ -271,13 +271,13 @@ private slots: void onOpenAudioSettings(); void onUpdateAudioSettings(); void onAudioSettingsFinished(int res); - void onOpenFirmwareSettings(); - void onOpenPathSettings(); void onOpenMPSettings(); void onMPSettingsFinished(int res); void onOpenWifiSettings(); void onWifiSettingsFinished(int res); + void onOpenFirmwareSettings(); void onFirmwareSettingsFinished(int res); + void onOpenPathSettings(); void onPathSettingsFinished(int res); void onOpenInterfaceSettings(); void onInterfaceSettingsFinished(int res);