mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-05 10:52:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

nfc: missing arg in nfpuGetApplicationArea is actually the npad_id

Browse Source
This commit is contained in:
averne 2019-01-29 07:33:29 +01:00 committed by fincs
parent ff144c492a
commit d4b436bfa2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/services/nfc.h
View File

@ -161,7 +161,7 @@ Result nfpuGetRegisterInfo(HidControllerID id, NfpuRegisterInfo *out);
Result nfpuGetCommonInfo(HidControllerID id, NfpuCommonInfo *out); Result nfpuGetCommonInfo(HidControllerID id, NfpuCommonInfo *out);
Result nfpuGetModelInfo(HidControllerID id, NfpuModelInfo *out); Result nfpuGetModelInfo(HidControllerID id, NfpuModelInfo *out);
Result nfpuOpenApplicationArea(HidControllerID id, NfpuAppId app_id, u32* area_size); Result nfpuOpenApplicationArea(HidControllerID id, NfpuAppId app_id, u32* npad_id);
Result nfpuGetApplicationArea(HidControllerID id, void* buf, size_t buf_size); Result nfpuGetApplicationArea(HidControllerID id, void* buf, size_t buf_size);
/// Calls nfc:user. /// Calls nfc:user.

10
nx/source/services/nfc.c
View File

@ -609,9 +609,9 @@ inline Result nfpuGetModelInfo(HidControllerID id, NfpuModelInfo *out) {
return _nfpuInterfaceCmdInIdOutBuffer(&g_nfpuInterface, 16, id, out, sizeof(NfpuModelInfo)); return _nfpuInterfaceCmdInIdOutBuffer(&g_nfpuInterface, 16, id, out, sizeof(NfpuModelInfo));
} }
Result nfpuOpenApplicationArea(HidControllerID id, NfpuAppId app_id, u32* area_size) { Result nfpuOpenApplicationArea(HidControllerID id, NfpuAppId app_id, u32* npad_id) {
if (id == CONTROLLER_P1_AUTO) if (id == CONTROLLER_P1_AUTO)
return nfpuOpenApplicationArea(g_controllerP1AutoID, app_id, area_size); return nfpuOpenApplicationArea(g_controllerP1AutoID, app_id, npad_id);
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -637,7 +637,7 @@ Result nfpuOpenApplicationArea(HidControllerID id, NfpuAppId app_id, u32* area_s
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
u32 area_size; u32 npad_id;
} *resp; } *resp;
serviceIpcParse(&g_nfpuInterface, &r, sizeof(*resp)); serviceIpcParse(&g_nfpuInterface, &r, sizeof(*resp));
@ -645,8 +645,8 @@ Result nfpuOpenApplicationArea(HidControllerID id, NfpuAppId app_id, u32* area_s
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc) && area_size) if (R_SUCCEEDED(rc) && npad_id)
*area_size = resp->area_size; *npad_id = resp->npad_id;
} }
return rc; return rc;