From d3c2cd223aee7e2a82d2e856704b2cb10a27fa3e Mon Sep 17 00:00:00 2001 From: averne Date: Sun, 3 Feb 2019 20:50:30 +0100 Subject: [PATCH] nfc: misc changes --- nx/include/switch/services/nfc.h | 8 ++++---- nx/source/services/nfc.c | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nx/include/switch/services/nfc.h b/nx/include/switch/services/nfc.h index d132b578..936adefe 100644 --- a/nx/include/switch/services/nfc.h +++ b/nx/include/switch/services/nfc.h @@ -88,7 +88,7 @@ typedef struct { } PACKED NfpuMiiCharInfo; typedef struct { - NfpuMiiCharInfo mii_char_info; + NfpuMiiCharInfo mii; u16 first_write_year; u8 first_write_month; u8 first_write_day; @@ -158,9 +158,9 @@ Result nfpuGetCommonInfo(HidControllerID id, NfpuCommonInfo *out); Result nfpuGetModelInfo(HidControllerID id, NfpuModelInfo *out); Result nfpuOpenApplicationArea(HidControllerID id, u32 app_id, u32 *npad_id); -Result nfpuGetApplicationArea(HidControllerID id, void *buf, size_t buf_size); -Result nfpuSetApplicationArea(HidControllerID id, const void *buf, size_t buf_size); -Result nfpuCreateApplicationArea(HidControllerID id, u32 app_id, const void *buf, size_t buf_size); +Result nfpuGetApplicationArea(HidControllerID id, void* buf, size_t buf_size); +Result nfpuSetApplicationArea(HidControllerID id, const void* buf, size_t buf_size); +Result nfpuCreateApplicationArea(HidControllerID id, u32 app_id, const void* buf, size_t buf_size); Result nfpuFlush(HidControllerID id); Result nfpuRestore(HidControllerID id); diff --git a/nx/source/services/nfc.c b/nx/source/services/nfc.c index 47e1fd60..e750ce0c 100644 --- a/nx/source/services/nfc.c +++ b/nx/source/services/nfc.c @@ -487,8 +487,10 @@ Result nfpuListDevices(u32 *count, HidControllerID *out, size_t num_elements) { rc = resp->result; - if (R_SUCCEEDED(rc) && count && out) { + if (R_SUCCEEDED(rc) && count) *count = resp->count; + + if (R_SUCCEEDED(rc) && out) { for (size_t i=0; i