mirror of
https://github.com/cemu-project/Cemu
synced 2024-09-20 03:11:36 +02:00
Migrate inputLog_printf to new logging (#767)
This commit is contained in:
why-keith
GitHub
parent
a519b01b58
commit
27a5671056
2 changed files with 85 additions and 84 deletions
|
|
@ -79,14 +79,14 @@ namespace padscore
|
|||
|
||||
void padscoreExport_WPADGetStatus(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
inputLog_printf("WPADGetStatus()");
|
||||
cemuLog_log(LogType::InputAPI, "WPADGetStatus()");
|
||||
uint32 status = 1;
|
||||
osLib_returnFromFunction(hCPU, status);
|
||||
}
|
||||
|
||||
void padscoreExport_WPADGetBatteryLevel(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
inputLog_printf("WPADGetBatteryLevel()");
|
||||
cemuLog_log(LogType::InputAPI, "WPADGetBatteryLevel()");
|
||||
osLib_returnFromFunction(hCPU, (uint32)WPADBatteryLevel::FULL);
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ void padscoreExport_WPADProbe(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(type, uint32be, 1);
|
||||
|
||||
inputLog_printf("WPADProbe(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "WPADProbe({})", channel);
|
||||
|
||||
if(const auto controller = InputManager::instance().get_wpad_controller(channel))
|
||||
{
|
||||
|
|
@ -130,7 +130,7 @@ void padscoreExport_WPADGetInfoAsync(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamStructPtr(wpadInfo, WPADInfo_t, 1);
|
||||
ppcDefineParamMPTR(callbackFunc, 2);
|
||||
inputLog_printf("WPADGetInfoAsync(%d, 0x%08x, 0x%08x)", channel, wpadInfo, callbackFunc);
|
||||
cemuLog_log(LogType::InputAPI, "WPADGetInfoAsync({}, 0x{:08x}, 0x{:08x})", channel, fmt::ptr(wpadInfo), callbackFunc);
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -166,7 +166,7 @@ void padscoreExport_WPADRead(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(wpadStatus, WPADStatus_t, 1);
|
||||
inputLog_printf("WPADRead(%d, %llx)", channel, wpadStatus);
|
||||
cemuLog_log(LogType::InputAPI, "WPADRead({}, {:x})", channel, fmt::ptr(wpadStatus));
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -186,7 +186,7 @@ void padscoreExport_WPADSetDataFormat(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamU32(fmt, 1);
|
||||
inputLog_printf("WPADSetDataFormat(%d, %d)", channel, fmt);
|
||||
cemuLog_log(LogType::InputAPI, "WPADSetDataFormat({}, {})", channel, fmt);
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -200,7 +200,7 @@ void padscoreExport_WPADSetDataFormat(PPCInterpreter_t* hCPU)
|
|||
void padscoreExport_WPADGetDataFormat(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("WPADGetDataFormat(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "WPADGetDataFormat({})", channel);
|
||||
|
||||
sint32 dataFormat = kDataFormat_CORE;
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
|
|
@ -220,7 +220,7 @@ void padscoreExport_WPADGetInfo(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamStructPtr(wpadInfo, WPADInfo_t, 1);
|
||||
inputLog_printf("WPADGetInfo(%d, 0x%08x)", channel, wpadInfo);
|
||||
cemuLog_log(LogType::InputAPI, "WPADGetInfo({}, 0x{:08x})", channel, fmt::ptr(wpadInfo));
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -249,7 +249,7 @@ void padscoreExport_WPADGetInfo(PPCInterpreter_t* hCPU)
|
|||
|
||||
void padscoreExport_WPADIsMotorEnabled(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
inputLog_printf("WPADIsMotorEnabled()");
|
||||
cemuLog_log(LogType::InputAPI, "WPADIsMotorEnabled()");
|
||||
osLib_returnFromFunction(hCPU, TRUE);
|
||||
}
|
||||
|
||||
|
|
@ -257,7 +257,7 @@ void padscoreExport_WPADControlMotor(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamU32(command, 1);
|
||||
inputLog_printf("WPADControlMotor(%d, %d)", channel, command);
|
||||
cemuLog_log(LogType::InputAPI, "WPADControlMotor({}, {})", channel, command);
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -287,7 +287,7 @@ void padscoreExport_KPADGetUnifiedWpadStatus(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamPtr(status, KPADUnifiedWpadStatus_t, 1);
|
||||
ppcDefineParamU32(count, 2);
|
||||
|
||||
inputLog_printf("KPADGetUnifiedWpadStatus(%d, 0x%llx, 0x%x)", channel, status, count);
|
||||
cemuLog_log(LogType::InputAPI, "KPADGetUnifiedWpadStatus({}, 0x{:x}, 0x{:x})", channel, fmt::ptr(status), count);
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -327,7 +327,7 @@ void padscoreExport_KPADSetBtnRepeat(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
float delaySec = hCPU->fpr[1].fpr;
|
||||
float pulseSec = hCPU->fpr[2].fpr;
|
||||
inputLog_printf("KPADSetBtnRepeat(%d, %f, %f)", channel, delaySec, pulseSec);
|
||||
cemuLog_log(LogType::InputAPI, "KPADSetBtnRepeat({}, {}, {})", channel, delaySec, pulseSec);
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -342,7 +342,7 @@ void padscoreExport_KPADSetSamplingCallback(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamMPTR(callback, 1);
|
||||
|
||||
inputLog_printf("KPADSetSamplingCallback(%d, 0x%x)", channel, callback);
|
||||
cemuLog_log(LogType::InputAPI, "KPADSetSamplingCallback({}, 0x{:x})", channel, callback);
|
||||
|
||||
if (channel >= InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -362,7 +362,7 @@ void padscoreExport_WPADControlDpd(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(command, 1);
|
||||
ppcDefineParamMPTR(callback, 2);
|
||||
|
||||
inputLog_printf("WPADControlDpd(%d, %d, 0x%x)", channel, command, callback);
|
||||
cemuLog_log(LogType::InputAPI, "WPADControlDpd({}, {}, 0x{:x})", channel, command, callback);
|
||||
|
||||
if (channel < InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -387,7 +387,7 @@ void padscoreExport_WPADSetExtensionCallback(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamMPTR(callback, 1);
|
||||
|
||||
inputLog_printf("WPADSetExtensionCallback(%d, 0x%x)", channel, callback);
|
||||
cemuLog_log(LogType::InputAPI, "WPADSetExtensionCallback({}, 0x{:x})", channel, callback);
|
||||
|
||||
if (channel >= InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -406,7 +406,7 @@ void padscoreExport_KPADSetConnectCallback(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamMPTR(callback, 1);
|
||||
|
||||
inputLog_printf("KPADSetConnectCallback(%d, 0x%x)",channel, callback);
|
||||
cemuLog_log(LogType::InputAPI, "KPADSetConnectCallback({}, 0x{:x})",channel, callback);
|
||||
|
||||
if (channel >= InputManager::kMaxWPADControllers)
|
||||
{
|
||||
|
|
@ -468,7 +468,7 @@ void padscoreExport_KPADReadEx(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamPtr(kpadStatus, KPADStatus_t, 1);
|
||||
ppcDefineParamU32(length, 2);
|
||||
ppcDefineParamPtr(errResult, betype<KPAD_ERROR>, 3);
|
||||
inputLog_printf("KPADReadEx(%d, 0x%x)", channel, length);
|
||||
cemuLog_log(LogType::InputAPI, "KPADReadEx({}, 0x{:x})", channel, length);
|
||||
|
||||
sint32 samplesRead = _KPADRead(channel, kpadStatus, length, errResult);
|
||||
osLib_returnFromFunction(hCPU, samplesRead);
|
||||
|
|
@ -480,7 +480,7 @@ void padscoreExport_KPADRead(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(kpadStatus, KPADStatus_t, 1);
|
||||
ppcDefineParamU32(length, 2);
|
||||
inputLog_printf("KPADRead(%d, 0x%x)", channel, length);
|
||||
cemuLog_log(LogType::InputAPI, "KPADRead({}, 0x{:x})", channel, length);
|
||||
|
||||
sint32 samplesRead = _KPADRead(channel, kpadStatus, length, nullptr);
|
||||
osLib_returnFromFunction(hCPU, samplesRead);
|
||||
|
|
@ -500,7 +500,7 @@ namespace padscore
|
|||
void export_KPADEnableDPD(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamS32(channel, 0);
|
||||
inputLog_printf("KPADEnableDPD(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "KPADEnableDPD({})", channel);
|
||||
cemu_assert_debug(0 <= channel && channel < InputManager::kMaxWPADControllers);
|
||||
|
||||
if(const auto controller = InputManager::instance().get_wpad_controller(channel))
|
||||
|
|
@ -515,7 +515,7 @@ namespace padscore
|
|||
|
||||
void export_KPADGetMplsWorkSize(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
inputLog_printf("KPADGetMplsWorkSize()");
|
||||
cemuLog_log(LogType::InputAPI, "KPADGetMplsWorkSize()");
|
||||
osLib_returnFromFunction(hCPU, 0x5FE0);
|
||||
}
|
||||
|
||||
|
|
@ -538,7 +538,7 @@ namespace padscore
|
|||
|
||||
void export_KPADInit(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
inputLog_printf("KPADInit()");
|
||||
cemuLog_log(LogType::InputAPI, "KPADInit()");
|
||||
KPADInitEx(nullptr, 0);
|
||||
osLib_returnFromFunction(hCPU, 0);
|
||||
}
|
||||
|
|
@ -547,7 +547,7 @@ namespace padscore
|
|||
{
|
||||
ppcDefineParamMEMPTR(ring_buffer, KPADUnifiedWpadStatus_t, 0);
|
||||
ppcDefineParamU32(length, 1);
|
||||
inputLog_printf("KPADInitEx(0x%08x, 0x%x)", ring_buffer.GetMPTR(), length);
|
||||
cemuLog_log(LogType::InputAPI, "KPADInitEx(0x{:08x}, 0x{:x})", ring_buffer.GetMPTR(), length);
|
||||
KPADInitEx(ring_buffer.GetPtr(), length);
|
||||
osLib_returnFromFunction(hCPU, 0);
|
||||
}
|
||||
|
|
@ -560,14 +560,14 @@ namespace padscore
|
|||
void export_WPADSetCallbackByKPAD(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(state, 0);
|
||||
inputLog_printf("WPADSetCallbackByKPAD(%d)", state);
|
||||
cemuLog_log(LogType::InputAPI, "WPADSetCallbackByKPAD({})", state);
|
||||
WPADSetCallbackByKPAD(state);
|
||||
osLib_returnFromFunction(hCPU, 0);
|
||||
}
|
||||
|
||||
void export_KPADGetMaxControllers(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
inputLog_printf("KPADGetMaxControllers()");
|
||||
cemuLog_log(LogType::InputAPI, "KPADGetMaxControllers()");
|
||||
sint32 max_controllers = g_padscore.max_controllers;
|
||||
osLib_returnFromFunction(hCPU, max_controllers);
|
||||
}
|
||||
|
|
@ -589,7 +589,7 @@ namespace padscore
|
|||
void export_KPADSetMaxControllers(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(new_max_count, 0);
|
||||
inputLog_printf("KPADSetMaxControllers(%d)", new_max_count);
|
||||
cemuLog_log(LogType::InputAPI, "KPADSetMaxControllers({})", new_max_count);
|
||||
|
||||
if (new_max_count != kKPADMaxControllers && new_max_count != kWPADMaxControllers)
|
||||
{
|
||||
|
|
@ -681,7 +681,7 @@ namespace padscore
|
|||
if(!g_padscore.controller_data[i].disconnectCalled)
|
||||
{
|
||||
g_padscore.controller_data[i].disconnectCalled = true;
|
||||
inputLog_printf("Calling WPADConnectCallback(%d, %d)", i, WPAD_ERR_NO_CONTROLLER);
|
||||
cemuLog_log(LogType::InputAPI, "Calling WPADConnectCallback({}, {})", i, WPAD_ERR_NO_CONTROLLER);
|
||||
PPCCoreCallback(g_padscore.controller_data[i].connectCallback, i, WPAD_ERR_NO_CONTROLLER);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -692,14 +692,14 @@ namespace padscore
|
|||
{
|
||||
controller->m_status = WPADController::ConnectCallbackStatus::ReportConnect;
|
||||
|
||||
inputLog_printf("Calling WPADConnectCallback(%d, %d)", i, WPAD_ERR_NO_CONTROLLER);
|
||||
cemuLog_log(LogType::InputAPI, "Calling WPADConnectCallback({}, {})", i, WPAD_ERR_NO_CONTROLLER);
|
||||
PPCCoreCallback(g_padscore.controller_data[i].connectCallback, i, WPAD_ERR_NO_CONTROLLER);
|
||||
|
||||
}
|
||||
else if (controller->m_status == WPADController::ConnectCallbackStatus::ReportConnect)
|
||||
{
|
||||
controller->m_status = WPADController::ConnectCallbackStatus::None;
|
||||
inputLog_printf("Calling WPADConnectCallback(%d, %d)", i, WPAD_ERR_NONE);
|
||||
cemuLog_log(LogType::InputAPI, "Calling WPADConnectCallback({}, {})", i, WPAD_ERR_NONE);
|
||||
PPCCoreCallback(g_padscore.controller_data[i].connectCallback, i, WPAD_ERR_NONE);
|
||||
}
|
||||
}
|
||||
|
|
@ -716,7 +716,7 @@ namespace padscore
|
|||
if (controller->m_extension_status == WPADController::ConnectCallbackStatus::ReportConnect)
|
||||
{
|
||||
controller->m_extension_status = WPADController::ConnectCallbackStatus::None;
|
||||
inputLog_printf("Calling WPADextensionCallback(%d)", i);
|
||||
cemuLog_log(LogType::InputAPI, "Calling WPADextensionCallback({})", i);
|
||||
PPCCoreCallback(g_padscore.controller_data[i].extension_callback, i, controller->get_device_type());
|
||||
}
|
||||
}
|
||||
|
|
@ -729,7 +729,7 @@ namespace padscore
|
|||
if (g_padscore.controller_data[i].sampling_callback) {
|
||||
if (const auto controller = instance.get_wpad_controller(i))
|
||||
{
|
||||
inputLog_printf("Calling WPADsamplingCallback(%d)", i);
|
||||
cemuLog_log(LogType::InputAPI, "Calling WPADsamplingCallback({})", i);
|
||||
PPCCoreCallback(g_padscore.controller_data[i].sampling_callback, i);
|
||||
}
|
||||
}
|
||||
|
|
@ -787,4 +787,4 @@ namespace padscore
|
|||
osLib_addFunction("padscore", "WPADSetCallbackByKPAD", padscore::export_WPADSetCallbackByKPAD);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ namespace vpad
|
|||
|
||||
void VPADSetAccParam(sint32 channel, float radius, float sensitivity)
|
||||
{
|
||||
inputLog_printf("VPADSetAccParam(%d, %f, %f)", channel, radius, sensitivity);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetAccParam({}, {}, {})", channel, radius, sensitivity);
|
||||
vpadbreak();
|
||||
g_vpad.controller_data[channel].acc_param.radius = radius;
|
||||
g_vpad.controller_data[channel].acc_param.sensitivity = sensitivity;
|
||||
|
|
@ -213,7 +213,7 @@ namespace vpad
|
|||
|
||||
void VPADGetAccParam(sint32 channel, float* radius, float* sensitivity)
|
||||
{
|
||||
inputLog_printf("VPADGetAccParam(%d, %p, %p)", channel, (void*)radius, (void*)sensitivity);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetAccParam({}, {}, {})", channel, (void*)radius, (void*)sensitivity);
|
||||
vpadbreak();
|
||||
*radius = g_vpad.controller_data[channel].acc_param.radius;
|
||||
*sensitivity = g_vpad.controller_data[channel].acc_param.sensitivity;
|
||||
|
|
@ -226,7 +226,7 @@ namespace vpad
|
|||
ppcDefineParamStructPtr(status, VPADStatus_t, 1);
|
||||
ppcDefineParamU32(length, 2);
|
||||
ppcDefineParamPtr(error, uint32be, 3);
|
||||
inputLog_printf("VPADRead(%d, _, %d)", channel, length);*/
|
||||
cemuLog_log(LogType::InputAPI, "VPADRead({}, _, {})", channel, length);*/
|
||||
|
||||
// default init which should be always set
|
||||
memset(status, 0x00, sizeof(VPADStatus_t));
|
||||
|
|
@ -304,7 +304,7 @@ namespace vpad
|
|||
|
||||
void VPADSetBtnRepeat(sint32 channel, float delay, float pulse)
|
||||
{
|
||||
inputLog_printf("VPADSetBtnRepeat(%d, %f, %f)", channel, delay, pulse);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetBtnRepeat({}, {}, {})", channel, delay, pulse);
|
||||
if(pulse == 0)
|
||||
{
|
||||
g_vpad.controller_data[channel].btn_repeat.delay = 40000;
|
||||
|
|
@ -320,21 +320,21 @@ namespace vpad
|
|||
|
||||
void VPADSetAccPlayMode(sint32 channel, PlayMode play_mode)
|
||||
{
|
||||
inputLog_printf("VPADSetAccPlayMode(%d, %d)", channel, (int)play_mode);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetAccPlayMode({}, {})", channel, (int)play_mode);
|
||||
vpadbreak();
|
||||
g_vpad.controller_data[channel].acc_play_mode = play_mode;
|
||||
}
|
||||
|
||||
PlayMode VPADGetAccPlayMode(sint32 channel)
|
||||
{
|
||||
inputLog_printf("VPADGetAccPlayMode(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetAccPlayMode({})", channel);
|
||||
vpadbreak();
|
||||
return g_vpad.controller_data[channel].acc_play_mode;
|
||||
}
|
||||
|
||||
void* VPADSetSamplingCallback(sint32 channel, void* callback)
|
||||
{
|
||||
inputLog_printf("VPADSetSamplingCallback(%d, 0x%x)", channel, MEMPTR(callback).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetSamplingCallback({}, 0x{:x})", channel, MEMPTR(callback).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
void* result = g_vpad.controller_data[channel].sampling_callback;
|
||||
|
|
@ -350,7 +350,7 @@ namespace vpad
|
|||
|
||||
void VPADGetTPCalibrationParam(sint32 channel, VPADTPCalibrationParam* param)
|
||||
{
|
||||
inputLog_printf("VPADGetTPCalibrationParam(%d, 0x%x)", channel, MEMPTR(param).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetTPCalibrationParam({}, 0x{:x})", channel, MEMPTR(param).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
*param = g_vpad.controller_data[channel].tp_calibration_param;
|
||||
|
|
@ -358,7 +358,7 @@ namespace vpad
|
|||
|
||||
void VPADSetTPCalibrationParam(sint32 channel, VPADTPCalibrationParam* param)
|
||||
{
|
||||
inputLog_printf("VPADSetTPCalibrationParam(%d, 0x%x)", channel, MEMPTR(param).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetTPCalibrationParam({}, 0x{:x})", channel, MEMPTR(param).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
g_vpad.controller_data[channel].tp_calibration_param = *param;
|
||||
|
|
@ -366,7 +366,7 @@ namespace vpad
|
|||
|
||||
void VPADGetTPCalibratedPoint(sint32 channel, VPADTPData* data, VPADTPData* raw)
|
||||
{
|
||||
inputLog_printf("VPADGetTPCalibratedPoint(%d, 0x%x, 0x%x)", channel, MEMPTR(data).GetMPTR(), MEMPTR(raw).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetTPCalibratedPoint({}, 0x{:x}, 0x{:x})", channel, MEMPTR(data).GetMPTR(), MEMPTR(raw).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
const auto& controller_data = g_vpad.controller_data[channel];
|
||||
|
|
@ -397,14 +397,14 @@ namespace vpad
|
|||
|
||||
void VPADGetTPCalibratedPointEx(sint32 channel, VPADTPResolution resolution, VPADTPData* data, VPADTPData* raw)
|
||||
{
|
||||
inputLog_printf("VPADGetTPCalibratedPointEx(%d, %d, 0x%x, 0x%x)", channel, (int)resolution, MEMPTR(data).GetMPTR(), MEMPTR(raw).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetTPCalibratedPointEx({}, {}, 0x{:x}, 0x{:x})", channel, (int)resolution, MEMPTR(data).GetMPTR(), MEMPTR(raw).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
}
|
||||
|
||||
void VPADSetCrossStickEmulationParamsL(sint32 channel, float rotation, float range, float radius)
|
||||
{
|
||||
inputLog_printf("VPADSetCrossStickEmulationParamsL(%d, %f, %f, %f)", channel, rotation, range, radius);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetCrossStickEmulationParamsL({}, {}, {}, {})", channel, rotation, range, radius);
|
||||
vpadbreak();
|
||||
|
||||
if (range < 0 || 90.0f < range)
|
||||
|
|
@ -420,7 +420,7 @@ namespace vpad
|
|||
|
||||
void VPADSetCrossStickEmulationParamsR(sint32 channel, float rotation, float range, float radius)
|
||||
{
|
||||
inputLog_printf("VPADSetCrossStickEmulationParamsR(%d, %f, %f, %f)", channel, rotation, range, radius);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetCrossStickEmulationParamsR({}, {}, {}, {})", channel, rotation, range, radius);
|
||||
vpadbreak();
|
||||
|
||||
if (range < 0 || 90.0f < range)
|
||||
|
|
@ -436,7 +436,7 @@ namespace vpad
|
|||
|
||||
void VPADGetCrossStickEmulationParamsL(sint32 channel, float* rotation, float* range, float* radius)
|
||||
{
|
||||
inputLog_printf("VPADGetCrossStickEmulationParamsL(%d, 0x%x, 0x%x, 0x%x)", channel, MEMPTR(rotation).GetMPTR(), MEMPTR(range).GetMPTR(), MEMPTR(radius).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetCrossStickEmulationParamsL({}, 0x{:x}, 0x{:x}, 0x{:x})", channel, MEMPTR(rotation).GetMPTR(), MEMPTR(range).GetMPTR(), MEMPTR(radius).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
*rotation = g_vpad.controller_data[channel].cross_stick_emulation_l.rotation;
|
||||
|
|
@ -446,7 +446,7 @@ namespace vpad
|
|||
|
||||
void VPADGetCrossStickEmulationParamsR(sint32 channel, float* rotation, float* range, float* radius)
|
||||
{
|
||||
inputLog_printf("VPADGetCrossStickEmulationParamsR(%d, 0x%x, 0x%x, 0x%x)", channel, MEMPTR(rotation).GetMPTR(), MEMPTR(range).GetMPTR(), MEMPTR(radius).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetCrossStickEmulationParamsR({}, 0x{:x}, 0x{:x}, 0x{:x})", channel, MEMPTR(rotation).GetMPTR(), MEMPTR(range).GetMPTR(), MEMPTR(radius).GetMPTR());
|
||||
vpadbreak();
|
||||
|
||||
*rotation = g_vpad.controller_data[channel].cross_stick_emulation_r.rotation;
|
||||
|
|
@ -456,7 +456,7 @@ namespace vpad
|
|||
|
||||
ButtonProcMode VPADGetButtonProcMode(sint32 channel)
|
||||
{
|
||||
inputLog_printf("VPADGetButtonProcMode(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetButtonProcMode({})", channel);
|
||||
vpadbreak();
|
||||
|
||||
return g_vpad.controller_data[channel].button_proc_mode;
|
||||
|
|
@ -464,7 +464,7 @@ namespace vpad
|
|||
|
||||
void VPADSetButtonProcMode(sint32 channel, ButtonProcMode mode)
|
||||
{
|
||||
inputLog_printf("VPADSetButtonProcMode(%d, %d)", channel, (int)mode);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetButtonProcMode({}, {})", channel, (int)mode);
|
||||
vpadbreak();
|
||||
|
||||
g_vpad.controller_data[channel].button_proc_mode = mode;
|
||||
|
|
@ -472,21 +472,21 @@ namespace vpad
|
|||
|
||||
void VPADEnableStickCrossClamp(sint32 channel)
|
||||
{
|
||||
inputLog_printf("VPADEnableStickCrossClamp(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADEnableStickCrossClamp({})", channel);
|
||||
vpadbreak();
|
||||
g_vpad.controller_data[channel].stick_cross_clamp.enabled = true;
|
||||
}
|
||||
|
||||
void VPADDisableStickCrossClamp(sint32 channel)
|
||||
{
|
||||
inputLog_printf("VPADDisableStickCrossClamp(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADDisableStickCrossClamp({})", channel);
|
||||
vpadbreak();
|
||||
g_vpad.controller_data[channel].stick_cross_clamp.enabled = false;
|
||||
}
|
||||
|
||||
void VPADSetLStickClampThreshold(sint32 channel, sint32 max, sint32 min)
|
||||
{
|
||||
inputLog_printf("VPADSetLStickClampThreshold(%d, %d, %d)", channel, max, min);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetLStickClampThreshold({}, {}, {})", channel, max, min);
|
||||
vpadbreak();
|
||||
g_vpad.controller_data[channel].stick_cross_clamp.left.max = std::min(0x397, max);
|
||||
g_vpad.controller_data[channel].stick_cross_clamp.left.min = std::max(0x102, min);
|
||||
|
|
@ -494,7 +494,7 @@ namespace vpad
|
|||
|
||||
void VPADSetRStickClampThreshold(sint32 channel, sint32 max, sint32 min)
|
||||
{
|
||||
inputLog_printf("VPADSetRStickClampThreshold(%d, %d, %d)", channel, max, min);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetRStickClampThreshold({}, {}, {})", channel, max, min);
|
||||
vpadbreak();
|
||||
g_vpad.controller_data[channel].stick_cross_clamp.right.max = std::min(0x397, max);
|
||||
g_vpad.controller_data[channel].stick_cross_clamp.right.min = std::max(0x102, min);
|
||||
|
|
@ -502,7 +502,7 @@ namespace vpad
|
|||
|
||||
void VPADGetLStickClampThreshold(sint32 channel, sint32* max, sint32* min)
|
||||
{
|
||||
inputLog_printf("VPADGetLStickClampThreshold(%d, 0x%x, 0x%x)", channel, MEMPTR(max).GetMPTR(), MEMPTR(min).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetLStickClampThreshold({}, 0x{:x}, 0x{:x})", channel, MEMPTR(max).GetMPTR(), MEMPTR(min).GetMPTR());
|
||||
vpadbreak();
|
||||
*max = g_vpad.controller_data[channel].stick_cross_clamp.left.max;
|
||||
*min = g_vpad.controller_data[channel].stick_cross_clamp.left.min;
|
||||
|
|
@ -510,7 +510,7 @@ namespace vpad
|
|||
|
||||
void VPADGetRStickClampThreshold(sint32 channel, sint32* max, sint32* min)
|
||||
{
|
||||
inputLog_printf("VPADGetRStickClampThreshold(%d, 0x%x, 0x%x)", channel, MEMPTR(max).GetMPTR(), MEMPTR(min).GetMPTR());
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetRStickClampThreshold({}, 0x{:x}, 0x{:x})", channel, MEMPTR(max).GetMPTR(), MEMPTR(min).GetMPTR());
|
||||
vpadbreak();
|
||||
*max = g_vpad.controller_data[channel].stick_cross_clamp.right.max;
|
||||
*min = g_vpad.controller_data[channel].stick_cross_clamp.right.min;
|
||||
|
|
@ -523,7 +523,7 @@ void vpadExport_VPADGetAccParam(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(playRadius, float32be, 1);
|
||||
ppcDefineParamPtr(sensitivity, float32be, 2);
|
||||
inputLog_printf("VPADGetAccParam(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetAccParam({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -541,7 +541,7 @@ void vpadExport_VPADGetAccParam(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADSetAccParam(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADSetAccParam(%d, %f, %f)", channel, hCPU->fpr[1].fpr, hCPU->fpr[2].fpr);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetAccParam({}, {}, {})", channel, hCPU->fpr[1].fpr, hCPU->fpr[2].fpr);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -559,7 +559,7 @@ void vpadExport_VPADSetAccParam(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADGetAccPlayMode(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADGetAccPlayMode(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetAccPlayMode({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -576,7 +576,7 @@ void vpadExport_VPADSetAccPlayMode(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamU32(playMode, 1);
|
||||
inputLog_printf("VPADSetAccPlayMode(%d, %d)", channel, playMode);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetAccPlayMode({}, {})", channel, playMode);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -593,7 +593,7 @@ void vpadExport_VPADSetAccPlayMode(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADEnableStickCrossClamp(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADEnableStickCrossClamp(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADEnableStickCrossClamp({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -610,7 +610,7 @@ void vpadExport_VPADEnableStickCrossClamp(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADDisableStickCrossClamp(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADDisableStickCrossClamp(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADDisableStickCrossClamp({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -629,7 +629,7 @@ void vpadExport_VPADSetLStickClampThreshold(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamS32(maxValue, 1);
|
||||
ppcDefineParamS32(minValue, 2);
|
||||
inputLog_printf("VPADSetLStickClampThreshold(%d, %d, %d)", channel, maxValue, minValue);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetLStickClampThreshold({}, {}, {})", channel, maxValue, minValue);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -649,7 +649,7 @@ void vpadExport_VPADSetRStickClampThreshold(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamS32(maxValue, 1);
|
||||
ppcDefineParamS32(minValue, 2);
|
||||
inputLog_printf("VPADSetRStickClampThreshold(%d, %d, %d)", channel, maxValue, minValue);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetRStickClampThreshold({}, {}, {})", channel, maxValue, minValue);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -669,7 +669,7 @@ void vpadExport_VPADGetLStickClampThreshold(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(maxValue, uint32be, 1);
|
||||
ppcDefineParamPtr(minValue, uint32be, 2);
|
||||
inputLog_printf("VPADGetLStickClampThreshold(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetLStickClampThreshold({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -689,7 +689,7 @@ void vpadExport_VPADGetRStickClampThreshold(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(maxValue, uint32be, 1);
|
||||
ppcDefineParamPtr(minValue, uint32be, 2);
|
||||
inputLog_printf("VPADGetRStickClampThreshold(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetRStickClampThreshold({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -707,7 +707,7 @@ void vpadExport_VPADGetRStickClampThreshold(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADSetCrossStickEmulationParamsL(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADSetCrossStickEmulationParamsL(%d, %f, %f, %f)", channel, hCPU->fpr[1].fpr, hCPU->fpr[2].fpr, hCPU->fpr[3].fpr);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetCrossStickEmulationParamsL({}, {}, {}, {})", channel, hCPU->fpr[1].fpr, hCPU->fpr[2].fpr, hCPU->fpr[3].fpr);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -726,7 +726,7 @@ void vpadExport_VPADSetCrossStickEmulationParamsL(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADSetCrossStickEmulationParamsR(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADSetCrossStickEmulationParamsR(%d, %f, %f, %f)", channel, hCPU->fpr[1].fpr, hCPU->fpr[2].fpr, hCPU->fpr[3].fpr);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetCrossStickEmulationParamsR({}, {}, {}, {})", channel, hCPU->fpr[1].fpr, hCPU->fpr[2].fpr, hCPU->fpr[3].fpr);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -748,7 +748,7 @@ void vpadExport_VPADGetCrossStickEmulationParamsL(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamPtr(rotation, float32be, 1);
|
||||
ppcDefineParamPtr(inputRange, float32be, 2);
|
||||
ppcDefineParamPtr(radius, float32be, 3);
|
||||
inputLog_printf("VPADGetCrossStickEmulationParamsL(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetCrossStickEmulationParamsL({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -770,7 +770,7 @@ void vpadExport_VPADGetCrossStickEmulationParamsR(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamPtr(rotation, float32be, 1);
|
||||
ppcDefineParamPtr(inputRange, float32be, 2);
|
||||
ppcDefineParamPtr(radius, float32be, 3);
|
||||
inputLog_printf("VPADGetCrossStickEmulationParamsR(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetCrossStickEmulationParamsR({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -789,7 +789,7 @@ void vpadExport_VPADGetCrossStickEmulationParamsR(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADGetButtonProcMode(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADGetButtonProcMode(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetButtonProcMode({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -806,7 +806,7 @@ void vpadExport_VPADSetButtonProcMode(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamU8(mode, 1);
|
||||
inputLog_printf("VPADSetButtonProcMode(%d, %d)", channel, mode);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetButtonProcMode({}, {})", channel, mode);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -824,7 +824,7 @@ void vpadExport_VPADSetLcdMode(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamU32(mode, 1);
|
||||
inputLog_printf("VPADSetLcdMode(%d, %d)", channel, mode);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetLcdMode({}, {})", channel, mode);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -841,7 +841,7 @@ void vpadExport_VPADGetLcdMode(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamPtr(mode, uint32be, 1);
|
||||
inputLog_printf("VPADGetLcdMode(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetLcdMode({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -860,11 +860,11 @@ void vpadExport_VPADControlMotor(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamUStr(pattern, 1);
|
||||
ppcDefineParamU8(length, 2);
|
||||
inputLog_printf("VPADControlMotor(%d, _, %d)", channel, length);
|
||||
cemuLog_log(LogType::InputAPI, "VPADControlMotor({}, _, {})", channel, length);
|
||||
|
||||
if (length > 120)
|
||||
{
|
||||
inputLog_printf("VPADControlMotor() - length too high with %d of 120", length);
|
||||
cemuLog_log(LogType::InputAPI, "VPADControlMotor() - length too high with {} of 120", length);
|
||||
length = 120;
|
||||
}
|
||||
|
||||
|
|
@ -892,7 +892,7 @@ void vpadExport_VPADControlMotor(PPCInterpreter_t* hCPU)
|
|||
void vpadExport_VPADStopMotor(PPCInterpreter_t* hCPU)
|
||||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
inputLog_printf("VPADStopMotor(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADStopMotor({})", channel);
|
||||
|
||||
if (const auto controller = InputManager::instance().get_vpad_controller(channel))
|
||||
{
|
||||
|
|
@ -912,7 +912,7 @@ void vpadExport_VPADSetTPCalibrationParam(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
VPADTPCalibrationParam* calibrationParam = params.GetPtr();
|
||||
|
||||
inputLog_printf("VPADSetTPCalibrationParam(%d, %d, %d, %f, %f)", channel, (uint16)calibrationParam->offsetX, (uint16)calibrationParam->offsetX, (float)calibrationParam->scaleX, (float)calibrationParam->scaleY);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetTPCalibrationParam({}, {}, {}, {}, {})", channel, (uint16)calibrationParam->offsetX, (uint16)calibrationParam->offsetX, (float)calibrationParam->scaleX, (float)calibrationParam->scaleY);
|
||||
|
||||
vpadTPCalibrationParam[channel].offsetX = calibrationParam->offsetX;
|
||||
vpadTPCalibrationParam[channel].offsetX = calibrationParam->offsetY;
|
||||
|
|
@ -931,7 +931,7 @@ void vpadExport_VPADGetTPCalibrationParam(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamStructPtr(calibrationParam, VPADTPCalibrationParam, 1);
|
||||
inputLog_printf("VPADSetTPCalibrationParam(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetTPCalibrationParam({})", channel);
|
||||
|
||||
calibrationParam->offsetX = vpadTPCalibrationParam[channel].offsetX;
|
||||
calibrationParam->offsetY = vpadTPCalibrationParam[channel].offsetY;
|
||||
|
|
@ -946,7 +946,7 @@ void vpadExport_VPADGetTPCalibratedPoint(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamStructPtr(outputDisplay, VPADTPData_t, 1);
|
||||
ppcDefineParamStructPtr(inputRaw, VPADTPData_t, 2);
|
||||
inputLog_printf("VPADGetTPCalibratedPoint(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetTPCalibratedPoint({})", channel);
|
||||
|
||||
memmove(outputDisplay, inputRaw, sizeof(VPADTPData_t));
|
||||
|
||||
|
|
@ -973,7 +973,7 @@ void vpadExport_VPADGetTPCalibratedPointEx(PPCInterpreter_t* hCPU)
|
|||
ppcDefineParamS32(tpResolution, 1);
|
||||
ppcDefineParamStructPtr(outputDisplay, VPADTPData_t, 2);
|
||||
ppcDefineParamStructPtr(inputRaw, VPADTPData_t, 3);
|
||||
inputLog_printf("VPADGetTPCalibratedPointEx(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetTPCalibratedPointEx({})", channel);
|
||||
|
||||
//debug_printf("TPInput: %d %d %04x %04x\n", _swapEndianU16(inputRaw->touch), _swapEndianU16(inputRaw->validity), _swapEndianU16(inputRaw->x), _swapEndianU16(inputRaw->y));
|
||||
memmove(outputDisplay, inputRaw, sizeof(VPADTPData_t));
|
||||
|
|
@ -1017,7 +1017,8 @@ void vpadExport_VPADSetGyroDirection(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamStructPtr(dir, VPADDir, 1);
|
||||
inputLog_printf("VPADSetGyroDirection(%d, <<%f, %f, %f>, <%f, %f, %f>, <%f, %f, %f>>)", channel, (float)dir->x.x, (float)dir->x.y, (float)dir->x.z
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetGyroDirection({}, <<{:f}, {:f}, {:f}>, <{:f}, {:f}, {:f}>, <{:f}, {:f}, {:f}>>)", channel
|
||||
, (float)dir->x.x, (float)dir->x.y, (float)dir->x.z
|
||||
, (float)dir->y.x, (float)dir->y.y, (float)dir->y.z
|
||||
, (float)dir->z.x, (float)dir->z.y, (float)dir->z.z);
|
||||
|
||||
|
|
@ -1037,7 +1038,7 @@ void vpadExport_VPADGetGyroZeroDriftMode(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamMEMPTR(gyroMode, uint32be, 1);
|
||||
inputLog_printf("VPADGetGyroZeroDriftMode(%d)", channel);
|
||||
cemuLog_log(LogType::InputAPI, "VPADGetGyroZeroDriftMode({})", channel);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -1056,7 +1057,7 @@ void vpadExport_VPADSetGyroZeroDriftMode(PPCInterpreter_t* hCPU)
|
|||
{
|
||||
ppcDefineParamU32(channel, 0);
|
||||
ppcDefineParamU32(gyroMode, 1);
|
||||
inputLog_printf("VPADSetGyroZeroDriftMode(%d, %d)", channel, gyroMode);
|
||||
cemuLog_log(LogType::InputAPI, "VPADSetGyroZeroDriftMode({}, {})", channel, gyroMode);
|
||||
|
||||
if (channel < VPAD_MAX_CONTROLLERS)
|
||||
{
|
||||
|
|
@ -1140,7 +1141,7 @@ namespace vpad
|
|||
|
||||
if(const auto controller = instance.get_vpad_controller(i))
|
||||
{
|
||||
inputLog_printf("Calling VPADSamplingCallback(%d)", i);
|
||||
cemuLog_log(LogType::InputAPI, "Calling VPADSamplingCallback({})", i);
|
||||
PPCCoreCallback(g_vpad.controller_data[i].sampling_callback, i);
|
||||
}
|
||||
}
|
||||
|
|
@ -1206,4 +1207,4 @@ void load()
|
|||
osLib_addFunction("vpad", "VPADSetGyroDirReviseParam", vpadExport_VPADSetGyroDirReviseParam);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue