Skip to content

Commit b9606de

Browse files
committed
Support latest libnx
1 parent 501cdeb commit b9606de

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

source/dumper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void copy(const char* from, const char* to, bool exfat = false)
100100
mkdirs(folder, 0744);
101101
}
102102
if(!exfat) {
103-
rc = fsdevCreateFile(to, 0, FS_CREATE_BIG_FILE);
103+
rc = fsdevCreateFile(to, 0, FsCreateOption_BigFile);
104104
if (R_FAILED(rc)) {
105105
printf("\nfsdevCreateFile() failed: 0x%x", rc);
106106
fclose(source);

source/ftp_main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ftp_main()
9595
sdmcWriteSafe(false);
9696
/* initialize needed Switch services */
9797
#elif defined(__SWITCH__)
98-
nifmInitialize();
98+
nifmInitialize(NifmServiceType_User);
9999
#endif
100100

101101
/* initialize console subsystem */

source/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void mainMenuLoop(int kDown) {
2929
}
3030

3131
else if (kDown & KEY_Y) {
32-
nifmInitialize();
32+
nifmInitialize(NifmServiceType_User);
3333
NifmInternetConnectionStatus connectionStatus;
3434
if(R_SUCCEEDED(nifmGetInternetConnectionStatus(nullptr, nullptr, &connectionStatus))) {
3535
if(connectionStatus == NifmInternetConnectionStatus_Connected)
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
4747
mkdirs(mods_root, 0777);
4848
mkdir(backups_root, 0777);
4949
if(std::filesystem::is_directory(std::filesystem::status(arc_path)) && !std::filesystem::is_empty(arc_path))
50-
fsdevSetArchiveBit(arc_path.c_str());
50+
fsdevSetConcatenationFileAttribute(arc_path.c_str());
5151
if(!std::filesystem::exists(outPath) || std::filesystem::is_empty(arc_path))
5252
{
5353
menu = ARC_DUMPER_MENU;

source/utils.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22
#include <filesystem>
33
#include <map>
4+
#include <vector>
45
#include <stdarg.h>
56
#include "menu.h"
67
#include "switch.h"
@@ -103,9 +104,9 @@ int getRegion() {
103104
void getVersion(u64 tid, char version[0x10]) {
104105
nsInitialize();
105106
NsApplicationControlData contolData;
106-
nsGetApplicationControlData(1, tid, &contolData, sizeof(NsApplicationControlData), NULL);
107+
nsGetApplicationControlData(NsApplicationControlSource_Storage, tid, &contolData, sizeof(NsApplicationControlData), NULL);
107108
nsExit();
108-
strcpy(version, contolData.nacp.version);
109+
strcpy(version, contolData.nacp.display_version);
109110
}
110111

111112
int getSmashVersion() {
@@ -172,14 +173,15 @@ void log(const char* format, ...) {
172173
va_end(args);
173174
}
174175

175-
bool isServiceRunning(const char *serviceName) {
176+
bool isServiceRunning(const char* serviceName) {
176177
Handle handle;
177-
bool running = R_FAILED(smRegisterService(&handle, serviceName, false, 1));
178+
SmServiceName encodedName = smEncodeName(serviceName);
179+
bool running = R_FAILED(smRegisterService(&handle, encodedName, false, 1));
178180

179181
svcCloseHandle(handle);
180182

181183
if (!running)
182-
smUnregisterService(serviceName);
184+
smUnregisterService(encodedName);
183185

184186
return running;
185187
}
@@ -223,8 +225,8 @@ u64 runningTID()
223225
u64 tid = 0;
224226
pmdmntInitialize();
225227
pminfoInitialize();
226-
pmdmntGetApplicationPid(&pid);
227-
pminfoGetTitleId(&tid, pid);
228+
pmdmntGetApplicationProcessId(&pid);
229+
pminfoGetProgramId(&tid, pid);
228230
pminfoExit();
229231
pmdmntExit();
230232
return tid;

0 commit comments

Comments
 (0)