The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-12-24 16:51:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate nfpLog_printf to new logging (#769)

Browse Source
This commit is contained in:
why-keith 2023-04-15 14:19:00 +01:00 committed by GitHub
parent a6e9481b64
commit 9c6e3fb144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Cafe/OS/libs/nn_nfp/nn_nfp.cpp
View File

@ -216,7 +216,7 @@ void nnNfpExport_SetDeactivateEvent(PPCInterpreter_t* hCPU)
ppcDefineParamStructPtr(osEvent, coreinit::OSEvent, 0); ppcDefineParamStructPtr(osEvent, coreinit::OSEvent, 0);
ppcDefineParamMPTR(osEventMPTR, 0); ppcDefineParamMPTR(osEventMPTR, 0);
nfpLog_printf("SetDeactivateEvent(0x%08x)", osEventMPTR); cemuLog_log(LogType::nn_nfp, "SetDeactivateEvent(0x{:08x})", osEventMPTR);
coreinit::OSInitEvent(osEvent, coreinit::OSEvent::EVENT_STATE::STATE_NOT_SIGNALED, coreinit::OSEvent::EVENT_MODE::MODE_AUTO); coreinit::OSInitEvent(osEvent, coreinit::OSEvent::EVENT_STATE::STATE_NOT_SIGNALED, coreinit::OSEvent::EVENT_MODE::MODE_AUTO);
@ -241,7 +241,7 @@ void nnNfpExport_Initialize(PPCInterpreter_t* hCPU)
void nnNfpExport_StartDetection(PPCInterpreter_t* hCPU) void nnNfpExport_StartDetection(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("StartDetection()"); cemuLog_log(LogType::nn_nfp, "StartDetection()");
nnNfpLock(); nnNfpLock();
nfp_data.isDetecting = true; nfp_data.isDetecting = true;
nnNfpUnlock(); nnNfpUnlock();
@ -250,7 +250,7 @@ void nnNfpExport_StartDetection(PPCInterpreter_t* hCPU)
void nnNfpExport_StopDetection(PPCInterpreter_t* hCPU) void nnNfpExport_StopDetection(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("StopDetection()"); cemuLog_log(LogType::nn_nfp, "StopDetection()");
nnNfpLock(); nnNfpLock();
nfp_data.isDetecting = false; nfp_data.isDetecting = false;
nnNfpUnlock(); nnNfpUnlock();
@ -274,7 +274,7 @@ static_assert(sizeof(nfpTagInfo_t) == 0x54, "nfpTagInfo_t has invalid size");
void nnNfpExport_GetTagInfo(PPCInterpreter_t* hCPU) void nnNfpExport_GetTagInfo(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("GetTagInfo(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "GetTagInfo(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(tagInfo, nfpTagInfo_t, 0); ppcDefineParamStructPtr(tagInfo, nfpTagInfo_t, 0);
nnNfpLock(); nnNfpLock();
@ -306,7 +306,7 @@ typedef struct
uint32 NFCGetTagInfo(uint32 index, uint32 timeout, MPTR functionPtr, void* userParam) uint32 NFCGetTagInfo(uint32 index, uint32 timeout, MPTR functionPtr, void* userParam)
{ {
nfpLog_printf("NFCGetTagInfo(%d,%d,0x%08x,0x%08x)", index, timeout, functionPtr, userParam?memory_getVirtualOffsetFromPointer(userParam):0); cemuLog_log(LogType::nn_nfp, "NFCGetTagInfo({},{},0x{:08x},0x{:08x})", index, timeout, functionPtr, userParam?memory_getVirtualOffsetFromPointer(userParam):0);
cemu_assert(index == 0); cemu_assert(index == 0);
@ -331,7 +331,7 @@ uint32 NFCGetTagInfo(uint32 index, uint32 timeout, MPTR functionPtr, void* userP
void nnNfpExport_Mount(PPCInterpreter_t* hCPU) void nnNfpExport_Mount(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("Mount()"); cemuLog_log(LogType::nn_nfp, "Mount()");
nnNfpLock(); nnNfpLock();
if (nfp_data.hasActiveAmiibo == false) if (nfp_data.hasActiveAmiibo == false)
{ {
@ -348,14 +348,14 @@ void nnNfpExport_Mount(PPCInterpreter_t* hCPU)
void nnNfpExport_Unmount(PPCInterpreter_t* hCPU) void nnNfpExport_Unmount(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("Unmount()"); cemuLog_log(LogType::nn_nfp, "Unmount()");
nfp_data.hasOpenApplicationArea = false; nfp_data.hasOpenApplicationArea = false;
osLib_returnFromFunction(hCPU, BUILD_NN_RESULT(NN_RESULT_LEVEL_SUCCESS, NN_RESULT_MODULE_NN_NFP, 0)); osLib_returnFromFunction(hCPU, BUILD_NN_RESULT(NN_RESULT_LEVEL_SUCCESS, NN_RESULT_MODULE_NN_NFP, 0));
} }
void nnNfpExport_MountRom(PPCInterpreter_t* hCPU) void nnNfpExport_MountRom(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("MountRom()"); cemuLog_log(LogType::nn_nfp, "MountRom()");
nnNfpLock(); nnNfpLock();
if (nfp_data.hasActiveAmiibo == false) if (nfp_data.hasActiveAmiibo == false)
{ {
@ -386,7 +386,7 @@ static_assert(sizeof(nfpRomInfo_t) == 0x36, "nfpRomInfo_t has invalid size");
void nnNfpExport_GetNfpRomInfo(PPCInterpreter_t* hCPU) void nnNfpExport_GetNfpRomInfo(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("GetNfpRomInfo(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "GetNfpRomInfo(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(romInfo, nfpRomInfo_t, 0); ppcDefineParamStructPtr(romInfo, nfpRomInfo_t, 0);
nnNfpLock(); nnNfpLock();
@ -438,7 +438,7 @@ static_assert(offsetof(nfpCommonData_t, applicationAreaSize) == 0xE, "nfpCommonD
void nnNfpExport_GetNfpCommonInfo(PPCInterpreter_t* hCPU) void nnNfpExport_GetNfpCommonInfo(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("GetNfpCommonInfo(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "GetNfpCommonInfo(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(commonInfo, nfpCommonData_t, 0); ppcDefineParamStructPtr(commonInfo, nfpCommonData_t, 0);
nnNfpLock(); nnNfpLock();
@ -492,7 +492,7 @@ typedef struct
void nnNfpExport_GetNfpRegisterInfo(PPCInterpreter_t* hCPU) void nnNfpExport_GetNfpRegisterInfo(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("GetNfpRegisterInfo(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "GetNfpRegisterInfo(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(registerInfo, nfpRegisterInfo_t, 0); ppcDefineParamStructPtr(registerInfo, nfpRegisterInfo_t, 0);
if(!registerInfo) if(!registerInfo)
@ -515,7 +515,7 @@ void nnNfpExport_GetNfpRegisterInfo(PPCInterpreter_t* hCPU)
void nnNfpExport_InitializeRegisterInfoSet(PPCInterpreter_t* hCPU) void nnNfpExport_InitializeRegisterInfoSet(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("InitializeRegisterInfoSet(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "InitializeRegisterInfoSet(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(registerInfoSet, nfpRegisterInfoSet_t, 0); ppcDefineParamStructPtr(registerInfoSet, nfpRegisterInfoSet_t, 0);
memset(registerInfoSet, 0, sizeof(nfpRegisterInfoSet_t)); memset(registerInfoSet, 0, sizeof(nfpRegisterInfoSet_t));
@ -525,7 +525,7 @@ void nnNfpExport_InitializeRegisterInfoSet(PPCInterpreter_t* hCPU)
void nnNfpExport_SetNfpRegisterInfo(PPCInterpreter_t* hCPU) void nnNfpExport_SetNfpRegisterInfo(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("SetNfpRegisterInfo(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "SetNfpRegisterInfo(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(registerInfoSet, nfpRegisterInfoSet_t, 0); ppcDefineParamStructPtr(registerInfoSet, nfpRegisterInfoSet_t, 0);
memcpy(nfp_data.amiiboInternal.amiiboSettings.mii, registerInfoSet->ownerMii, sizeof(nfp_data.amiiboInternal.amiiboSettings.mii)); memcpy(nfp_data.amiiboInternal.amiiboSettings.mii, registerInfoSet->ownerMii, sizeof(nfp_data.amiiboInternal.amiiboSettings.mii));
@ -538,7 +538,7 @@ void nnNfpExport_SetNfpRegisterInfo(PPCInterpreter_t* hCPU)
void nnNfpExport_IsExistApplicationArea(PPCInterpreter_t* hCPU) void nnNfpExport_IsExistApplicationArea(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("IsExistApplicationArea()"); cemuLog_log(LogType::nn_nfp, "IsExistApplicationArea()");
if (!nfp_data.hasActiveAmiibo || !nfp_data.isMounted) if (!nfp_data.hasActiveAmiibo || !nfp_data.isMounted)
{ {
osLib_returnFromFunction(hCPU, 0); osLib_returnFromFunction(hCPU, 0);
@ -550,7 +550,7 @@ void nnNfpExport_IsExistApplicationArea(PPCInterpreter_t* hCPU)
void nnNfpExport_OpenApplicationArea(PPCInterpreter_t* hCPU) void nnNfpExport_OpenApplicationArea(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("OpenApplicationArea(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "OpenApplicationArea(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamU32(appAreaId, 0); ppcDefineParamU32(appAreaId, 0);
// note - this API doesn't fail if the application area has already been opened? // note - this API doesn't fail if the application area has already been opened?
@ -575,7 +575,7 @@ void nnNfpExport_OpenApplicationArea(PPCInterpreter_t* hCPU)
void nnNfpExport_ReadApplicationArea(PPCInterpreter_t* hCPU) void nnNfpExport_ReadApplicationArea(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("ReadApplicationArea(0x%08x, 0x%x)", hCPU->gpr[3], hCPU->gpr[4]); cemuLog_log(LogType::nn_nfp, "ReadApplicationArea(0x{:08x}, 0x{:x})", hCPU->gpr[3], hCPU->gpr[4]);
ppcDefineParamPtr(bufferPtr, uint8*, 0); ppcDefineParamPtr(bufferPtr, uint8*, 0);
ppcDefineParamU32(len, 1); ppcDefineParamU32(len, 1);
@ -592,7 +592,7 @@ void nnNfpExport_ReadApplicationArea(PPCInterpreter_t* hCPU)
void nnNfpExport_WriteApplicationArea(PPCInterpreter_t* hCPU) void nnNfpExport_WriteApplicationArea(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("WriteApplicationArea(0x%08x, 0x%x, 0x%08x)", hCPU->gpr[3], hCPU->gpr[4], hCPU->gpr[5]); cemuLog_log(LogType::nn_nfp, "WriteApplicationArea(0x{:08x}, 0x{:x}, 0x{:08x})", hCPU->gpr[3], hCPU->gpr[4], hCPU->gpr[5]);
ppcDefineParamPtr(bufferPtr, uint8*, 0); ppcDefineParamPtr(bufferPtr, uint8*, 0);
ppcDefineParamU32(len, 1); ppcDefineParamU32(len, 1);
@ -628,7 +628,7 @@ typedef struct
void nnNfpExport_CreateApplicationArea(PPCInterpreter_t* hCPU) void nnNfpExport_CreateApplicationArea(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("CreateApplicationArea(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "CreateApplicationArea(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamPtr(createInfo, NfpCreateInfo_t, 0); ppcDefineParamPtr(createInfo, NfpCreateInfo_t, 0);
if (nfp_data.hasOpenApplicationArea || (nfp_data.amiiboInternal.amiiboSettings.flags&0x20)) if (nfp_data.hasOpenApplicationArea || (nfp_data.amiiboInternal.amiiboSettings.flags&0x20))
@ -677,7 +677,7 @@ void nnNfpExport_CreateApplicationArea(PPCInterpreter_t* hCPU)
void nnNfpExport_DeleteApplicationArea(PPCInterpreter_t* hCPU) void nnNfpExport_DeleteApplicationArea(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("DeleteApplicationArea()"); cemuLog_log(LogType::nn_nfp, "DeleteApplicationArea()");
if (nfp_data.isReadOnly) if (nfp_data.isReadOnly)
{ {
@ -707,7 +707,7 @@ void nnNfpExport_DeleteApplicationArea(PPCInterpreter_t* hCPU)
void nnNfpExport_Flush(PPCInterpreter_t* hCPU) void nnNfpExport_Flush(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("Flush()"); cemuLog_log(LogType::nn_nfp, "Flush()");
// write Amiibo data // write Amiibo data
if (nfp_data.isReadOnly) if (nfp_data.isReadOnly)
@ -748,7 +748,7 @@ static_assert(offsetof(AmiiboSettingsArgs_t, commonInfo) == 0x114);
void nnNfpExport_GetAmiiboSettingsArgs(PPCInterpreter_t* hCPU) void nnNfpExport_GetAmiiboSettingsArgs(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("GetAmiiboSettingsArgs(0x%08x)", hCPU->gpr[3]); cemuLog_log(LogType::nn_nfp, "GetAmiiboSettingsArgs(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStructPtr(settingsArg, AmiiboSettingsArgs_t, 0); ppcDefineParamStructPtr(settingsArg, AmiiboSettingsArgs_t, 0);
memset(settingsArg, 0, sizeof(AmiiboSettingsArgs_t)); memset(settingsArg, 0, sizeof(AmiiboSettingsArgs_t));
@ -917,7 +917,7 @@ void nnNfp_update()
void nnNfpExport_GetNfpState(PPCInterpreter_t* hCPU) void nnNfpExport_GetNfpState(PPCInterpreter_t* hCPU)
{ {
nfpLog_printf("GetNfpState()"); cemuLog_log(LogType::nn_nfp, "GetNfpState()");
// workaround for Mario Party 10 eating CPU cycles in an infinite loop (maybe due to incorrect NFP detection handling?) // workaround for Mario Party 10 eating CPU cycles in an infinite loop (maybe due to incorrect NFP detection handling?)
uint64 titleId = CafeSystem::GetForegroundTitleId(); uint64 titleId = CafeSystem::GetForegroundTitleId();