mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

avm: fix more merge errors

Browse Source
This commit is contained in:
Luis Scheurenbrand 2021-01-06 18:22:34 +01:00 committed by fincs
parent 43202cc829
commit a1a69ebe09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nx/source/services/avm.c
View File

@ -32,7 +32,7 @@ static Result _avmGetVersion(u64 id_1, u64 id_2, u32 *version, u32 cmd_id) {
u64 a, b; u64 a, b;
} in = { id_1, id_2 }; } in = { id_1, id_2 };
return serviceDispatchInOut(&g_AvmSrv, 100, in, *version); return serviceDispatchInOut(&g_AvmSrv, cmd_id, in, *version);
} }
Result avmGetHighestAvailableVersion(u64 id_1, u64 id_2, u32 *version) { Result avmGetHighestAvailableVersion(u64 id_1, u64 id_2, u32 *version) {
@ -72,7 +72,7 @@ Result avmUpgradeLaunchRequiredVersion(u64 application_id, u32 version) {
} }
Result avmPushLaunchVersion(u64 application_id, u32 version) { Result avmPushLaunchVersion(u64 application_id, u32 version) {
return _avmPushVersion(application_id, version, 100); return _avmPushVersion(application_id, version, 1000);
} }
Result avmListVersionList(AvmVersionListEntry *buffer, size_t count, u32 *out) { Result avmListVersionList(AvmVersionListEntry *buffer, size_t count, u32 *out) {