DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add nfcStartOtherTagScanning Old3DS compatibility.

Browse Source
This commit is contained in:
HiddenRambler 2017-07-13 17:33:22 +01:00 committed by Dave Murphy
parent bc87466400
commit 31ca6f5c53
1 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libctru/source/services/nfc.c
View File

@ -15,12 +15,14 @@ static NFC_OpType nfc_optype = NFC_OpType_NFCTag;
static Result NFC_Initialize(NFC_OpType type);
static Result NFC_Shutdown(NFC_OpType type);
static Result NFC_StartCommsAdapter(void);
static Result NFC_StartCommunication(void);
static Result NFC_StopCommunication(void);
static Result NFC_CommunicationGetStatus(u8 *out);
static Result NFC_CommunicationGetResult(Result *out);
static Result NFC_StartTagScanning(u16 unknown);
static Result NFC_StartOtherTagScanning(u16 unk0, u32 unk1);
static Result NFC_StopTagScanning(void);
static Result NFC_InitializeWriteAppData(u32 amiibo_appid, NFC_AppDataInitStruct *initstruct, const void *buf, size_t size);
@ -63,7 +65,7 @@ Handle nfcGetSessionHandle(void)
return nfcHandle;
}
Result nfcStartScanning(u16 inval)
static Result NFC_StartCommsAdapter(void)
{
Result ret, ret2;
bool new3ds_flag = false;
@ -71,8 +73,8 @@ Result nfcStartScanning(u16 inval)
APT_CheckNew3DS(&new3ds_flag);
if(!new3ds_flag)
{
if(new3ds_flag) return 0;
ret = NFC_StartCommunication();
if(R_FAILED(ret))return ret;
@ -100,12 +102,25 @@ Result nfcStartScanning(u16 inval)
return ret2;
}
if(R_FAILED(ret))return ret;
}
return ret;
}
Result nfcStartScanning(u16 inval)
{
Result ret = NFC_StartCommsAdapter();
if(R_FAILED(ret)) return ret;
return NFC_StartTagScanning(inval);
}
Result nfcStartOtherTagScanning(u16 unk0, u32 unk1)
{
Result ret = NFC_StartCommsAdapter();
if(R_FAILED(ret)) return ret;
return NFC_StartOtherTagScanning(unk0, unk1);
}
void nfcStopScanning(void)
{
bool new3ds_flag = false;
@ -442,7 +457,7 @@ static Result NFC_GetAppDataInitStruct(NFC_AppDataInitStruct *out)
return ret;
}
Result nfcStartOtherTagScanning(u16 unk0, u32 unk1)
static Result NFC_StartOtherTagScanning(u16 unk0, u32 unk1)
{
Result ret=0;
u32* cmdbuf=getThreadCommandBuffer();