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

Common code in nfcStartScanning() and nfcStartOtherTagScanning() refactored into shared function.

Browse Source
This commit is contained in:
HiddenRambler 2017-07-02 12:43:37 +01:00
parent f0ef1c9d4f
commit 8f851b2375
1 changed files with 35 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ static NFC_OpType nfc_optype = NFC_OpType_NFCTag;
static Result NFC_Initialize(NFC_OpType type); static Result NFC_Initialize(NFC_OpType type);
static Result NFC_Shutdown(NFC_OpType type); static Result NFC_Shutdown(NFC_OpType type);
static Result NFC_StartCommsAdapter();
static Result NFC_StartCommunication(void); static Result NFC_StartCommunication(void);
static Result NFC_StopCommunication(void); static Result NFC_StopCommunication(void);
static Result NFC_CommunicationGetStatus(u8 *out); static Result NFC_CommunicationGetStatus(u8 *out);
@ -64,7 +65,7 @@ Handle nfcGetSessionHandle(void)
return nfcHandle; return nfcHandle;
} }
Result nfcStartScanning(u16 inval) static Result NFC_StartCommsAdapter()
{ {
Result ret, ret2; Result ret, ret2;
bool new3ds_flag = false; bool new3ds_flag = false;
@ -72,8 +73,8 @@ Result nfcStartScanning(u16 inval)
APT_CheckNew3DS(&new3ds_flag); APT_CheckNew3DS(&new3ds_flag);
if(!new3ds_flag) if(new3ds_flag) return 0;
{
ret = NFC_StartCommunication(); ret = NFC_StartCommunication();
if(R_FAILED(ret))return ret; if(R_FAILED(ret))return ret;
@ -101,51 +102,21 @@ Result nfcStartScanning(u16 inval)
return ret2; 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); return NFC_StartTagScanning(inval);
} }
Result nfcStartOtherTagScanning(u16 unk0, u32 unk1) Result nfcStartOtherTagScanning(u16 unk0, u32 unk1)
{ {
Result ret, ret2; Result ret = NFC_StartCommsAdapter();
bool new3ds_flag = false; if(R_FAILED(ret)) return ret;
u8 status;
APT_CheckNew3DS(&new3ds_flag);
if(!new3ds_flag)
{
ret = NFC_StartCommunication();
if(R_FAILED(ret))return ret;
while(1)
{
status = 0;
ret = NFC_CommunicationGetStatus(&status);
if(R_FAILED(ret))break;
if(status==1)//"Attempting to initialize Old3DS NFC adapter communication."
{
svcSleepThread(1000000*100);
continue;
}
else if(status==2)//"Old3DS NFC adapter communication initialization successfully finished."
{
break;
}
//An error occured with Old3DS NFC-adapter communication initialization.
ret = NFC_CommunicationGetResult(&ret2);
if(R_FAILED(ret))break;
return ret2;
}
if(R_FAILED(ret))return ret;
}
return NFC_StartOtherTagScanning(unk0, unk1); return NFC_StartOtherTagScanning(unk0, unk1);
} }