diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 1360ea26e..5efc1237e 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -520,6 +520,7 @@ void Hid::EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx) { | |||
| 520 | Controller_NPad::DeviceHandle sixaxis_handle; | 520 | Controller_NPad::DeviceHandle sixaxis_handle; |
| 521 | u64 applet_resource_user_id; | 521 | u64 applet_resource_user_id; |
| 522 | }; | 522 | }; |
| 523 | static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); | ||
| 523 | 524 | ||
| 524 | const auto parameters{rp.PopRaw<Parameters>()}; | 525 | const auto parameters{rp.PopRaw<Parameters>()}; |
| 525 | 526 | ||
| @@ -542,6 +543,7 @@ void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 542 | f32 parameter2; | 543 | f32 parameter2; |
| 543 | u64 applet_resource_user_id; | 544 | u64 applet_resource_user_id; |
| 544 | }; | 545 | }; |
| 546 | static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size."); | ||
| 545 | 547 | ||
| 546 | const auto parameters{rp.PopRaw<Parameters>()}; | 548 | const auto parameters{rp.PopRaw<Parameters>()}; |
| 547 | 549 | ||
| @@ -549,11 +551,11 @@ void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 549 | .SetSixAxisFusionParameters(parameters.parameter1, parameters.parameter2); | 551 | .SetSixAxisFusionParameters(parameters.parameter1, parameters.parameter2); |
| 550 | 552 | ||
| 551 | LOG_WARNING(Service_HID, | 553 | LOG_WARNING(Service_HID, |
| 552 | "(STUBBED) called, float1={}, float2={}, npad_type={}, npad_id={}, " | 554 | "(STUBBED) called, npad_type={}, npad_id={}, device_index={}, parameter1={}, " |
| 553 | "device_index={}, applet_resource_user_id={}", | 555 | "parameter2={}, applet_resource_user_id={}", |
| 554 | parameters.parameter1, parameters.parameter2, parameters.sixaxis_handle.npad_type, | 556 | parameters.sixaxis_handle.npad_type, parameters.sixaxis_handle.npad_id, |
| 555 | parameters.sixaxis_handle.npad_id, parameters.sixaxis_handle.device_index, | 557 | parameters.sixaxis_handle.device_index, parameters.parameter1, |
| 556 | parameters.applet_resource_user_id); | 558 | parameters.parameter2, parameters.applet_resource_user_id); |
| 557 | 559 | ||
| 558 | IPC::ResponseBuilder rb{ctx, 2}; | 560 | IPC::ResponseBuilder rb{ctx, 2}; |
| 559 | rb.Push(RESULT_SUCCESS); | 561 | rb.Push(RESULT_SUCCESS); |
| @@ -565,6 +567,7 @@ void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 565 | Controller_NPad::DeviceHandle sixaxis_handle; | 567 | Controller_NPad::DeviceHandle sixaxis_handle; |
| 566 | u64 applet_resource_user_id; | 568 | u64 applet_resource_user_id; |
| 567 | }; | 569 | }; |
| 570 | static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); | ||
| 568 | 571 | ||
| 569 | f32 parameter1 = 0; | 572 | f32 parameter1 = 0; |
| 570 | f32 parameter2 = 0; | 573 | f32 parameter2 = 0; |
| @@ -574,11 +577,11 @@ void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 574 | applet_resource->GetController<Controller_NPad>(HidController::NPad) | 577 | applet_resource->GetController<Controller_NPad>(HidController::NPad) |
| 575 | .GetSixAxisFusionParameters(); | 578 | .GetSixAxisFusionParameters(); |
| 576 | 579 | ||
| 577 | LOG_WARNING(Service_HID, | 580 | LOG_WARNING( |
| 578 | "(STUBBED) called, npad_type={}, npad_id={}, " | 581 | Service_HID, |
| 579 | "device_index={}, applet_resource_user_id={}", | 582 | "(STUBBED) called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}", |
| 580 | parameters.sixaxis_handle.npad_type, parameters.sixaxis_handle.npad_id, | 583 | parameters.sixaxis_handle.npad_type, parameters.sixaxis_handle.npad_id, |
| 581 | parameters.sixaxis_handle.device_index, parameters.applet_resource_user_id); | 584 | parameters.sixaxis_handle.device_index, parameters.applet_resource_user_id); |
| 582 | 585 | ||
| 583 | IPC::ResponseBuilder rb{ctx, 4}; | 586 | IPC::ResponseBuilder rb{ctx, 4}; |
| 584 | rb.Push(RESULT_SUCCESS); | 587 | rb.Push(RESULT_SUCCESS); |
| @@ -592,17 +595,18 @@ void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 592 | Controller_NPad::DeviceHandle sixaxis_handle; | 595 | Controller_NPad::DeviceHandle sixaxis_handle; |
| 593 | u64 applet_resource_user_id; | 596 | u64 applet_resource_user_id; |
| 594 | }; | 597 | }; |
| 598 | static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); | ||
| 595 | 599 | ||
| 596 | const auto parameters{rp.PopRaw<Parameters>()}; | 600 | const auto parameters{rp.PopRaw<Parameters>()}; |
| 597 | 601 | ||
| 598 | applet_resource->GetController<Controller_NPad>(HidController::NPad) | 602 | applet_resource->GetController<Controller_NPad>(HidController::NPad) |
| 599 | .ResetSixAxisFusionParameters(); | 603 | .ResetSixAxisFusionParameters(); |
| 600 | 604 | ||
| 601 | LOG_WARNING(Service_HID, | 605 | LOG_WARNING( |
| 602 | "(STUBBED) called, npad_type={}, npad_id={}, " | 606 | Service_HID, |
| 603 | "device_index={}, applet_resource_user_id={}", | 607 | "(STUBBED) called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}", |
| 604 | parameters.sixaxis_handle.npad_type, parameters.sixaxis_handle.npad_id, | 608 | parameters.sixaxis_handle.npad_type, parameters.sixaxis_handle.npad_id, |
| 605 | parameters.sixaxis_handle.device_index, parameters.applet_resource_user_id); | 609 | parameters.sixaxis_handle.device_index, parameters.applet_resource_user_id); |
| 606 | 610 | ||
| 607 | IPC::ResponseBuilder rb{ctx, 2}; | 611 | IPC::ResponseBuilder rb{ctx, 2}; |
| 608 | rb.Push(RESULT_SUCCESS); | 612 | rb.Push(RESULT_SUCCESS); |