mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-05 19:51:45 +00:00
Code Issues Releases Activity

dmnt: only initialize HID once

Browse source
This commit is contained in:
Michael Scire 2019-03-05 07:50:50 -08:00
parent b4b1208222
commit fbddf090a4
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stratosphere/dmnt/source/dmnt_hid.cpp
View file

@ -16,17 +16,17 @@
#include <switch.h> #include <switch.h>
#include <string.h> #include <string.h>
#include <stratosphere.hpp>
#include "dmnt_hid.hpp" #include "dmnt_hid.hpp"
static HosMutex g_hid_keys_down_lock;
Result HidManagement::GetKeysDown(u64 *keys) { Result HidManagement::GetKeysDown(u64 *keys) {
if (R_FAILED(hidInitialize())) { std::scoped_lock<HosMutex> lk(g_hid_keys_down_lock);
return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
}
hidScanInput(); hidScanInput();
*keys = hidKeysDown(CONTROLLER_P1_AUTO); *keys = hidKeysDown(CONTROLLER_P1_AUTO);
hidExit();
return 0x0; return 0x0;
} }

6
stratosphere/dmnt/source/dmnt_main.cpp
View file

@ -99,6 +99,11 @@ void __appInit(void) {
fatalSimple(rc); fatalSimple(rc);
} }
rc = hidInitialize();
if (R_FAILED(rc)) {
fatalSimple(rc);
}
rc = fsInitialize(); rc = fsInitialize();
if (R_FAILED(rc)) { if (R_FAILED(rc)) {
fatalSimple(rc); fatalSimple(rc);
@ -116,6 +121,7 @@ void __appExit(void) {
/* Cleanup services. */ /* Cleanup services. */
fsdevUnmountAll(); fsdevUnmountAll();
fsExit(); fsExit();
hidExit();
setExit(); setExit();
lrExit(); lrExit();
nsdevExit(); nsdevExit();