diff options
| author | 2023-02-19 14:42:12 -0500 | |
|---|---|---|
| committer | 2023-03-01 10:39:49 -0500 | |
| commit | 65be230fdda302b25447f2f09b06e3238bd09e79 (patch) | |
| tree | 68250d7bc8151041b236dcd79483df98938952cd /src/core/hle/service/hid | |
| parent | sm:: remove unused member (diff) | |
| download | yuzu-65be230fdda302b25447f2f09b06e3238bd09e79.tar.gz yuzu-65be230fdda302b25447f2f09b06e3238bd09e79.tar.xz yuzu-65be230fdda302b25447f2f09b06e3238bd09e79.zip | |
service: move hle_ipc from kernel
Diffstat (limited to 'src/core/hle/service/hid')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 228 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 220 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hidbus.cpp | 28 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hidbus.h | 26 | ||||
| -rw-r--r-- | src/core/hle/service/hid/irs.cpp | 38 | ||||
| -rw-r--r-- | src/core/hle/service/hid/irs.h | 36 |
6 files changed, 288 insertions, 288 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 4b5130469..56c7275df 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include "core/core.h" | 8 | #include "core/core.h" |
| 9 | #include "core/core_timing.h" | 9 | #include "core/core_timing.h" |
| 10 | #include "core/hid/hid_core.h" | 10 | #include "core/hid/hid_core.h" |
| 11 | #include "core/hle/ipc_helpers.h" | ||
| 12 | #include "core/hle/kernel/k_readable_event.h" | 11 | #include "core/hle/kernel/k_readable_event.h" |
| 13 | #include "core/hle/kernel/k_shared_memory.h" | 12 | #include "core/hle/kernel/k_shared_memory.h" |
| 14 | #include "core/hle/kernel/k_transfer_memory.h" | 13 | #include "core/hle/kernel/k_transfer_memory.h" |
| @@ -18,6 +17,7 @@ | |||
| 18 | #include "core/hle/service/hid/hidbus.h" | 17 | #include "core/hle/service/hid/hidbus.h" |
| 19 | #include "core/hle/service/hid/irs.h" | 18 | #include "core/hle/service/hid/irs.h" |
| 20 | #include "core/hle/service/hid/xcd.h" | 19 | #include "core/hle/service/hid/xcd.h" |
| 20 | #include "core/hle/service/ipc_helpers.h" | ||
| 21 | #include "core/hle/service/server_manager.h" | 21 | #include "core/hle/service/server_manager.h" |
| 22 | #include "core/memory.h" | 22 | #include "core/memory.h" |
| 23 | 23 | ||
| @@ -138,7 +138,7 @@ IAppletResource::~IAppletResource() { | |||
| 138 | system.CoreTiming().UnscheduleEvent(motion_update_event, 0); | 138 | system.CoreTiming().UnscheduleEvent(motion_update_event, 0); |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | void IAppletResource::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { | 141 | void IAppletResource::GetSharedMemoryHandle(HLERequestContext& ctx) { |
| 142 | LOG_DEBUG(Service_HID, "called"); | 142 | LOG_DEBUG(Service_HID, "called"); |
| 143 | 143 | ||
| 144 | IPC::ResponseBuilder rb{ctx, 2, 1}; | 144 | IPC::ResponseBuilder rb{ctx, 2, 1}; |
| @@ -203,7 +203,7 @@ public: | |||
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | private: | 205 | private: |
| 206 | void InitializeVibrationDevice(Kernel::HLERequestContext& ctx) { | 206 | void InitializeVibrationDevice(HLERequestContext& ctx) { |
| 207 | IPC::RequestParser rp{ctx}; | 207 | IPC::RequestParser rp{ctx}; |
| 208 | const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; | 208 | const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; |
| 209 | 209 | ||
| @@ -382,7 +382,7 @@ Hid::Hid(Core::System& system_) | |||
| 382 | 382 | ||
| 383 | Hid::~Hid() = default; | 383 | Hid::~Hid() = default; |
| 384 | 384 | ||
| 385 | void Hid::CreateAppletResource(Kernel::HLERequestContext& ctx) { | 385 | void Hid::CreateAppletResource(HLERequestContext& ctx) { |
| 386 | IPC::RequestParser rp{ctx}; | 386 | IPC::RequestParser rp{ctx}; |
| 387 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 387 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 388 | 388 | ||
| @@ -397,7 +397,7 @@ void Hid::CreateAppletResource(Kernel::HLERequestContext& ctx) { | |||
| 397 | rb.PushIpcInterface<IAppletResource>(applet_resource); | 397 | rb.PushIpcInterface<IAppletResource>(applet_resource); |
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | void Hid::ActivateDebugPad(Kernel::HLERequestContext& ctx) { | 400 | void Hid::ActivateDebugPad(HLERequestContext& ctx) { |
| 401 | IPC::RequestParser rp{ctx}; | 401 | IPC::RequestParser rp{ctx}; |
| 402 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 402 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 403 | 403 | ||
| @@ -409,7 +409,7 @@ void Hid::ActivateDebugPad(Kernel::HLERequestContext& ctx) { | |||
| 409 | rb.Push(ResultSuccess); | 409 | rb.Push(ResultSuccess); |
| 410 | } | 410 | } |
| 411 | 411 | ||
| 412 | void Hid::ActivateTouchScreen(Kernel::HLERequestContext& ctx) { | 412 | void Hid::ActivateTouchScreen(HLERequestContext& ctx) { |
| 413 | IPC::RequestParser rp{ctx}; | 413 | IPC::RequestParser rp{ctx}; |
| 414 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 414 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 415 | 415 | ||
| @@ -421,7 +421,7 @@ void Hid::ActivateTouchScreen(Kernel::HLERequestContext& ctx) { | |||
| 421 | rb.Push(ResultSuccess); | 421 | rb.Push(ResultSuccess); |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | void Hid::ActivateMouse(Kernel::HLERequestContext& ctx) { | 424 | void Hid::ActivateMouse(HLERequestContext& ctx) { |
| 425 | IPC::RequestParser rp{ctx}; | 425 | IPC::RequestParser rp{ctx}; |
| 426 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 426 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 427 | 427 | ||
| @@ -433,7 +433,7 @@ void Hid::ActivateMouse(Kernel::HLERequestContext& ctx) { | |||
| 433 | rb.Push(ResultSuccess); | 433 | rb.Push(ResultSuccess); |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | void Hid::ActivateKeyboard(Kernel::HLERequestContext& ctx) { | 436 | void Hid::ActivateKeyboard(HLERequestContext& ctx) { |
| 437 | IPC::RequestParser rp{ctx}; | 437 | IPC::RequestParser rp{ctx}; |
| 438 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 438 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 439 | 439 | ||
| @@ -445,7 +445,7 @@ void Hid::ActivateKeyboard(Kernel::HLERequestContext& ctx) { | |||
| 445 | rb.Push(ResultSuccess); | 445 | rb.Push(ResultSuccess); |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | void Hid::SendKeyboardLockKeyEvent(Kernel::HLERequestContext& ctx) { | 448 | void Hid::SendKeyboardLockKeyEvent(HLERequestContext& ctx) { |
| 449 | IPC::RequestParser rp{ctx}; | 449 | IPC::RequestParser rp{ctx}; |
| 450 | const auto flags{rp.Pop<u32>()}; | 450 | const auto flags{rp.Pop<u32>()}; |
| 451 | 451 | ||
| @@ -455,7 +455,7 @@ void Hid::SendKeyboardLockKeyEvent(Kernel::HLERequestContext& ctx) { | |||
| 455 | rb.Push(ResultSuccess); | 455 | rb.Push(ResultSuccess); |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | void Hid::ActivateXpad(Kernel::HLERequestContext& ctx) { | 458 | void Hid::ActivateXpad(HLERequestContext& ctx) { |
| 459 | IPC::RequestParser rp{ctx}; | 459 | IPC::RequestParser rp{ctx}; |
| 460 | struct Parameters { | 460 | struct Parameters { |
| 461 | u32 basic_xpad_id; | 461 | u32 basic_xpad_id; |
| @@ -475,7 +475,7 @@ void Hid::ActivateXpad(Kernel::HLERequestContext& ctx) { | |||
| 475 | rb.Push(ResultSuccess); | 475 | rb.Push(ResultSuccess); |
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | void Hid::GetXpadIDs(Kernel::HLERequestContext& ctx) { | 478 | void Hid::GetXpadIDs(HLERequestContext& ctx) { |
| 479 | IPC::RequestParser rp{ctx}; | 479 | IPC::RequestParser rp{ctx}; |
| 480 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 480 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 481 | 481 | ||
| @@ -486,7 +486,7 @@ void Hid::GetXpadIDs(Kernel::HLERequestContext& ctx) { | |||
| 486 | rb.Push(0); | 486 | rb.Push(0); |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | void Hid::ActivateSixAxisSensor(Kernel::HLERequestContext& ctx) { | 489 | void Hid::ActivateSixAxisSensor(HLERequestContext& ctx) { |
| 490 | IPC::RequestParser rp{ctx}; | 490 | IPC::RequestParser rp{ctx}; |
| 491 | struct Parameters { | 491 | struct Parameters { |
| 492 | u32 basic_xpad_id; | 492 | u32 basic_xpad_id; |
| @@ -506,7 +506,7 @@ void Hid::ActivateSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 506 | rb.Push(ResultSuccess); | 506 | rb.Push(ResultSuccess); |
| 507 | } | 507 | } |
| 508 | 508 | ||
| 509 | void Hid::DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx) { | 509 | void Hid::DeactivateSixAxisSensor(HLERequestContext& ctx) { |
| 510 | IPC::RequestParser rp{ctx}; | 510 | IPC::RequestParser rp{ctx}; |
| 511 | struct Parameters { | 511 | struct Parameters { |
| 512 | u32 basic_xpad_id; | 512 | u32 basic_xpad_id; |
| @@ -526,7 +526,7 @@ void Hid::DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 526 | rb.Push(ResultSuccess); | 526 | rb.Push(ResultSuccess); |
| 527 | } | 527 | } |
| 528 | 528 | ||
| 529 | void Hid::StartSixAxisSensor(Kernel::HLERequestContext& ctx) { | 529 | void Hid::StartSixAxisSensor(HLERequestContext& ctx) { |
| 530 | IPC::RequestParser rp{ctx}; | 530 | IPC::RequestParser rp{ctx}; |
| 531 | struct Parameters { | 531 | struct Parameters { |
| 532 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 532 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -549,7 +549,7 @@ void Hid::StartSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 549 | rb.Push(result); | 549 | rb.Push(result); |
| 550 | } | 550 | } |
| 551 | 551 | ||
| 552 | void Hid::StopSixAxisSensor(Kernel::HLERequestContext& ctx) { | 552 | void Hid::StopSixAxisSensor(HLERequestContext& ctx) { |
| 553 | IPC::RequestParser rp{ctx}; | 553 | IPC::RequestParser rp{ctx}; |
| 554 | struct Parameters { | 554 | struct Parameters { |
| 555 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 555 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -572,7 +572,7 @@ void Hid::StopSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 572 | rb.Push(result); | 572 | rb.Push(result); |
| 573 | } | 573 | } |
| 574 | 574 | ||
| 575 | void Hid::IsSixAxisSensorFusionEnabled(Kernel::HLERequestContext& ctx) { | 575 | void Hid::IsSixAxisSensorFusionEnabled(HLERequestContext& ctx) { |
| 576 | IPC::RequestParser rp{ctx}; | 576 | IPC::RequestParser rp{ctx}; |
| 577 | struct Parameters { | 577 | struct Parameters { |
| 578 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 578 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -598,7 +598,7 @@ void Hid::IsSixAxisSensorFusionEnabled(Kernel::HLERequestContext& ctx) { | |||
| 598 | rb.Push(is_enabled); | 598 | rb.Push(is_enabled); |
| 599 | } | 599 | } |
| 600 | 600 | ||
| 601 | void Hid::EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx) { | 601 | void Hid::EnableSixAxisSensorFusion(HLERequestContext& ctx) { |
| 602 | IPC::RequestParser rp{ctx}; | 602 | IPC::RequestParser rp{ctx}; |
| 603 | struct Parameters { | 603 | struct Parameters { |
| 604 | bool enable_sixaxis_sensor_fusion; | 604 | bool enable_sixaxis_sensor_fusion; |
| @@ -625,7 +625,7 @@ void Hid::EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx) { | |||
| 625 | rb.Push(result); | 625 | rb.Push(result); |
| 626 | } | 626 | } |
| 627 | 627 | ||
| 628 | void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | 628 | void Hid::SetSixAxisSensorFusionParameters(HLERequestContext& ctx) { |
| 629 | IPC::RequestParser rp{ctx}; | 629 | IPC::RequestParser rp{ctx}; |
| 630 | struct Parameters { | 630 | struct Parameters { |
| 631 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 631 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -652,7 +652,7 @@ void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 652 | rb.Push(result); | 652 | rb.Push(result); |
| 653 | } | 653 | } |
| 654 | 654 | ||
| 655 | void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | 655 | void Hid::GetSixAxisSensorFusionParameters(HLERequestContext& ctx) { |
| 656 | IPC::RequestParser rp{ctx}; | 656 | IPC::RequestParser rp{ctx}; |
| 657 | struct Parameters { | 657 | struct Parameters { |
| 658 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 658 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -679,7 +679,7 @@ void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 679 | rb.PushRaw(fusion_parameters); | 679 | rb.PushRaw(fusion_parameters); |
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | 682 | void Hid::ResetSixAxisSensorFusionParameters(HLERequestContext& ctx) { |
| 683 | IPC::RequestParser rp{ctx}; | 683 | IPC::RequestParser rp{ctx}; |
| 684 | struct Parameters { | 684 | struct Parameters { |
| 685 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 685 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -713,7 +713,7 @@ void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | |||
| 713 | rb.Push(result2); | 713 | rb.Push(result2); |
| 714 | } | 714 | } |
| 715 | 715 | ||
| 716 | void Hid::SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | 716 | void Hid::SetGyroscopeZeroDriftMode(HLERequestContext& ctx) { |
| 717 | IPC::RequestParser rp{ctx}; | 717 | IPC::RequestParser rp{ctx}; |
| 718 | const auto sixaxis_handle{rp.PopRaw<Core::HID::SixAxisSensorHandle>()}; | 718 | const auto sixaxis_handle{rp.PopRaw<Core::HID::SixAxisSensorHandle>()}; |
| 719 | const auto drift_mode{rp.PopEnum<Core::HID::GyroscopeZeroDriftMode>()}; | 719 | const auto drift_mode{rp.PopEnum<Core::HID::GyroscopeZeroDriftMode>()}; |
| @@ -732,7 +732,7 @@ void Hid::SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | |||
| 732 | rb.Push(result); | 732 | rb.Push(result); |
| 733 | } | 733 | } |
| 734 | 734 | ||
| 735 | void Hid::GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | 735 | void Hid::GetGyroscopeZeroDriftMode(HLERequestContext& ctx) { |
| 736 | IPC::RequestParser rp{ctx}; | 736 | IPC::RequestParser rp{ctx}; |
| 737 | struct Parameters { | 737 | struct Parameters { |
| 738 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 738 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -757,7 +757,7 @@ void Hid::GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | |||
| 757 | rb.PushEnum(drift_mode); | 757 | rb.PushEnum(drift_mode); |
| 758 | } | 758 | } |
| 759 | 759 | ||
| 760 | void Hid::ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | 760 | void Hid::ResetGyroscopeZeroDriftMode(HLERequestContext& ctx) { |
| 761 | IPC::RequestParser rp{ctx}; | 761 | IPC::RequestParser rp{ctx}; |
| 762 | struct Parameters { | 762 | struct Parameters { |
| 763 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 763 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -781,7 +781,7 @@ void Hid::ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | |||
| 781 | rb.Push(result); | 781 | rb.Push(result); |
| 782 | } | 782 | } |
| 783 | 783 | ||
| 784 | void Hid::IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx) { | 784 | void Hid::IsSixAxisSensorAtRest(HLERequestContext& ctx) { |
| 785 | IPC::RequestParser rp{ctx}; | 785 | IPC::RequestParser rp{ctx}; |
| 786 | struct Parameters { | 786 | struct Parameters { |
| 787 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 787 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -806,7 +806,7 @@ void Hid::IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx) { | |||
| 806 | rb.Push(is_at_rest); | 806 | rb.Push(is_at_rest); |
| 807 | } | 807 | } |
| 808 | 808 | ||
| 809 | void Hid::IsFirmwareUpdateAvailableForSixAxisSensor(Kernel::HLERequestContext& ctx) { | 809 | void Hid::IsFirmwareUpdateAvailableForSixAxisSensor(HLERequestContext& ctx) { |
| 810 | IPC::RequestParser rp{ctx}; | 810 | IPC::RequestParser rp{ctx}; |
| 811 | struct Parameters { | 811 | struct Parameters { |
| 812 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 812 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -833,7 +833,7 @@ void Hid::IsFirmwareUpdateAvailableForSixAxisSensor(Kernel::HLERequestContext& c | |||
| 833 | rb.Push(is_firmware_available); | 833 | rb.Push(is_firmware_available); |
| 834 | } | 834 | } |
| 835 | 835 | ||
| 836 | void Hid::EnableSixAxisSensorUnalteredPassthrough(Kernel::HLERequestContext& ctx) { | 836 | void Hid::EnableSixAxisSensorUnalteredPassthrough(HLERequestContext& ctx) { |
| 837 | IPC::RequestParser rp{ctx}; | 837 | IPC::RequestParser rp{ctx}; |
| 838 | struct Parameters { | 838 | struct Parameters { |
| 839 | bool enabled; | 839 | bool enabled; |
| @@ -859,7 +859,7 @@ void Hid::EnableSixAxisSensorUnalteredPassthrough(Kernel::HLERequestContext& ctx | |||
| 859 | rb.Push(result); | 859 | rb.Push(result); |
| 860 | } | 860 | } |
| 861 | 861 | ||
| 862 | void Hid::IsSixAxisSensorUnalteredPassthroughEnabled(Kernel::HLERequestContext& ctx) { | 862 | void Hid::IsSixAxisSensorUnalteredPassthroughEnabled(HLERequestContext& ctx) { |
| 863 | IPC::RequestParser rp{ctx}; | 863 | IPC::RequestParser rp{ctx}; |
| 864 | struct Parameters { | 864 | struct Parameters { |
| 865 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 865 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -886,7 +886,7 @@ void Hid::IsSixAxisSensorUnalteredPassthroughEnabled(Kernel::HLERequestContext& | |||
| 886 | rb.Push(is_unaltered_sisxaxis_enabled); | 886 | rb.Push(is_unaltered_sisxaxis_enabled); |
| 887 | } | 887 | } |
| 888 | 888 | ||
| 889 | void Hid::LoadSixAxisSensorCalibrationParameter(Kernel::HLERequestContext& ctx) { | 889 | void Hid::LoadSixAxisSensorCalibrationParameter(HLERequestContext& ctx) { |
| 890 | IPC::RequestParser rp{ctx}; | 890 | IPC::RequestParser rp{ctx}; |
| 891 | struct Parameters { | 891 | struct Parameters { |
| 892 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 892 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -916,7 +916,7 @@ void Hid::LoadSixAxisSensorCalibrationParameter(Kernel::HLERequestContext& ctx) | |||
| 916 | rb.Push(result); | 916 | rb.Push(result); |
| 917 | } | 917 | } |
| 918 | 918 | ||
| 919 | void Hid::GetSixAxisSensorIcInformation(Kernel::HLERequestContext& ctx) { | 919 | void Hid::GetSixAxisSensorIcInformation(HLERequestContext& ctx) { |
| 920 | IPC::RequestParser rp{ctx}; | 920 | IPC::RequestParser rp{ctx}; |
| 921 | struct Parameters { | 921 | struct Parameters { |
| 922 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 922 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -946,7 +946,7 @@ void Hid::GetSixAxisSensorIcInformation(Kernel::HLERequestContext& ctx) { | |||
| 946 | rb.Push(result); | 946 | rb.Push(result); |
| 947 | } | 947 | } |
| 948 | 948 | ||
| 949 | void Hid::ResetIsSixAxisSensorDeviceNewlyAssigned(Kernel::HLERequestContext& ctx) { | 949 | void Hid::ResetIsSixAxisSensorDeviceNewlyAssigned(HLERequestContext& ctx) { |
| 950 | IPC::RequestParser rp{ctx}; | 950 | IPC::RequestParser rp{ctx}; |
| 951 | struct Parameters { | 951 | struct Parameters { |
| 952 | Core::HID::SixAxisSensorHandle sixaxis_handle; | 952 | Core::HID::SixAxisSensorHandle sixaxis_handle; |
| @@ -971,7 +971,7 @@ void Hid::ResetIsSixAxisSensorDeviceNewlyAssigned(Kernel::HLERequestContext& ctx | |||
| 971 | rb.Push(result); | 971 | rb.Push(result); |
| 972 | } | 972 | } |
| 973 | 973 | ||
| 974 | void Hid::ActivateGesture(Kernel::HLERequestContext& ctx) { | 974 | void Hid::ActivateGesture(HLERequestContext& ctx) { |
| 975 | IPC::RequestParser rp{ctx}; | 975 | IPC::RequestParser rp{ctx}; |
| 976 | struct Parameters { | 976 | struct Parameters { |
| 977 | u32 unknown; | 977 | u32 unknown; |
| @@ -991,7 +991,7 @@ void Hid::ActivateGesture(Kernel::HLERequestContext& ctx) { | |||
| 991 | rb.Push(ResultSuccess); | 991 | rb.Push(ResultSuccess); |
| 992 | } | 992 | } |
| 993 | 993 | ||
| 994 | void Hid::SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { | 994 | void Hid::SetSupportedNpadStyleSet(HLERequestContext& ctx) { |
| 995 | IPC::RequestParser rp{ctx}; | 995 | IPC::RequestParser rp{ctx}; |
| 996 | struct Parameters { | 996 | struct Parameters { |
| 997 | Core::HID::NpadStyleSet supported_styleset; | 997 | Core::HID::NpadStyleSet supported_styleset; |
| @@ -1012,7 +1012,7 @@ void Hid::SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { | |||
| 1012 | rb.Push(ResultSuccess); | 1012 | rb.Push(ResultSuccess); |
| 1013 | } | 1013 | } |
| 1014 | 1014 | ||
| 1015 | void Hid::GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { | 1015 | void Hid::GetSupportedNpadStyleSet(HLERequestContext& ctx) { |
| 1016 | IPC::RequestParser rp{ctx}; | 1016 | IPC::RequestParser rp{ctx}; |
| 1017 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1017 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1018 | 1018 | ||
| @@ -1025,7 +1025,7 @@ void Hid::GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { | |||
| 1025 | .raw); | 1025 | .raw); |
| 1026 | } | 1026 | } |
| 1027 | 1027 | ||
| 1028 | void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { | 1028 | void Hid::SetSupportedNpadIdType(HLERequestContext& ctx) { |
| 1029 | IPC::RequestParser rp{ctx}; | 1029 | IPC::RequestParser rp{ctx}; |
| 1030 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1030 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1031 | 1031 | ||
| @@ -1038,7 +1038,7 @@ void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { | |||
| 1038 | rb.Push(result); | 1038 | rb.Push(result); |
| 1039 | } | 1039 | } |
| 1040 | 1040 | ||
| 1041 | void Hid::ActivateNpad(Kernel::HLERequestContext& ctx) { | 1041 | void Hid::ActivateNpad(HLERequestContext& ctx) { |
| 1042 | IPC::RequestParser rp{ctx}; | 1042 | IPC::RequestParser rp{ctx}; |
| 1043 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1043 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1044 | 1044 | ||
| @@ -1050,7 +1050,7 @@ void Hid::ActivateNpad(Kernel::HLERequestContext& ctx) { | |||
| 1050 | rb.Push(ResultSuccess); | 1050 | rb.Push(ResultSuccess); |
| 1051 | } | 1051 | } |
| 1052 | 1052 | ||
| 1053 | void Hid::DeactivateNpad(Kernel::HLERequestContext& ctx) { | 1053 | void Hid::DeactivateNpad(HLERequestContext& ctx) { |
| 1054 | IPC::RequestParser rp{ctx}; | 1054 | IPC::RequestParser rp{ctx}; |
| 1055 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1055 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1056 | 1056 | ||
| @@ -1062,7 +1062,7 @@ void Hid::DeactivateNpad(Kernel::HLERequestContext& ctx) { | |||
| 1062 | rb.Push(ResultSuccess); | 1062 | rb.Push(ResultSuccess); |
| 1063 | } | 1063 | } |
| 1064 | 1064 | ||
| 1065 | void Hid::AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) { | 1065 | void Hid::AcquireNpadStyleSetUpdateEventHandle(HLERequestContext& ctx) { |
| 1066 | IPC::RequestParser rp{ctx}; | 1066 | IPC::RequestParser rp{ctx}; |
| 1067 | struct Parameters { | 1067 | struct Parameters { |
| 1068 | Core::HID::NpadIdType npad_id; | 1068 | Core::HID::NpadIdType npad_id; |
| @@ -1087,7 +1087,7 @@ void Hid::AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) { | |||
| 1087 | .GetStyleSetChangedEvent(parameters.npad_id)); | 1087 | .GetStyleSetChangedEvent(parameters.npad_id)); |
| 1088 | } | 1088 | } |
| 1089 | 1089 | ||
| 1090 | void Hid::DisconnectNpad(Kernel::HLERequestContext& ctx) { | 1090 | void Hid::DisconnectNpad(HLERequestContext& ctx) { |
| 1091 | IPC::RequestParser rp{ctx}; | 1091 | IPC::RequestParser rp{ctx}; |
| 1092 | struct Parameters { | 1092 | struct Parameters { |
| 1093 | Core::HID::NpadIdType npad_id; | 1093 | Core::HID::NpadIdType npad_id; |
| @@ -1108,7 +1108,7 @@ void Hid::DisconnectNpad(Kernel::HLERequestContext& ctx) { | |||
| 1108 | rb.Push(ResultSuccess); | 1108 | rb.Push(ResultSuccess); |
| 1109 | } | 1109 | } |
| 1110 | 1110 | ||
| 1111 | void Hid::GetPlayerLedPattern(Kernel::HLERequestContext& ctx) { | 1111 | void Hid::GetPlayerLedPattern(HLERequestContext& ctx) { |
| 1112 | IPC::RequestParser rp{ctx}; | 1112 | IPC::RequestParser rp{ctx}; |
| 1113 | const auto npad_id{rp.PopEnum<Core::HID::NpadIdType>()}; | 1113 | const auto npad_id{rp.PopEnum<Core::HID::NpadIdType>()}; |
| 1114 | 1114 | ||
| @@ -1123,7 +1123,7 @@ void Hid::GetPlayerLedPattern(Kernel::HLERequestContext& ctx) { | |||
| 1123 | rb.Push(pattern.raw); | 1123 | rb.Push(pattern.raw); |
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | void Hid::ActivateNpadWithRevision(Kernel::HLERequestContext& ctx) { | 1126 | void Hid::ActivateNpadWithRevision(HLERequestContext& ctx) { |
| 1127 | // Should have no effect with how our npad sets up the data | 1127 | // Should have no effect with how our npad sets up the data |
| 1128 | IPC::RequestParser rp{ctx}; | 1128 | IPC::RequestParser rp{ctx}; |
| 1129 | struct Parameters { | 1129 | struct Parameters { |
| @@ -1144,7 +1144,7 @@ void Hid::ActivateNpadWithRevision(Kernel::HLERequestContext& ctx) { | |||
| 1144 | rb.Push(ResultSuccess); | 1144 | rb.Push(ResultSuccess); |
| 1145 | } | 1145 | } |
| 1146 | 1146 | ||
| 1147 | void Hid::SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { | 1147 | void Hid::SetNpadJoyHoldType(HLERequestContext& ctx) { |
| 1148 | IPC::RequestParser rp{ctx}; | 1148 | IPC::RequestParser rp{ctx}; |
| 1149 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1149 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1150 | const auto hold_type{rp.PopEnum<Controller_NPad::NpadJoyHoldType>()}; | 1150 | const auto hold_type{rp.PopEnum<Controller_NPad::NpadJoyHoldType>()}; |
| @@ -1158,7 +1158,7 @@ void Hid::SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { | |||
| 1158 | rb.Push(ResultSuccess); | 1158 | rb.Push(ResultSuccess); |
| 1159 | } | 1159 | } |
| 1160 | 1160 | ||
| 1161 | void Hid::GetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { | 1161 | void Hid::GetNpadJoyHoldType(HLERequestContext& ctx) { |
| 1162 | IPC::RequestParser rp{ctx}; | 1162 | IPC::RequestParser rp{ctx}; |
| 1163 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1163 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1164 | 1164 | ||
| @@ -1169,7 +1169,7 @@ void Hid::GetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { | |||
| 1169 | rb.PushEnum(applet_resource->GetController<Controller_NPad>(HidController::NPad).GetHoldType()); | 1169 | rb.PushEnum(applet_resource->GetController<Controller_NPad>(HidController::NPad).GetHoldType()); |
| 1170 | } | 1170 | } |
| 1171 | 1171 | ||
| 1172 | void Hid::SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx) { | 1172 | void Hid::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx) { |
| 1173 | IPC::RequestParser rp{ctx}; | 1173 | IPC::RequestParser rp{ctx}; |
| 1174 | struct Parameters { | 1174 | struct Parameters { |
| 1175 | Core::HID::NpadIdType npad_id; | 1175 | Core::HID::NpadIdType npad_id; |
| @@ -1191,7 +1191,7 @@ void Hid::SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx | |||
| 1191 | rb.Push(ResultSuccess); | 1191 | rb.Push(ResultSuccess); |
| 1192 | } | 1192 | } |
| 1193 | 1193 | ||
| 1194 | void Hid::SetNpadJoyAssignmentModeSingle(Kernel::HLERequestContext& ctx) { | 1194 | void Hid::SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx) { |
| 1195 | IPC::RequestParser rp{ctx}; | 1195 | IPC::RequestParser rp{ctx}; |
| 1196 | struct Parameters { | 1196 | struct Parameters { |
| 1197 | Core::HID::NpadIdType npad_id; | 1197 | Core::HID::NpadIdType npad_id; |
| @@ -1215,7 +1215,7 @@ void Hid::SetNpadJoyAssignmentModeSingle(Kernel::HLERequestContext& ctx) { | |||
| 1215 | rb.Push(ResultSuccess); | 1215 | rb.Push(ResultSuccess); |
| 1216 | } | 1216 | } |
| 1217 | 1217 | ||
| 1218 | void Hid::SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) { | 1218 | void Hid::SetNpadJoyAssignmentModeDual(HLERequestContext& ctx) { |
| 1219 | IPC::RequestParser rp{ctx}; | 1219 | IPC::RequestParser rp{ctx}; |
| 1220 | struct Parameters { | 1220 | struct Parameters { |
| 1221 | Core::HID::NpadIdType npad_id; | 1221 | Core::HID::NpadIdType npad_id; |
| @@ -1236,7 +1236,7 @@ void Hid::SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) { | |||
| 1236 | rb.Push(ResultSuccess); | 1236 | rb.Push(ResultSuccess); |
| 1237 | } | 1237 | } |
| 1238 | 1238 | ||
| 1239 | void Hid::MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { | 1239 | void Hid::MergeSingleJoyAsDualJoy(HLERequestContext& ctx) { |
| 1240 | IPC::RequestParser rp{ctx}; | 1240 | IPC::RequestParser rp{ctx}; |
| 1241 | const auto npad_id_1{rp.PopEnum<Core::HID::NpadIdType>()}; | 1241 | const auto npad_id_1{rp.PopEnum<Core::HID::NpadIdType>()}; |
| 1242 | const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()}; | 1242 | const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()}; |
| @@ -1252,7 +1252,7 @@ void Hid::MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { | |||
| 1252 | rb.Push(result); | 1252 | rb.Push(result); |
| 1253 | } | 1253 | } |
| 1254 | 1254 | ||
| 1255 | void Hid::StartLrAssignmentMode(Kernel::HLERequestContext& ctx) { | 1255 | void Hid::StartLrAssignmentMode(HLERequestContext& ctx) { |
| 1256 | IPC::RequestParser rp{ctx}; | 1256 | IPC::RequestParser rp{ctx}; |
| 1257 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1257 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1258 | 1258 | ||
| @@ -1264,7 +1264,7 @@ void Hid::StartLrAssignmentMode(Kernel::HLERequestContext& ctx) { | |||
| 1264 | rb.Push(ResultSuccess); | 1264 | rb.Push(ResultSuccess); |
| 1265 | } | 1265 | } |
| 1266 | 1266 | ||
| 1267 | void Hid::StopLrAssignmentMode(Kernel::HLERequestContext& ctx) { | 1267 | void Hid::StopLrAssignmentMode(HLERequestContext& ctx) { |
| 1268 | IPC::RequestParser rp{ctx}; | 1268 | IPC::RequestParser rp{ctx}; |
| 1269 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1269 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1270 | 1270 | ||
| @@ -1276,7 +1276,7 @@ void Hid::StopLrAssignmentMode(Kernel::HLERequestContext& ctx) { | |||
| 1276 | rb.Push(ResultSuccess); | 1276 | rb.Push(ResultSuccess); |
| 1277 | } | 1277 | } |
| 1278 | 1278 | ||
| 1279 | void Hid::SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { | 1279 | void Hid::SetNpadHandheldActivationMode(HLERequestContext& ctx) { |
| 1280 | IPC::RequestParser rp{ctx}; | 1280 | IPC::RequestParser rp{ctx}; |
| 1281 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1281 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1282 | const auto activation_mode{rp.PopEnum<Controller_NPad::NpadHandheldActivationMode>()}; | 1282 | const auto activation_mode{rp.PopEnum<Controller_NPad::NpadHandheldActivationMode>()}; |
| @@ -1291,7 +1291,7 @@ void Hid::SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { | |||
| 1291 | rb.Push(ResultSuccess); | 1291 | rb.Push(ResultSuccess); |
| 1292 | } | 1292 | } |
| 1293 | 1293 | ||
| 1294 | void Hid::GetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { | 1294 | void Hid::GetNpadHandheldActivationMode(HLERequestContext& ctx) { |
| 1295 | IPC::RequestParser rp{ctx}; | 1295 | IPC::RequestParser rp{ctx}; |
| 1296 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1296 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1297 | 1297 | ||
| @@ -1303,7 +1303,7 @@ void Hid::GetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { | |||
| 1303 | .GetNpadHandheldActivationMode()); | 1303 | .GetNpadHandheldActivationMode()); |
| 1304 | } | 1304 | } |
| 1305 | 1305 | ||
| 1306 | void Hid::SwapNpadAssignment(Kernel::HLERequestContext& ctx) { | 1306 | void Hid::SwapNpadAssignment(HLERequestContext& ctx) { |
| 1307 | IPC::RequestParser rp{ctx}; | 1307 | IPC::RequestParser rp{ctx}; |
| 1308 | const auto npad_id_1{rp.PopEnum<Core::HID::NpadIdType>()}; | 1308 | const auto npad_id_1{rp.PopEnum<Core::HID::NpadIdType>()}; |
| 1309 | const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()}; | 1309 | const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()}; |
| @@ -1319,7 +1319,7 @@ void Hid::SwapNpadAssignment(Kernel::HLERequestContext& ctx) { | |||
| 1319 | rb.Push(result); | 1319 | rb.Push(result); |
| 1320 | } | 1320 | } |
| 1321 | 1321 | ||
| 1322 | void Hid::IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext& ctx) { | 1322 | void Hid::IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext& ctx) { |
| 1323 | IPC::RequestParser rp{ctx}; | 1323 | IPC::RequestParser rp{ctx}; |
| 1324 | struct Parameters { | 1324 | struct Parameters { |
| 1325 | Core::HID::NpadIdType npad_id; | 1325 | Core::HID::NpadIdType npad_id; |
| @@ -1343,7 +1343,7 @@ void Hid::IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext | |||
| 1343 | rb.Push(is_enabled); | 1343 | rb.Push(is_enabled); |
| 1344 | } | 1344 | } |
| 1345 | 1345 | ||
| 1346 | void Hid::EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& ctx) { | 1346 | void Hid::EnableUnintendedHomeButtonInputProtection(HLERequestContext& ctx) { |
| 1347 | IPC::RequestParser rp{ctx}; | 1347 | IPC::RequestParser rp{ctx}; |
| 1348 | struct Parameters { | 1348 | struct Parameters { |
| 1349 | bool unintended_home_button_input_protection; | 1349 | bool unintended_home_button_input_protection; |
| @@ -1369,7 +1369,7 @@ void Hid::EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& c | |||
| 1369 | rb.Push(result); | 1369 | rb.Push(result); |
| 1370 | } | 1370 | } |
| 1371 | 1371 | ||
| 1372 | void Hid::SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx) { | 1372 | void Hid::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) { |
| 1373 | IPC::RequestParser rp{ctx}; | 1373 | IPC::RequestParser rp{ctx}; |
| 1374 | struct Parameters { | 1374 | struct Parameters { |
| 1375 | bool analog_stick_use_center_clamp; | 1375 | bool analog_stick_use_center_clamp; |
| @@ -1392,7 +1392,7 @@ void Hid::SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx) { | |||
| 1392 | rb.Push(ResultSuccess); | 1392 | rb.Push(ResultSuccess); |
| 1393 | } | 1393 | } |
| 1394 | 1394 | ||
| 1395 | void Hid::SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { | 1395 | void Hid::SetNpadCaptureButtonAssignment(HLERequestContext& ctx) { |
| 1396 | IPC::RequestParser rp{ctx}; | 1396 | IPC::RequestParser rp{ctx}; |
| 1397 | struct Parameters { | 1397 | struct Parameters { |
| 1398 | Core::HID::NpadStyleSet npad_styleset; | 1398 | Core::HID::NpadStyleSet npad_styleset; |
| @@ -1412,7 +1412,7 @@ void Hid::SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { | |||
| 1412 | rb.Push(ResultSuccess); | 1412 | rb.Push(ResultSuccess); |
| 1413 | } | 1413 | } |
| 1414 | 1414 | ||
| 1415 | void Hid::ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { | 1415 | void Hid::ClearNpadCaptureButtonAssignment(HLERequestContext& ctx) { |
| 1416 | IPC::RequestParser rp{ctx}; | 1416 | IPC::RequestParser rp{ctx}; |
| 1417 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1417 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1418 | 1418 | ||
| @@ -1423,7 +1423,7 @@ void Hid::ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { | |||
| 1423 | rb.Push(ResultSuccess); | 1423 | rb.Push(ResultSuccess); |
| 1424 | } | 1424 | } |
| 1425 | 1425 | ||
| 1426 | void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { | 1426 | void Hid::GetVibrationDeviceInfo(HLERequestContext& ctx) { |
| 1427 | IPC::RequestParser rp{ctx}; | 1427 | IPC::RequestParser rp{ctx}; |
| 1428 | const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; | 1428 | const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; |
| 1429 | const auto& controller = | 1429 | const auto& controller = |
| @@ -1483,7 +1483,7 @@ void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { | |||
| 1483 | rb.PushRaw(vibration_device_info); | 1483 | rb.PushRaw(vibration_device_info); |
| 1484 | } | 1484 | } |
| 1485 | 1485 | ||
| 1486 | void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) { | 1486 | void Hid::SendVibrationValue(HLERequestContext& ctx) { |
| 1487 | IPC::RequestParser rp{ctx}; | 1487 | IPC::RequestParser rp{ctx}; |
| 1488 | struct Parameters { | 1488 | struct Parameters { |
| 1489 | Core::HID::VibrationDeviceHandle vibration_device_handle; | 1489 | Core::HID::VibrationDeviceHandle vibration_device_handle; |
| @@ -1508,7 +1508,7 @@ void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) { | |||
| 1508 | rb.Push(ResultSuccess); | 1508 | rb.Push(ResultSuccess); |
| 1509 | } | 1509 | } |
| 1510 | 1510 | ||
| 1511 | void Hid::GetActualVibrationValue(Kernel::HLERequestContext& ctx) { | 1511 | void Hid::GetActualVibrationValue(HLERequestContext& ctx) { |
| 1512 | IPC::RequestParser rp{ctx}; | 1512 | IPC::RequestParser rp{ctx}; |
| 1513 | struct Parameters { | 1513 | struct Parameters { |
| 1514 | Core::HID::VibrationDeviceHandle vibration_device_handle; | 1514 | Core::HID::VibrationDeviceHandle vibration_device_handle; |
| @@ -1531,7 +1531,7 @@ void Hid::GetActualVibrationValue(Kernel::HLERequestContext& ctx) { | |||
| 1531 | .GetLastVibration(parameters.vibration_device_handle)); | 1531 | .GetLastVibration(parameters.vibration_device_handle)); |
| 1532 | } | 1532 | } |
| 1533 | 1533 | ||
| 1534 | void Hid::CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { | 1534 | void Hid::CreateActiveVibrationDeviceList(HLERequestContext& ctx) { |
| 1535 | LOG_DEBUG(Service_HID, "called"); | 1535 | LOG_DEBUG(Service_HID, "called"); |
| 1536 | 1536 | ||
| 1537 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 1537 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| @@ -1539,7 +1539,7 @@ void Hid::CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { | |||
| 1539 | rb.PushIpcInterface<IActiveVibrationDeviceList>(system, applet_resource); | 1539 | rb.PushIpcInterface<IActiveVibrationDeviceList>(system, applet_resource); |
| 1540 | } | 1540 | } |
| 1541 | 1541 | ||
| 1542 | void Hid::PermitVibration(Kernel::HLERequestContext& ctx) { | 1542 | void Hid::PermitVibration(HLERequestContext& ctx) { |
| 1543 | IPC::RequestParser rp{ctx}; | 1543 | IPC::RequestParser rp{ctx}; |
| 1544 | const auto can_vibrate{rp.Pop<bool>()}; | 1544 | const auto can_vibrate{rp.Pop<bool>()}; |
| 1545 | 1545 | ||
| @@ -1553,7 +1553,7 @@ void Hid::PermitVibration(Kernel::HLERequestContext& ctx) { | |||
| 1553 | rb.Push(ResultSuccess); | 1553 | rb.Push(ResultSuccess); |
| 1554 | } | 1554 | } |
| 1555 | 1555 | ||
| 1556 | void Hid::IsVibrationPermitted(Kernel::HLERequestContext& ctx) { | 1556 | void Hid::IsVibrationPermitted(HLERequestContext& ctx) { |
| 1557 | LOG_DEBUG(Service_HID, "called"); | 1557 | LOG_DEBUG(Service_HID, "called"); |
| 1558 | 1558 | ||
| 1559 | // nnSDK checks if a float is greater than zero. We return the bool we stored earlier | 1559 | // nnSDK checks if a float is greater than zero. We return the bool we stored earlier |
| @@ -1564,7 +1564,7 @@ void Hid::IsVibrationPermitted(Kernel::HLERequestContext& ctx) { | |||
| 1564 | rb.Push(is_enabled); | 1564 | rb.Push(is_enabled); |
| 1565 | } | 1565 | } |
| 1566 | 1566 | ||
| 1567 | void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) { | 1567 | void Hid::SendVibrationValues(HLERequestContext& ctx) { |
| 1568 | IPC::RequestParser rp{ctx}; | 1568 | IPC::RequestParser rp{ctx}; |
| 1569 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1569 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1570 | 1570 | ||
| @@ -1588,7 +1588,7 @@ void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) { | |||
| 1588 | rb.Push(ResultSuccess); | 1588 | rb.Push(ResultSuccess); |
| 1589 | } | 1589 | } |
| 1590 | 1590 | ||
| 1591 | void Hid::SendVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { | 1591 | void Hid::SendVibrationGcErmCommand(HLERequestContext& ctx) { |
| 1592 | IPC::RequestParser rp{ctx}; | 1592 | IPC::RequestParser rp{ctx}; |
| 1593 | struct Parameters { | 1593 | struct Parameters { |
| 1594 | Core::HID::VibrationDeviceHandle vibration_device_handle; | 1594 | Core::HID::VibrationDeviceHandle vibration_device_handle; |
| @@ -1649,7 +1649,7 @@ void Hid::SendVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { | |||
| 1649 | rb.Push(ResultSuccess); | 1649 | rb.Push(ResultSuccess); |
| 1650 | } | 1650 | } |
| 1651 | 1651 | ||
| 1652 | void Hid::GetActualVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { | 1652 | void Hid::GetActualVibrationGcErmCommand(HLERequestContext& ctx) { |
| 1653 | IPC::RequestParser rp{ctx}; | 1653 | IPC::RequestParser rp{ctx}; |
| 1654 | struct Parameters { | 1654 | struct Parameters { |
| 1655 | Core::HID::VibrationDeviceHandle vibration_device_handle; | 1655 | Core::HID::VibrationDeviceHandle vibration_device_handle; |
| @@ -1691,7 +1691,7 @@ void Hid::GetActualVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { | |||
| 1691 | rb.PushEnum(gc_erm_command); | 1691 | rb.PushEnum(gc_erm_command); |
| 1692 | } | 1692 | } |
| 1693 | 1693 | ||
| 1694 | void Hid::BeginPermitVibrationSession(Kernel::HLERequestContext& ctx) { | 1694 | void Hid::BeginPermitVibrationSession(HLERequestContext& ctx) { |
| 1695 | IPC::RequestParser rp{ctx}; | 1695 | IPC::RequestParser rp{ctx}; |
| 1696 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1696 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1697 | 1697 | ||
| @@ -1704,7 +1704,7 @@ void Hid::BeginPermitVibrationSession(Kernel::HLERequestContext& ctx) { | |||
| 1704 | rb.Push(ResultSuccess); | 1704 | rb.Push(ResultSuccess); |
| 1705 | } | 1705 | } |
| 1706 | 1706 | ||
| 1707 | void Hid::EndPermitVibrationSession(Kernel::HLERequestContext& ctx) { | 1707 | void Hid::EndPermitVibrationSession(HLERequestContext& ctx) { |
| 1708 | applet_resource->GetController<Controller_NPad>(HidController::NPad) | 1708 | applet_resource->GetController<Controller_NPad>(HidController::NPad) |
| 1709 | .SetPermitVibrationSession(false); | 1709 | .SetPermitVibrationSession(false); |
| 1710 | 1710 | ||
| @@ -1714,7 +1714,7 @@ void Hid::EndPermitVibrationSession(Kernel::HLERequestContext& ctx) { | |||
| 1714 | rb.Push(ResultSuccess); | 1714 | rb.Push(ResultSuccess); |
| 1715 | } | 1715 | } |
| 1716 | 1716 | ||
| 1717 | void Hid::IsVibrationDeviceMounted(Kernel::HLERequestContext& ctx) { | 1717 | void Hid::IsVibrationDeviceMounted(HLERequestContext& ctx) { |
| 1718 | IPC::RequestParser rp{ctx}; | 1718 | IPC::RequestParser rp{ctx}; |
| 1719 | struct Parameters { | 1719 | struct Parameters { |
| 1720 | Core::HID::VibrationDeviceHandle vibration_device_handle; | 1720 | Core::HID::VibrationDeviceHandle vibration_device_handle; |
| @@ -1737,7 +1737,7 @@ void Hid::IsVibrationDeviceMounted(Kernel::HLERequestContext& ctx) { | |||
| 1737 | .IsVibrationDeviceMounted(parameters.vibration_device_handle)); | 1737 | .IsVibrationDeviceMounted(parameters.vibration_device_handle)); |
| 1738 | } | 1738 | } |
| 1739 | 1739 | ||
| 1740 | void Hid::ActivateConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1740 | void Hid::ActivateConsoleSixAxisSensor(HLERequestContext& ctx) { |
| 1741 | IPC::RequestParser rp{ctx}; | 1741 | IPC::RequestParser rp{ctx}; |
| 1742 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1742 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1743 | 1743 | ||
| @@ -1749,7 +1749,7 @@ void Hid::ActivateConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1749 | rb.Push(ResultSuccess); | 1749 | rb.Push(ResultSuccess); |
| 1750 | } | 1750 | } |
| 1751 | 1751 | ||
| 1752 | void Hid::StartConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1752 | void Hid::StartConsoleSixAxisSensor(HLERequestContext& ctx) { |
| 1753 | IPC::RequestParser rp{ctx}; | 1753 | IPC::RequestParser rp{ctx}; |
| 1754 | struct Parameters { | 1754 | struct Parameters { |
| 1755 | Core::HID::ConsoleSixAxisSensorHandle console_sixaxis_handle; | 1755 | Core::HID::ConsoleSixAxisSensorHandle console_sixaxis_handle; |
| @@ -1769,7 +1769,7 @@ void Hid::StartConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1769 | rb.Push(ResultSuccess); | 1769 | rb.Push(ResultSuccess); |
| 1770 | } | 1770 | } |
| 1771 | 1771 | ||
| 1772 | void Hid::StopConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1772 | void Hid::StopConsoleSixAxisSensor(HLERequestContext& ctx) { |
| 1773 | IPC::RequestParser rp{ctx}; | 1773 | IPC::RequestParser rp{ctx}; |
| 1774 | struct Parameters { | 1774 | struct Parameters { |
| 1775 | Core::HID::ConsoleSixAxisSensorHandle console_sixaxis_handle; | 1775 | Core::HID::ConsoleSixAxisSensorHandle console_sixaxis_handle; |
| @@ -1789,7 +1789,7 @@ void Hid::StopConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1789 | rb.Push(ResultSuccess); | 1789 | rb.Push(ResultSuccess); |
| 1790 | } | 1790 | } |
| 1791 | 1791 | ||
| 1792 | void Hid::ActivateSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1792 | void Hid::ActivateSevenSixAxisSensor(HLERequestContext& ctx) { |
| 1793 | IPC::RequestParser rp{ctx}; | 1793 | IPC::RequestParser rp{ctx}; |
| 1794 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1794 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1795 | 1795 | ||
| @@ -1801,7 +1801,7 @@ void Hid::ActivateSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1801 | rb.Push(ResultSuccess); | 1801 | rb.Push(ResultSuccess); |
| 1802 | } | 1802 | } |
| 1803 | 1803 | ||
| 1804 | void Hid::StartSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1804 | void Hid::StartSevenSixAxisSensor(HLERequestContext& ctx) { |
| 1805 | IPC::RequestParser rp{ctx}; | 1805 | IPC::RequestParser rp{ctx}; |
| 1806 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1806 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1807 | 1807 | ||
| @@ -1812,7 +1812,7 @@ void Hid::StartSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1812 | rb.Push(ResultSuccess); | 1812 | rb.Push(ResultSuccess); |
| 1813 | } | 1813 | } |
| 1814 | 1814 | ||
| 1815 | void Hid::StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1815 | void Hid::StopSevenSixAxisSensor(HLERequestContext& ctx) { |
| 1816 | IPC::RequestParser rp{ctx}; | 1816 | IPC::RequestParser rp{ctx}; |
| 1817 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1817 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1818 | 1818 | ||
| @@ -1823,7 +1823,7 @@ void Hid::StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1823 | rb.Push(ResultSuccess); | 1823 | rb.Push(ResultSuccess); |
| 1824 | } | 1824 | } |
| 1825 | 1825 | ||
| 1826 | void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1826 | void Hid::InitializeSevenSixAxisSensor(HLERequestContext& ctx) { |
| 1827 | IPC::RequestParser rp{ctx}; | 1827 | IPC::RequestParser rp{ctx}; |
| 1828 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1828 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1829 | const auto t_mem_1_size{rp.Pop<u64>()}; | 1829 | const auto t_mem_1_size{rp.Pop<u64>()}; |
| @@ -1873,7 +1873,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1873 | rb.Push(ResultSuccess); | 1873 | rb.Push(ResultSuccess); |
| 1874 | } | 1874 | } |
| 1875 | 1875 | ||
| 1876 | void Hid::FinalizeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | 1876 | void Hid::FinalizeSevenSixAxisSensor(HLERequestContext& ctx) { |
| 1877 | IPC::RequestParser rp{ctx}; | 1877 | IPC::RequestParser rp{ctx}; |
| 1878 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1878 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1879 | 1879 | ||
| @@ -1884,7 +1884,7 @@ void Hid::FinalizeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1884 | rb.Push(ResultSuccess); | 1884 | rb.Push(ResultSuccess); |
| 1885 | } | 1885 | } |
| 1886 | 1886 | ||
| 1887 | void Hid::ResetSevenSixAxisSensorTimestamp(Kernel::HLERequestContext& ctx) { | 1887 | void Hid::ResetSevenSixAxisSensorTimestamp(HLERequestContext& ctx) { |
| 1888 | IPC::RequestParser rp{ctx}; | 1888 | IPC::RequestParser rp{ctx}; |
| 1889 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 1889 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 1890 | 1890 | ||
| @@ -1897,7 +1897,7 @@ void Hid::ResetSevenSixAxisSensorTimestamp(Kernel::HLERequestContext& ctx) { | |||
| 1897 | rb.Push(ResultSuccess); | 1897 | rb.Push(ResultSuccess); |
| 1898 | } | 1898 | } |
| 1899 | 1899 | ||
| 1900 | void Hid::IsUsbFullKeyControllerEnabled(Kernel::HLERequestContext& ctx) { | 1900 | void Hid::IsUsbFullKeyControllerEnabled(HLERequestContext& ctx) { |
| 1901 | IPC::RequestParser rp{ctx}; | 1901 | IPC::RequestParser rp{ctx}; |
| 1902 | 1902 | ||
| 1903 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 1903 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| @@ -1907,7 +1907,7 @@ void Hid::IsUsbFullKeyControllerEnabled(Kernel::HLERequestContext& ctx) { | |||
| 1907 | rb.Push(false); | 1907 | rb.Push(false); |
| 1908 | } | 1908 | } |
| 1909 | 1909 | ||
| 1910 | void Hid::GetPalmaConnectionHandle(Kernel::HLERequestContext& ctx) { | 1910 | void Hid::GetPalmaConnectionHandle(HLERequestContext& ctx) { |
| 1911 | IPC::RequestParser rp{ctx}; | 1911 | IPC::RequestParser rp{ctx}; |
| 1912 | struct Parameters { | 1912 | struct Parameters { |
| 1913 | Core::HID::NpadIdType npad_id; | 1913 | Core::HID::NpadIdType npad_id; |
| @@ -1930,7 +1930,7 @@ void Hid::GetPalmaConnectionHandle(Kernel::HLERequestContext& ctx) { | |||
| 1930 | rb.PushRaw(handle); | 1930 | rb.PushRaw(handle); |
| 1931 | } | 1931 | } |
| 1932 | 1932 | ||
| 1933 | void Hid::InitializePalma(Kernel::HLERequestContext& ctx) { | 1933 | void Hid::InitializePalma(HLERequestContext& ctx) { |
| 1934 | IPC::RequestParser rp{ctx}; | 1934 | IPC::RequestParser rp{ctx}; |
| 1935 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 1935 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 1936 | 1936 | ||
| @@ -1943,7 +1943,7 @@ void Hid::InitializePalma(Kernel::HLERequestContext& ctx) { | |||
| 1943 | rb.Push(result); | 1943 | rb.Push(result); |
| 1944 | } | 1944 | } |
| 1945 | 1945 | ||
| 1946 | void Hid::AcquirePalmaOperationCompleteEvent(Kernel::HLERequestContext& ctx) { | 1946 | void Hid::AcquirePalmaOperationCompleteEvent(HLERequestContext& ctx) { |
| 1947 | IPC::RequestParser rp{ctx}; | 1947 | IPC::RequestParser rp{ctx}; |
| 1948 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 1948 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 1949 | 1949 | ||
| @@ -1956,7 +1956,7 @@ void Hid::AcquirePalmaOperationCompleteEvent(Kernel::HLERequestContext& ctx) { | |||
| 1956 | rb.PushCopyObjects(controller.AcquirePalmaOperationCompleteEvent(connection_handle)); | 1956 | rb.PushCopyObjects(controller.AcquirePalmaOperationCompleteEvent(connection_handle)); |
| 1957 | } | 1957 | } |
| 1958 | 1958 | ||
| 1959 | void Hid::GetPalmaOperationInfo(Kernel::HLERequestContext& ctx) { | 1959 | void Hid::GetPalmaOperationInfo(HLERequestContext& ctx) { |
| 1960 | IPC::RequestParser rp{ctx}; | 1960 | IPC::RequestParser rp{ctx}; |
| 1961 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 1961 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 1962 | 1962 | ||
| @@ -1978,7 +1978,7 @@ void Hid::GetPalmaOperationInfo(Kernel::HLERequestContext& ctx) { | |||
| 1978 | rb.Push(static_cast<u64>(operation_type)); | 1978 | rb.Push(static_cast<u64>(operation_type)); |
| 1979 | } | 1979 | } |
| 1980 | 1980 | ||
| 1981 | void Hid::PlayPalmaActivity(Kernel::HLERequestContext& ctx) { | 1981 | void Hid::PlayPalmaActivity(HLERequestContext& ctx) { |
| 1982 | IPC::RequestParser rp{ctx}; | 1982 | IPC::RequestParser rp{ctx}; |
| 1983 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 1983 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 1984 | const auto palma_activity{rp.Pop<u64>()}; | 1984 | const auto palma_activity{rp.Pop<u64>()}; |
| @@ -1993,7 +1993,7 @@ void Hid::PlayPalmaActivity(Kernel::HLERequestContext& ctx) { | |||
| 1993 | rb.Push(result); | 1993 | rb.Push(result); |
| 1994 | } | 1994 | } |
| 1995 | 1995 | ||
| 1996 | void Hid::SetPalmaFrModeType(Kernel::HLERequestContext& ctx) { | 1996 | void Hid::SetPalmaFrModeType(HLERequestContext& ctx) { |
| 1997 | IPC::RequestParser rp{ctx}; | 1997 | IPC::RequestParser rp{ctx}; |
| 1998 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 1998 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 1999 | const auto fr_mode{rp.PopEnum<Controller_Palma::PalmaFrModeType>()}; | 1999 | const auto fr_mode{rp.PopEnum<Controller_Palma::PalmaFrModeType>()}; |
| @@ -2008,7 +2008,7 @@ void Hid::SetPalmaFrModeType(Kernel::HLERequestContext& ctx) { | |||
| 2008 | rb.Push(result); | 2008 | rb.Push(result); |
| 2009 | } | 2009 | } |
| 2010 | 2010 | ||
| 2011 | void Hid::ReadPalmaStep(Kernel::HLERequestContext& ctx) { | 2011 | void Hid::ReadPalmaStep(HLERequestContext& ctx) { |
| 2012 | IPC::RequestParser rp{ctx}; | 2012 | IPC::RequestParser rp{ctx}; |
| 2013 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2013 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2014 | 2014 | ||
| @@ -2021,7 +2021,7 @@ void Hid::ReadPalmaStep(Kernel::HLERequestContext& ctx) { | |||
| 2021 | rb.Push(result); | 2021 | rb.Push(result); |
| 2022 | } | 2022 | } |
| 2023 | 2023 | ||
| 2024 | void Hid::EnablePalmaStep(Kernel::HLERequestContext& ctx) { | 2024 | void Hid::EnablePalmaStep(HLERequestContext& ctx) { |
| 2025 | IPC::RequestParser rp{ctx}; | 2025 | IPC::RequestParser rp{ctx}; |
| 2026 | struct Parameters { | 2026 | struct Parameters { |
| 2027 | bool is_enabled; | 2027 | bool is_enabled; |
| @@ -2043,7 +2043,7 @@ void Hid::EnablePalmaStep(Kernel::HLERequestContext& ctx) { | |||
| 2043 | rb.Push(result); | 2043 | rb.Push(result); |
| 2044 | } | 2044 | } |
| 2045 | 2045 | ||
| 2046 | void Hid::ResetPalmaStep(Kernel::HLERequestContext& ctx) { | 2046 | void Hid::ResetPalmaStep(HLERequestContext& ctx) { |
| 2047 | IPC::RequestParser rp{ctx}; | 2047 | IPC::RequestParser rp{ctx}; |
| 2048 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2048 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2049 | 2049 | ||
| @@ -2056,21 +2056,21 @@ void Hid::ResetPalmaStep(Kernel::HLERequestContext& ctx) { | |||
| 2056 | rb.Push(result); | 2056 | rb.Push(result); |
| 2057 | } | 2057 | } |
| 2058 | 2058 | ||
| 2059 | void Hid::ReadPalmaApplicationSection(Kernel::HLERequestContext& ctx) { | 2059 | void Hid::ReadPalmaApplicationSection(HLERequestContext& ctx) { |
| 2060 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2060 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2061 | 2061 | ||
| 2062 | IPC::ResponseBuilder rb{ctx, 2}; | 2062 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2063 | rb.Push(ResultSuccess); | 2063 | rb.Push(ResultSuccess); |
| 2064 | } | 2064 | } |
| 2065 | 2065 | ||
| 2066 | void Hid::WritePalmaApplicationSection(Kernel::HLERequestContext& ctx) { | 2066 | void Hid::WritePalmaApplicationSection(HLERequestContext& ctx) { |
| 2067 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2067 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2068 | 2068 | ||
| 2069 | IPC::ResponseBuilder rb{ctx, 2}; | 2069 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2070 | rb.Push(ResultSuccess); | 2070 | rb.Push(ResultSuccess); |
| 2071 | } | 2071 | } |
| 2072 | 2072 | ||
| 2073 | void Hid::ReadPalmaUniqueCode(Kernel::HLERequestContext& ctx) { | 2073 | void Hid::ReadPalmaUniqueCode(HLERequestContext& ctx) { |
| 2074 | IPC::RequestParser rp{ctx}; | 2074 | IPC::RequestParser rp{ctx}; |
| 2075 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2075 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2076 | 2076 | ||
| @@ -2083,7 +2083,7 @@ void Hid::ReadPalmaUniqueCode(Kernel::HLERequestContext& ctx) { | |||
| 2083 | rb.Push(ResultSuccess); | 2083 | rb.Push(ResultSuccess); |
| 2084 | } | 2084 | } |
| 2085 | 2085 | ||
| 2086 | void Hid::SetPalmaUniqueCodeInvalid(Kernel::HLERequestContext& ctx) { | 2086 | void Hid::SetPalmaUniqueCodeInvalid(HLERequestContext& ctx) { |
| 2087 | IPC::RequestParser rp{ctx}; | 2087 | IPC::RequestParser rp{ctx}; |
| 2088 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2088 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2089 | 2089 | ||
| @@ -2096,14 +2096,14 @@ void Hid::SetPalmaUniqueCodeInvalid(Kernel::HLERequestContext& ctx) { | |||
| 2096 | rb.Push(ResultSuccess); | 2096 | rb.Push(ResultSuccess); |
| 2097 | } | 2097 | } |
| 2098 | 2098 | ||
| 2099 | void Hid::WritePalmaActivityEntry(Kernel::HLERequestContext& ctx) { | 2099 | void Hid::WritePalmaActivityEntry(HLERequestContext& ctx) { |
| 2100 | LOG_CRITICAL(Service_HID, "(STUBBED) called"); | 2100 | LOG_CRITICAL(Service_HID, "(STUBBED) called"); |
| 2101 | 2101 | ||
| 2102 | IPC::ResponseBuilder rb{ctx, 2}; | 2102 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2103 | rb.Push(ResultSuccess); | 2103 | rb.Push(ResultSuccess); |
| 2104 | } | 2104 | } |
| 2105 | 2105 | ||
| 2106 | void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) { | 2106 | void Hid::WritePalmaRgbLedPatternEntry(HLERequestContext& ctx) { |
| 2107 | IPC::RequestParser rp{ctx}; | 2107 | IPC::RequestParser rp{ctx}; |
| 2108 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2108 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2109 | const auto unknown{rp.Pop<u64>()}; | 2109 | const auto unknown{rp.Pop<u64>()}; |
| @@ -2120,7 +2120,7 @@ void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) { | |||
| 2120 | rb.Push(ResultSuccess); | 2120 | rb.Push(ResultSuccess); |
| 2121 | } | 2121 | } |
| 2122 | 2122 | ||
| 2123 | void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { | 2123 | void Hid::WritePalmaWaveEntry(HLERequestContext& ctx) { |
| 2124 | IPC::RequestParser rp{ctx}; | 2124 | IPC::RequestParser rp{ctx}; |
| 2125 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2125 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2126 | const auto wave_set{rp.PopEnum<Controller_Palma::PalmaWaveSet>()}; | 2126 | const auto wave_set{rp.PopEnum<Controller_Palma::PalmaWaveSet>()}; |
| @@ -2155,7 +2155,7 @@ void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { | |||
| 2155 | rb.Push(ResultSuccess); | 2155 | rb.Push(ResultSuccess); |
| 2156 | } | 2156 | } |
| 2157 | 2157 | ||
| 2158 | void Hid::SetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) { | 2158 | void Hid::SetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx) { |
| 2159 | IPC::RequestParser rp{ctx}; | 2159 | IPC::RequestParser rp{ctx}; |
| 2160 | struct Parameters { | 2160 | struct Parameters { |
| 2161 | s32 database_id_version; | 2161 | s32 database_id_version; |
| @@ -2177,7 +2177,7 @@ void Hid::SetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) | |||
| 2177 | rb.Push(ResultSuccess); | 2177 | rb.Push(ResultSuccess); |
| 2178 | } | 2178 | } |
| 2179 | 2179 | ||
| 2180 | void Hid::GetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) { | 2180 | void Hid::GetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx) { |
| 2181 | IPC::RequestParser rp{ctx}; | 2181 | IPC::RequestParser rp{ctx}; |
| 2182 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2182 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2183 | 2183 | ||
| @@ -2190,14 +2190,14 @@ void Hid::GetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) | |||
| 2190 | rb.Push(ResultSuccess); | 2190 | rb.Push(ResultSuccess); |
| 2191 | } | 2191 | } |
| 2192 | 2192 | ||
| 2193 | void Hid::SuspendPalmaFeature(Kernel::HLERequestContext& ctx) { | 2193 | void Hid::SuspendPalmaFeature(HLERequestContext& ctx) { |
| 2194 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2194 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2195 | 2195 | ||
| 2196 | IPC::ResponseBuilder rb{ctx, 2}; | 2196 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2197 | rb.Push(ResultSuccess); | 2197 | rb.Push(ResultSuccess); |
| 2198 | } | 2198 | } |
| 2199 | 2199 | ||
| 2200 | void Hid::GetPalmaOperationResult(Kernel::HLERequestContext& ctx) { | 2200 | void Hid::GetPalmaOperationResult(HLERequestContext& ctx) { |
| 2201 | IPC::RequestParser rp{ctx}; | 2201 | IPC::RequestParser rp{ctx}; |
| 2202 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2202 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2203 | 2203 | ||
| @@ -2210,21 +2210,21 @@ void Hid::GetPalmaOperationResult(Kernel::HLERequestContext& ctx) { | |||
| 2210 | rb.Push(result); | 2210 | rb.Push(result); |
| 2211 | } | 2211 | } |
| 2212 | 2212 | ||
| 2213 | void Hid::ReadPalmaPlayLog(Kernel::HLERequestContext& ctx) { | 2213 | void Hid::ReadPalmaPlayLog(HLERequestContext& ctx) { |
| 2214 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2214 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2215 | 2215 | ||
| 2216 | IPC::ResponseBuilder rb{ctx, 2}; | 2216 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2217 | rb.Push(ResultSuccess); | 2217 | rb.Push(ResultSuccess); |
| 2218 | } | 2218 | } |
| 2219 | 2219 | ||
| 2220 | void Hid::ResetPalmaPlayLog(Kernel::HLERequestContext& ctx) { | 2220 | void Hid::ResetPalmaPlayLog(HLERequestContext& ctx) { |
| 2221 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2221 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2222 | 2222 | ||
| 2223 | IPC::ResponseBuilder rb{ctx, 2}; | 2223 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2224 | rb.Push(ResultSuccess); | 2224 | rb.Push(ResultSuccess); |
| 2225 | } | 2225 | } |
| 2226 | 2226 | ||
| 2227 | void Hid::SetIsPalmaAllConnectable(Kernel::HLERequestContext& ctx) { | 2227 | void Hid::SetIsPalmaAllConnectable(HLERequestContext& ctx) { |
| 2228 | IPC::RequestParser rp{ctx}; | 2228 | IPC::RequestParser rp{ctx}; |
| 2229 | struct Parameters { | 2229 | struct Parameters { |
| 2230 | bool is_palma_all_connectable; | 2230 | bool is_palma_all_connectable; |
| @@ -2246,14 +2246,14 @@ void Hid::SetIsPalmaAllConnectable(Kernel::HLERequestContext& ctx) { | |||
| 2246 | rb.Push(ResultSuccess); | 2246 | rb.Push(ResultSuccess); |
| 2247 | } | 2247 | } |
| 2248 | 2248 | ||
| 2249 | void Hid::SetIsPalmaPairedConnectable(Kernel::HLERequestContext& ctx) { | 2249 | void Hid::SetIsPalmaPairedConnectable(HLERequestContext& ctx) { |
| 2250 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2250 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2251 | 2251 | ||
| 2252 | IPC::ResponseBuilder rb{ctx, 2}; | 2252 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2253 | rb.Push(ResultSuccess); | 2253 | rb.Push(ResultSuccess); |
| 2254 | } | 2254 | } |
| 2255 | 2255 | ||
| 2256 | void Hid::PairPalma(Kernel::HLERequestContext& ctx) { | 2256 | void Hid::PairPalma(HLERequestContext& ctx) { |
| 2257 | IPC::RequestParser rp{ctx}; | 2257 | IPC::RequestParser rp{ctx}; |
| 2258 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; | 2258 | const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()}; |
| 2259 | 2259 | ||
| @@ -2266,7 +2266,7 @@ void Hid::PairPalma(Kernel::HLERequestContext& ctx) { | |||
| 2266 | rb.Push(ResultSuccess); | 2266 | rb.Push(ResultSuccess); |
| 2267 | } | 2267 | } |
| 2268 | 2268 | ||
| 2269 | void Hid::SetPalmaBoostMode(Kernel::HLERequestContext& ctx) { | 2269 | void Hid::SetPalmaBoostMode(HLERequestContext& ctx) { |
| 2270 | IPC::RequestParser rp{ctx}; | 2270 | IPC::RequestParser rp{ctx}; |
| 2271 | const auto palma_boost_mode{rp.Pop<bool>()}; | 2271 | const auto palma_boost_mode{rp.Pop<bool>()}; |
| 2272 | 2272 | ||
| @@ -2279,35 +2279,35 @@ void Hid::SetPalmaBoostMode(Kernel::HLERequestContext& ctx) { | |||
| 2279 | rb.Push(ResultSuccess); | 2279 | rb.Push(ResultSuccess); |
| 2280 | } | 2280 | } |
| 2281 | 2281 | ||
| 2282 | void Hid::CancelWritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { | 2282 | void Hid::CancelWritePalmaWaveEntry(HLERequestContext& ctx) { |
| 2283 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2283 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2284 | 2284 | ||
| 2285 | IPC::ResponseBuilder rb{ctx, 2}; | 2285 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2286 | rb.Push(ResultSuccess); | 2286 | rb.Push(ResultSuccess); |
| 2287 | } | 2287 | } |
| 2288 | 2288 | ||
| 2289 | void Hid::EnablePalmaBoostMode(Kernel::HLERequestContext& ctx) { | 2289 | void Hid::EnablePalmaBoostMode(HLERequestContext& ctx) { |
| 2290 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2290 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2291 | 2291 | ||
| 2292 | IPC::ResponseBuilder rb{ctx, 2}; | 2292 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2293 | rb.Push(ResultSuccess); | 2293 | rb.Push(ResultSuccess); |
| 2294 | } | 2294 | } |
| 2295 | 2295 | ||
| 2296 | void Hid::GetPalmaBluetoothAddress(Kernel::HLERequestContext& ctx) { | 2296 | void Hid::GetPalmaBluetoothAddress(HLERequestContext& ctx) { |
| 2297 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2297 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2298 | 2298 | ||
| 2299 | IPC::ResponseBuilder rb{ctx, 2}; | 2299 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2300 | rb.Push(ResultSuccess); | 2300 | rb.Push(ResultSuccess); |
| 2301 | } | 2301 | } |
| 2302 | 2302 | ||
| 2303 | void Hid::SetDisallowedPalmaConnection(Kernel::HLERequestContext& ctx) { | 2303 | void Hid::SetDisallowedPalmaConnection(HLERequestContext& ctx) { |
| 2304 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2304 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| 2305 | 2305 | ||
| 2306 | IPC::ResponseBuilder rb{ctx, 2}; | 2306 | IPC::ResponseBuilder rb{ctx, 2}; |
| 2307 | rb.Push(ResultSuccess); | 2307 | rb.Push(ResultSuccess); |
| 2308 | } | 2308 | } |
| 2309 | 2309 | ||
| 2310 | void Hid::SetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { | 2310 | void Hid::SetNpadCommunicationMode(HLERequestContext& ctx) { |
| 2311 | IPC::RequestParser rp{ctx}; | 2311 | IPC::RequestParser rp{ctx}; |
| 2312 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 2312 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 2313 | const auto communication_mode{rp.PopEnum<Controller_NPad::NpadCommunicationMode>()}; | 2313 | const auto communication_mode{rp.PopEnum<Controller_NPad::NpadCommunicationMode>()}; |
| @@ -2322,7 +2322,7 @@ void Hid::SetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { | |||
| 2322 | rb.Push(ResultSuccess); | 2322 | rb.Push(ResultSuccess); |
| 2323 | } | 2323 | } |
| 2324 | 2324 | ||
| 2325 | void Hid::GetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { | 2325 | void Hid::GetNpadCommunicationMode(HLERequestContext& ctx) { |
| 2326 | IPC::RequestParser rp{ctx}; | 2326 | IPC::RequestParser rp{ctx}; |
| 2327 | 2327 | ||
| 2328 | LOG_WARNING(Service_HID, "(STUBBED) called"); | 2328 | LOG_WARNING(Service_HID, "(STUBBED) called"); |
| @@ -2333,7 +2333,7 @@ void Hid::GetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { | |||
| 2333 | .GetNpadCommunicationMode()); | 2333 | .GetNpadCommunicationMode()); |
| 2334 | } | 2334 | } |
| 2335 | 2335 | ||
| 2336 | void Hid::SetTouchScreenConfiguration(Kernel::HLERequestContext& ctx) { | 2336 | void Hid::SetTouchScreenConfiguration(HLERequestContext& ctx) { |
| 2337 | IPC::RequestParser rp{ctx}; | 2337 | IPC::RequestParser rp{ctx}; |
| 2338 | const auto touchscreen_mode{rp.PopRaw<Controller_Touchscreen::TouchScreenConfigurationForNx>()}; | 2338 | const auto touchscreen_mode{rp.PopRaw<Controller_Touchscreen::TouchScreenConfigurationForNx>()}; |
| 2339 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 2339 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| @@ -2345,7 +2345,7 @@ void Hid::SetTouchScreenConfiguration(Kernel::HLERequestContext& ctx) { | |||
| 2345 | rb.Push(ResultSuccess); | 2345 | rb.Push(ResultSuccess); |
| 2346 | } | 2346 | } |
| 2347 | 2347 | ||
| 2348 | void Hid::IsFirmwareUpdateNeededForNotification(Kernel::HLERequestContext& ctx) { | 2348 | void Hid::IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx) { |
| 2349 | IPC::RequestParser rp{ctx}; | 2349 | IPC::RequestParser rp{ctx}; |
| 2350 | struct Parameters { | 2350 | struct Parameters { |
| 2351 | s32 unknown; | 2351 | s32 unknown; |
| @@ -2719,7 +2719,7 @@ public: | |||
| 2719 | } | 2719 | } |
| 2720 | 2720 | ||
| 2721 | private: | 2721 | private: |
| 2722 | void ApplyNpadSystemCommonPolicy(Kernel::HLERequestContext& ctx) { | 2722 | void ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) { |
| 2723 | // We already do this for homebrew so we can just stub it out | 2723 | // We already do this for homebrew so we can just stub it out |
| 2724 | LOG_WARNING(Service_HID, "called"); | 2724 | LOG_WARNING(Service_HID, "called"); |
| 2725 | 2725 | ||
| @@ -2727,7 +2727,7 @@ private: | |||
| 2727 | rb.Push(ResultSuccess); | 2727 | rb.Push(ResultSuccess); |
| 2728 | } | 2728 | } |
| 2729 | 2729 | ||
| 2730 | void GetUniquePadsFromNpad(Kernel::HLERequestContext& ctx) { | 2730 | void GetUniquePadsFromNpad(HLERequestContext& ctx) { |
| 2731 | IPC::RequestParser rp{ctx}; | 2731 | IPC::RequestParser rp{ctx}; |
| 2732 | const auto npad_id_type{rp.PopEnum<Core::HID::NpadIdType>()}; | 2732 | const auto npad_id_type{rp.PopEnum<Core::HID::NpadIdType>()}; |
| 2733 | 2733 | ||
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 9563654b6..c69e5f3fb 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h | |||
| @@ -76,7 +76,7 @@ private: | |||
| 76 | std::make_unique<T>(system.HIDCore(), shared_memory, service_context); | 76 | std::make_unique<T>(system.HIDCore(), shared_memory, service_context); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx); | 79 | void GetSharedMemoryHandle(HLERequestContext& ctx); |
| 80 | void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); | 80 | void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); |
| 81 | void UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); | 81 | void UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); |
| 82 | void UpdateMouseKeyboard(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); | 82 | void UpdateMouseKeyboard(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); |
| @@ -101,115 +101,115 @@ public: | |||
| 101 | std::shared_ptr<IAppletResource> GetAppletResource(); | 101 | std::shared_ptr<IAppletResource> GetAppletResource(); |
| 102 | 102 | ||
| 103 | private: | 103 | private: |
| 104 | void CreateAppletResource(Kernel::HLERequestContext& ctx); | 104 | void CreateAppletResource(HLERequestContext& ctx); |
| 105 | void ActivateDebugPad(Kernel::HLERequestContext& ctx); | 105 | void ActivateDebugPad(HLERequestContext& ctx); |
| 106 | void ActivateTouchScreen(Kernel::HLERequestContext& ctx); | 106 | void ActivateTouchScreen(HLERequestContext& ctx); |
| 107 | void ActivateMouse(Kernel::HLERequestContext& ctx); | 107 | void ActivateMouse(HLERequestContext& ctx); |
| 108 | void ActivateKeyboard(Kernel::HLERequestContext& ctx); | 108 | void ActivateKeyboard(HLERequestContext& ctx); |
| 109 | void SendKeyboardLockKeyEvent(Kernel::HLERequestContext& ctx); | 109 | void SendKeyboardLockKeyEvent(HLERequestContext& ctx); |
| 110 | void ActivateXpad(Kernel::HLERequestContext& ctx); | 110 | void ActivateXpad(HLERequestContext& ctx); |
| 111 | void GetXpadIDs(Kernel::HLERequestContext& ctx); | 111 | void GetXpadIDs(HLERequestContext& ctx); |
| 112 | void ActivateSixAxisSensor(Kernel::HLERequestContext& ctx); | 112 | void ActivateSixAxisSensor(HLERequestContext& ctx); |
| 113 | void DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx); | 113 | void DeactivateSixAxisSensor(HLERequestContext& ctx); |
| 114 | void StartSixAxisSensor(Kernel::HLERequestContext& ctx); | 114 | void StartSixAxisSensor(HLERequestContext& ctx); |
| 115 | void StopSixAxisSensor(Kernel::HLERequestContext& ctx); | 115 | void StopSixAxisSensor(HLERequestContext& ctx); |
| 116 | void IsSixAxisSensorFusionEnabled(Kernel::HLERequestContext& ctx); | 116 | void IsSixAxisSensorFusionEnabled(HLERequestContext& ctx); |
| 117 | void EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx); | 117 | void EnableSixAxisSensorFusion(HLERequestContext& ctx); |
| 118 | void SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx); | 118 | void SetSixAxisSensorFusionParameters(HLERequestContext& ctx); |
| 119 | void GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx); | 119 | void GetSixAxisSensorFusionParameters(HLERequestContext& ctx); |
| 120 | void ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx); | 120 | void ResetSixAxisSensorFusionParameters(HLERequestContext& ctx); |
| 121 | void SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx); | 121 | void SetGyroscopeZeroDriftMode(HLERequestContext& ctx); |
| 122 | void GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx); | 122 | void GetGyroscopeZeroDriftMode(HLERequestContext& ctx); |
| 123 | void ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx); | 123 | void ResetGyroscopeZeroDriftMode(HLERequestContext& ctx); |
| 124 | void IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx); | 124 | void IsSixAxisSensorAtRest(HLERequestContext& ctx); |
| 125 | void IsFirmwareUpdateAvailableForSixAxisSensor(Kernel::HLERequestContext& ctx); | 125 | void IsFirmwareUpdateAvailableForSixAxisSensor(HLERequestContext& ctx); |
| 126 | void EnableSixAxisSensorUnalteredPassthrough(Kernel::HLERequestContext& ctx); | 126 | void EnableSixAxisSensorUnalteredPassthrough(HLERequestContext& ctx); |
| 127 | void IsSixAxisSensorUnalteredPassthroughEnabled(Kernel::HLERequestContext& ctx); | 127 | void IsSixAxisSensorUnalteredPassthroughEnabled(HLERequestContext& ctx); |
| 128 | void LoadSixAxisSensorCalibrationParameter(Kernel::HLERequestContext& ctx); | 128 | void LoadSixAxisSensorCalibrationParameter(HLERequestContext& ctx); |
| 129 | void GetSixAxisSensorIcInformation(Kernel::HLERequestContext& ctx); | 129 | void GetSixAxisSensorIcInformation(HLERequestContext& ctx); |
| 130 | void ResetIsSixAxisSensorDeviceNewlyAssigned(Kernel::HLERequestContext& ctx); | 130 | void ResetIsSixAxisSensorDeviceNewlyAssigned(HLERequestContext& ctx); |
| 131 | void ActivateGesture(Kernel::HLERequestContext& ctx); | 131 | void ActivateGesture(HLERequestContext& ctx); |
| 132 | void SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx); | 132 | void SetSupportedNpadStyleSet(HLERequestContext& ctx); |
| 133 | void GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx); | 133 | void GetSupportedNpadStyleSet(HLERequestContext& ctx); |
| 134 | void SetSupportedNpadIdType(Kernel::HLERequestContext& ctx); | 134 | void SetSupportedNpadIdType(HLERequestContext& ctx); |
| 135 | void ActivateNpad(Kernel::HLERequestContext& ctx); | 135 | void ActivateNpad(HLERequestContext& ctx); |
| 136 | void DeactivateNpad(Kernel::HLERequestContext& ctx); | 136 | void DeactivateNpad(HLERequestContext& ctx); |
| 137 | void AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx); | 137 | void AcquireNpadStyleSetUpdateEventHandle(HLERequestContext& ctx); |
| 138 | void DisconnectNpad(Kernel::HLERequestContext& ctx); | 138 | void DisconnectNpad(HLERequestContext& ctx); |
| 139 | void GetPlayerLedPattern(Kernel::HLERequestContext& ctx); | 139 | void GetPlayerLedPattern(HLERequestContext& ctx); |
| 140 | void ActivateNpadWithRevision(Kernel::HLERequestContext& ctx); | 140 | void ActivateNpadWithRevision(HLERequestContext& ctx); |
| 141 | void SetNpadJoyHoldType(Kernel::HLERequestContext& ctx); | 141 | void SetNpadJoyHoldType(HLERequestContext& ctx); |
| 142 | void GetNpadJoyHoldType(Kernel::HLERequestContext& ctx); | 142 | void GetNpadJoyHoldType(HLERequestContext& ctx); |
| 143 | void SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx); | 143 | void SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx); |
| 144 | void SetNpadJoyAssignmentModeSingle(Kernel::HLERequestContext& ctx); | 144 | void SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx); |
| 145 | void SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx); | 145 | void SetNpadJoyAssignmentModeDual(HLERequestContext& ctx); |
| 146 | void MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx); | 146 | void MergeSingleJoyAsDualJoy(HLERequestContext& ctx); |
| 147 | void StartLrAssignmentMode(Kernel::HLERequestContext& ctx); | 147 | void StartLrAssignmentMode(HLERequestContext& ctx); |
| 148 | void StopLrAssignmentMode(Kernel::HLERequestContext& ctx); | 148 | void StopLrAssignmentMode(HLERequestContext& ctx); |
| 149 | void SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx); | 149 | void SetNpadHandheldActivationMode(HLERequestContext& ctx); |
| 150 | void GetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx); | 150 | void GetNpadHandheldActivationMode(HLERequestContext& ctx); |
| 151 | void SwapNpadAssignment(Kernel::HLERequestContext& ctx); | 151 | void SwapNpadAssignment(HLERequestContext& ctx); |
| 152 | void IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext& ctx); | 152 | void IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext& ctx); |
| 153 | void EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& ctx); | 153 | void EnableUnintendedHomeButtonInputProtection(HLERequestContext& ctx); |
| 154 | void SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx); | 154 | void SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx); |
| 155 | void SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx); | 155 | void SetNpadCaptureButtonAssignment(HLERequestContext& ctx); |
| 156 | void ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx); | 156 | void ClearNpadCaptureButtonAssignment(HLERequestContext& ctx); |
| 157 | void GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx); | 157 | void GetVibrationDeviceInfo(HLERequestContext& ctx); |
| 158 | void SendVibrationValue(Kernel::HLERequestContext& ctx); | 158 | void SendVibrationValue(HLERequestContext& ctx); |
| 159 | void GetActualVibrationValue(Kernel::HLERequestContext& ctx); | 159 | void GetActualVibrationValue(HLERequestContext& ctx); |
| 160 | void CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx); | 160 | void CreateActiveVibrationDeviceList(HLERequestContext& ctx); |
| 161 | void PermitVibration(Kernel::HLERequestContext& ctx); | 161 | void PermitVibration(HLERequestContext& ctx); |
| 162 | void IsVibrationPermitted(Kernel::HLERequestContext& ctx); | 162 | void IsVibrationPermitted(HLERequestContext& ctx); |
| 163 | void SendVibrationValues(Kernel::HLERequestContext& ctx); | 163 | void SendVibrationValues(HLERequestContext& ctx); |
| 164 | void SendVibrationGcErmCommand(Kernel::HLERequestContext& ctx); | 164 | void SendVibrationGcErmCommand(HLERequestContext& ctx); |
| 165 | void GetActualVibrationGcErmCommand(Kernel::HLERequestContext& ctx); | 165 | void GetActualVibrationGcErmCommand(HLERequestContext& ctx); |
| 166 | void BeginPermitVibrationSession(Kernel::HLERequestContext& ctx); | 166 | void BeginPermitVibrationSession(HLERequestContext& ctx); |
| 167 | void EndPermitVibrationSession(Kernel::HLERequestContext& ctx); | 167 | void EndPermitVibrationSession(HLERequestContext& ctx); |
| 168 | void IsVibrationDeviceMounted(Kernel::HLERequestContext& ctx); | 168 | void IsVibrationDeviceMounted(HLERequestContext& ctx); |
| 169 | void ActivateConsoleSixAxisSensor(Kernel::HLERequestContext& ctx); | 169 | void ActivateConsoleSixAxisSensor(HLERequestContext& ctx); |
| 170 | void StartConsoleSixAxisSensor(Kernel::HLERequestContext& ctx); | 170 | void StartConsoleSixAxisSensor(HLERequestContext& ctx); |
| 171 | void StopConsoleSixAxisSensor(Kernel::HLERequestContext& ctx); | 171 | void StopConsoleSixAxisSensor(HLERequestContext& ctx); |
| 172 | void ActivateSevenSixAxisSensor(Kernel::HLERequestContext& ctx); | 172 | void ActivateSevenSixAxisSensor(HLERequestContext& ctx); |
| 173 | void StartSevenSixAxisSensor(Kernel::HLERequestContext& ctx); | 173 | void StartSevenSixAxisSensor(HLERequestContext& ctx); |
| 174 | void StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx); | 174 | void StopSevenSixAxisSensor(HLERequestContext& ctx); |
| 175 | void InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx); | 175 | void InitializeSevenSixAxisSensor(HLERequestContext& ctx); |
| 176 | void FinalizeSevenSixAxisSensor(Kernel::HLERequestContext& ctx); | 176 | void FinalizeSevenSixAxisSensor(HLERequestContext& ctx); |
| 177 | void ResetSevenSixAxisSensorTimestamp(Kernel::HLERequestContext& ctx); | 177 | void ResetSevenSixAxisSensorTimestamp(HLERequestContext& ctx); |
| 178 | void IsUsbFullKeyControllerEnabled(Kernel::HLERequestContext& ctx); | 178 | void IsUsbFullKeyControllerEnabled(HLERequestContext& ctx); |
| 179 | void GetPalmaConnectionHandle(Kernel::HLERequestContext& ctx); | 179 | void GetPalmaConnectionHandle(HLERequestContext& ctx); |
| 180 | void InitializePalma(Kernel::HLERequestContext& ctx); | 180 | void InitializePalma(HLERequestContext& ctx); |
| 181 | void AcquirePalmaOperationCompleteEvent(Kernel::HLERequestContext& ctx); | 181 | void AcquirePalmaOperationCompleteEvent(HLERequestContext& ctx); |
| 182 | void GetPalmaOperationInfo(Kernel::HLERequestContext& ctx); | 182 | void GetPalmaOperationInfo(HLERequestContext& ctx); |
| 183 | void PlayPalmaActivity(Kernel::HLERequestContext& ctx); | 183 | void PlayPalmaActivity(HLERequestContext& ctx); |
| 184 | void SetPalmaFrModeType(Kernel::HLERequestContext& ctx); | 184 | void SetPalmaFrModeType(HLERequestContext& ctx); |
| 185 | void ReadPalmaStep(Kernel::HLERequestContext& ctx); | 185 | void ReadPalmaStep(HLERequestContext& ctx); |
| 186 | void EnablePalmaStep(Kernel::HLERequestContext& ctx); | 186 | void EnablePalmaStep(HLERequestContext& ctx); |
| 187 | void ResetPalmaStep(Kernel::HLERequestContext& ctx); | 187 | void ResetPalmaStep(HLERequestContext& ctx); |
| 188 | void ReadPalmaApplicationSection(Kernel::HLERequestContext& ctx); | 188 | void ReadPalmaApplicationSection(HLERequestContext& ctx); |
| 189 | void WritePalmaApplicationSection(Kernel::HLERequestContext& ctx); | 189 | void WritePalmaApplicationSection(HLERequestContext& ctx); |
| 190 | void ReadPalmaUniqueCode(Kernel::HLERequestContext& ctx); | 190 | void ReadPalmaUniqueCode(HLERequestContext& ctx); |
| 191 | void SetPalmaUniqueCodeInvalid(Kernel::HLERequestContext& ctx); | 191 | void SetPalmaUniqueCodeInvalid(HLERequestContext& ctx); |
| 192 | void WritePalmaActivityEntry(Kernel::HLERequestContext& ctx); | 192 | void WritePalmaActivityEntry(HLERequestContext& ctx); |
| 193 | void WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx); | 193 | void WritePalmaRgbLedPatternEntry(HLERequestContext& ctx); |
| 194 | void WritePalmaWaveEntry(Kernel::HLERequestContext& ctx); | 194 | void WritePalmaWaveEntry(HLERequestContext& ctx); |
| 195 | void SetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx); | 195 | void SetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx); |
| 196 | void GetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx); | 196 | void GetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx); |
| 197 | void SuspendPalmaFeature(Kernel::HLERequestContext& ctx); | 197 | void SuspendPalmaFeature(HLERequestContext& ctx); |
| 198 | void GetPalmaOperationResult(Kernel::HLERequestContext& ctx); | 198 | void GetPalmaOperationResult(HLERequestContext& ctx); |
| 199 | void ReadPalmaPlayLog(Kernel::HLERequestContext& ctx); | 199 | void ReadPalmaPlayLog(HLERequestContext& ctx); |
| 200 | void ResetPalmaPlayLog(Kernel::HLERequestContext& ctx); | 200 | void ResetPalmaPlayLog(HLERequestContext& ctx); |
| 201 | void SetIsPalmaAllConnectable(Kernel::HLERequestContext& ctx); | 201 | void SetIsPalmaAllConnectable(HLERequestContext& ctx); |
| 202 | void SetIsPalmaPairedConnectable(Kernel::HLERequestContext& ctx); | 202 | void SetIsPalmaPairedConnectable(HLERequestContext& ctx); |
| 203 | void PairPalma(Kernel::HLERequestContext& ctx); | 203 | void PairPalma(HLERequestContext& ctx); |
| 204 | void SetPalmaBoostMode(Kernel::HLERequestContext& ctx); | 204 | void SetPalmaBoostMode(HLERequestContext& ctx); |
| 205 | void CancelWritePalmaWaveEntry(Kernel::HLERequestContext& ctx); | 205 | void CancelWritePalmaWaveEntry(HLERequestContext& ctx); |
| 206 | void EnablePalmaBoostMode(Kernel::HLERequestContext& ctx); | 206 | void EnablePalmaBoostMode(HLERequestContext& ctx); |
| 207 | void GetPalmaBluetoothAddress(Kernel::HLERequestContext& ctx); | 207 | void GetPalmaBluetoothAddress(HLERequestContext& ctx); |
| 208 | void SetDisallowedPalmaConnection(Kernel::HLERequestContext& ctx); | 208 | void SetDisallowedPalmaConnection(HLERequestContext& ctx); |
| 209 | void SetNpadCommunicationMode(Kernel::HLERequestContext& ctx); | 209 | void SetNpadCommunicationMode(HLERequestContext& ctx); |
| 210 | void GetNpadCommunicationMode(Kernel::HLERequestContext& ctx); | 210 | void GetNpadCommunicationMode(HLERequestContext& ctx); |
| 211 | void SetTouchScreenConfiguration(Kernel::HLERequestContext& ctx); | 211 | void SetTouchScreenConfiguration(HLERequestContext& ctx); |
| 212 | void IsFirmwareUpdateNeededForNotification(Kernel::HLERequestContext& ctx); | 212 | void IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx); |
| 213 | 213 | ||
| 214 | std::shared_ptr<IAppletResource> applet_resource; | 214 | std::shared_ptr<IAppletResource> applet_resource; |
| 215 | 215 | ||
diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index 07199d5d5..5604a6fda 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include "core/core_timing.h" | 7 | #include "core/core_timing.h" |
| 8 | #include "core/core_timing_util.h" | 8 | #include "core/core_timing_util.h" |
| 9 | #include "core/hid/hid_types.h" | 9 | #include "core/hid/hid_types.h" |
| 10 | #include "core/hle/ipc_helpers.h" | ||
| 11 | #include "core/hle/kernel/k_event.h" | 10 | #include "core/hle/kernel/k_event.h" |
| 12 | #include "core/hle/kernel/k_readable_event.h" | 11 | #include "core/hle/kernel/k_readable_event.h" |
| 13 | #include "core/hle/kernel/k_shared_memory.h" | 12 | #include "core/hle/kernel/k_shared_memory.h" |
| @@ -16,6 +15,7 @@ | |||
| 16 | #include "core/hle/service/hid/hidbus/ringcon.h" | 15 | #include "core/hle/service/hid/hidbus/ringcon.h" |
| 17 | #include "core/hle/service/hid/hidbus/starlink.h" | 16 | #include "core/hle/service/hid/hidbus/starlink.h" |
| 18 | #include "core/hle/service/hid/hidbus/stubbed.h" | 17 | #include "core/hle/service/hid/hidbus/stubbed.h" |
| 18 | #include "core/hle/service/ipc_helpers.h" | ||
| 19 | #include "core/hle/service/service.h" | 19 | #include "core/hle/service/service.h" |
| 20 | #include "core/memory.h" | 20 | #include "core/memory.h" |
| 21 | 21 | ||
| @@ -99,7 +99,7 @@ std::optional<std::size_t> HidBus::GetDeviceIndexFromHandle(BusHandle handle) co | |||
| 99 | return std::nullopt; | 99 | return std::nullopt; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | void HidBus::GetBusHandle(Kernel::HLERequestContext& ctx) { | 102 | void HidBus::GetBusHandle(HLERequestContext& ctx) { |
| 103 | IPC::RequestParser rp{ctx}; | 103 | IPC::RequestParser rp{ctx}; |
| 104 | struct Parameters { | 104 | struct Parameters { |
| 105 | Core::HID::NpadIdType npad_id; | 105 | Core::HID::NpadIdType npad_id; |
| @@ -165,7 +165,7 @@ void HidBus::GetBusHandle(Kernel::HLERequestContext& ctx) { | |||
| 165 | rb.PushRaw(out_data); | 165 | rb.PushRaw(out_data); |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | void HidBus::IsExternalDeviceConnected(Kernel::HLERequestContext& ctx) { | 168 | void HidBus::IsExternalDeviceConnected(HLERequestContext& ctx) { |
| 169 | IPC::RequestParser rp{ctx}; | 169 | IPC::RequestParser rp{ctx}; |
| 170 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 170 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 171 | 171 | ||
| @@ -193,7 +193,7 @@ void HidBus::IsExternalDeviceConnected(Kernel::HLERequestContext& ctx) { | |||
| 193 | return; | 193 | return; |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | void HidBus::Initialize(Kernel::HLERequestContext& ctx) { | 196 | void HidBus::Initialize(HLERequestContext& ctx) { |
| 197 | IPC::RequestParser rp{ctx}; | 197 | IPC::RequestParser rp{ctx}; |
| 198 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 198 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 199 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 199 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| @@ -245,7 +245,7 @@ void HidBus::Initialize(Kernel::HLERequestContext& ctx) { | |||
| 245 | return; | 245 | return; |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | void HidBus::Finalize(Kernel::HLERequestContext& ctx) { | 248 | void HidBus::Finalize(HLERequestContext& ctx) { |
| 249 | IPC::RequestParser rp{ctx}; | 249 | IPC::RequestParser rp{ctx}; |
| 250 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 250 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 251 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 251 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| @@ -284,7 +284,7 @@ void HidBus::Finalize(Kernel::HLERequestContext& ctx) { | |||
| 284 | return; | 284 | return; |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | void HidBus::EnableExternalDevice(Kernel::HLERequestContext& ctx) { | 287 | void HidBus::EnableExternalDevice(HLERequestContext& ctx) { |
| 288 | IPC::RequestParser rp{ctx}; | 288 | IPC::RequestParser rp{ctx}; |
| 289 | struct Parameters { | 289 | struct Parameters { |
| 290 | bool enable; | 290 | bool enable; |
| @@ -322,7 +322,7 @@ void HidBus::EnableExternalDevice(Kernel::HLERequestContext& ctx) { | |||
| 322 | return; | 322 | return; |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | void HidBus::GetExternalDeviceId(Kernel::HLERequestContext& ctx) { | 325 | void HidBus::GetExternalDeviceId(HLERequestContext& ctx) { |
| 326 | IPC::RequestParser rp{ctx}; | 326 | IPC::RequestParser rp{ctx}; |
| 327 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 327 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 328 | 328 | ||
| @@ -349,7 +349,7 @@ void HidBus::GetExternalDeviceId(Kernel::HLERequestContext& ctx) { | |||
| 349 | return; | 349 | return; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | void HidBus::SendCommandAsync(Kernel::HLERequestContext& ctx) { | 352 | void HidBus::SendCommandAsync(HLERequestContext& ctx) { |
| 353 | IPC::RequestParser rp{ctx}; | 353 | IPC::RequestParser rp{ctx}; |
| 354 | const auto data = ctx.ReadBuffer(); | 354 | const auto data = ctx.ReadBuffer(); |
| 355 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 355 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| @@ -377,7 +377,7 @@ void HidBus::SendCommandAsync(Kernel::HLERequestContext& ctx) { | |||
| 377 | return; | 377 | return; |
| 378 | }; | 378 | }; |
| 379 | 379 | ||
| 380 | void HidBus::GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx) { | 380 | void HidBus::GetSendCommandAsynceResult(HLERequestContext& ctx) { |
| 381 | IPC::RequestParser rp{ctx}; | 381 | IPC::RequestParser rp{ctx}; |
| 382 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 382 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 383 | 383 | ||
| @@ -406,7 +406,7 @@ void HidBus::GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx) { | |||
| 406 | return; | 406 | return; |
| 407 | }; | 407 | }; |
| 408 | 408 | ||
| 409 | void HidBus::SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx) { | 409 | void HidBus::SetEventForSendCommandAsycResult(HLERequestContext& ctx) { |
| 410 | IPC::RequestParser rp{ctx}; | 410 | IPC::RequestParser rp{ctx}; |
| 411 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 411 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 412 | 412 | ||
| @@ -432,7 +432,7 @@ void HidBus::SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx) { | |||
| 432 | return; | 432 | return; |
| 433 | }; | 433 | }; |
| 434 | 434 | ||
| 435 | void HidBus::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { | 435 | void HidBus::GetSharedMemoryHandle(HLERequestContext& ctx) { |
| 436 | LOG_DEBUG(Service_HID, "called"); | 436 | LOG_DEBUG(Service_HID, "called"); |
| 437 | 437 | ||
| 438 | IPC::ResponseBuilder rb{ctx, 2, 1}; | 438 | IPC::ResponseBuilder rb{ctx, 2, 1}; |
| @@ -440,7 +440,7 @@ void HidBus::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { | |||
| 440 | rb.PushCopyObjects(&system.Kernel().GetHidBusSharedMem()); | 440 | rb.PushCopyObjects(&system.Kernel().GetHidBusSharedMem()); |
| 441 | } | 441 | } |
| 442 | 442 | ||
| 443 | void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { | 443 | void HidBus::EnableJoyPollingReceiveMode(HLERequestContext& ctx) { |
| 444 | IPC::RequestParser rp{ctx}; | 444 | IPC::RequestParser rp{ctx}; |
| 445 | const auto t_mem_size{rp.Pop<u32>()}; | 445 | const auto t_mem_size{rp.Pop<u32>()}; |
| 446 | const auto t_mem_handle{ctx.GetCopyHandle(0)}; | 446 | const auto t_mem_handle{ctx.GetCopyHandle(0)}; |
| @@ -485,7 +485,7 @@ void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { | |||
| 485 | return; | 485 | return; |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | void HidBus::DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { | 488 | void HidBus::DisableJoyPollingReceiveMode(HLERequestContext& ctx) { |
| 489 | IPC::RequestParser rp{ctx}; | 489 | IPC::RequestParser rp{ctx}; |
| 490 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; | 490 | const auto bus_handle_{rp.PopRaw<BusHandle>()}; |
| 491 | 491 | ||
| @@ -512,7 +512,7 @@ void HidBus::DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { | |||
| 512 | return; | 512 | return; |
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | void HidBus::SetStatusManagerType(Kernel::HLERequestContext& ctx) { | 515 | void HidBus::SetStatusManagerType(HLERequestContext& ctx) { |
| 516 | IPC::RequestParser rp{ctx}; | 516 | IPC::RequestParser rp{ctx}; |
| 517 | const auto manager_type{rp.PopEnum<StatusManagerType>()}; | 517 | const auto manager_type{rp.PopEnum<StatusManagerType>()}; |
| 518 | 518 | ||
diff --git a/src/core/hle/service/hid/hidbus.h b/src/core/hle/service/hid/hidbus.h index 85ed96e2e..c29b5e882 100644 --- a/src/core/hle/service/hid/hidbus.h +++ b/src/core/hle/service/hid/hidbus.h | |||
| @@ -94,19 +94,19 @@ private: | |||
| 94 | std::unique_ptr<HidbusBase> device{nullptr}; | 94 | std::unique_ptr<HidbusBase> device{nullptr}; |
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | void GetBusHandle(Kernel::HLERequestContext& ctx); | 97 | void GetBusHandle(HLERequestContext& ctx); |
| 98 | void IsExternalDeviceConnected(Kernel::HLERequestContext& ctx); | 98 | void IsExternalDeviceConnected(HLERequestContext& ctx); |
| 99 | void Initialize(Kernel::HLERequestContext& ctx); | 99 | void Initialize(HLERequestContext& ctx); |
| 100 | void Finalize(Kernel::HLERequestContext& ctx); | 100 | void Finalize(HLERequestContext& ctx); |
| 101 | void EnableExternalDevice(Kernel::HLERequestContext& ctx); | 101 | void EnableExternalDevice(HLERequestContext& ctx); |
| 102 | void GetExternalDeviceId(Kernel::HLERequestContext& ctx); | 102 | void GetExternalDeviceId(HLERequestContext& ctx); |
| 103 | void SendCommandAsync(Kernel::HLERequestContext& ctx); | 103 | void SendCommandAsync(HLERequestContext& ctx); |
| 104 | void GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx); | 104 | void GetSendCommandAsynceResult(HLERequestContext& ctx); |
| 105 | void SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx); | 105 | void SetEventForSendCommandAsycResult(HLERequestContext& ctx); |
| 106 | void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx); | 106 | void GetSharedMemoryHandle(HLERequestContext& ctx); |
| 107 | void EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx); | 107 | void EnableJoyPollingReceiveMode(HLERequestContext& ctx); |
| 108 | void DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx); | 108 | void DisableJoyPollingReceiveMode(HLERequestContext& ctx); |
| 109 | void SetStatusManagerType(Kernel::HLERequestContext& ctx); | 109 | void SetStatusManagerType(HLERequestContext& ctx); |
| 110 | 110 | ||
| 111 | void UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); | 111 | void UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); |
| 112 | std::optional<std::size_t> GetDeviceIndexFromHandle(BusHandle handle) const; | 112 | std::optional<std::size_t> GetDeviceIndexFromHandle(BusHandle handle) const; |
diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index a40f61fde..221c33b86 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include "core/core_timing.h" | 8 | #include "core/core_timing.h" |
| 9 | #include "core/hid/emulated_controller.h" | 9 | #include "core/hid/emulated_controller.h" |
| 10 | #include "core/hid/hid_core.h" | 10 | #include "core/hid/hid_core.h" |
| 11 | #include "core/hle/ipc_helpers.h" | ||
| 12 | #include "core/hle/kernel/k_shared_memory.h" | 11 | #include "core/hle/kernel/k_shared_memory.h" |
| 13 | #include "core/hle/kernel/k_transfer_memory.h" | 12 | #include "core/hle/kernel/k_transfer_memory.h" |
| 14 | #include "core/hle/kernel/kernel.h" | 13 | #include "core/hle/kernel/kernel.h" |
| @@ -20,6 +19,7 @@ | |||
| 20 | #include "core/hle/service/hid/irsensor/moment_processor.h" | 19 | #include "core/hle/service/hid/irsensor/moment_processor.h" |
| 21 | #include "core/hle/service/hid/irsensor/pointing_processor.h" | 20 | #include "core/hle/service/hid/irsensor/pointing_processor.h" |
| 22 | #include "core/hle/service/hid/irsensor/tera_plugin_processor.h" | 21 | #include "core/hle/service/hid/irsensor/tera_plugin_processor.h" |
| 22 | #include "core/hle/service/ipc_helpers.h" | ||
| 23 | #include "core/memory.h" | 23 | #include "core/memory.h" |
| 24 | 24 | ||
| 25 | namespace Service::IRS { | 25 | namespace Service::IRS { |
| @@ -56,7 +56,7 @@ IRS::IRS(Core::System& system_) : ServiceFramework{system_, "irs"} { | |||
| 56 | } | 56 | } |
| 57 | IRS::~IRS() = default; | 57 | IRS::~IRS() = default; |
| 58 | 58 | ||
| 59 | void IRS::ActivateIrsensor(Kernel::HLERequestContext& ctx) { | 59 | void IRS::ActivateIrsensor(HLERequestContext& ctx) { |
| 60 | IPC::RequestParser rp{ctx}; | 60 | IPC::RequestParser rp{ctx}; |
| 61 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 61 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 62 | 62 | ||
| @@ -67,7 +67,7 @@ void IRS::ActivateIrsensor(Kernel::HLERequestContext& ctx) { | |||
| 67 | rb.Push(ResultSuccess); | 67 | rb.Push(ResultSuccess); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | void IRS::DeactivateIrsensor(Kernel::HLERequestContext& ctx) { | 70 | void IRS::DeactivateIrsensor(HLERequestContext& ctx) { |
| 71 | IPC::RequestParser rp{ctx}; | 71 | IPC::RequestParser rp{ctx}; |
| 72 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 72 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 73 | 73 | ||
| @@ -78,7 +78,7 @@ void IRS::DeactivateIrsensor(Kernel::HLERequestContext& ctx) { | |||
| 78 | rb.Push(ResultSuccess); | 78 | rb.Push(ResultSuccess); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | void IRS::GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx) { | 81 | void IRS::GetIrsensorSharedMemoryHandle(HLERequestContext& ctx) { |
| 82 | IPC::RequestParser rp{ctx}; | 82 | IPC::RequestParser rp{ctx}; |
| 83 | const auto applet_resource_user_id{rp.Pop<u64>()}; | 83 | const auto applet_resource_user_id{rp.Pop<u64>()}; |
| 84 | 84 | ||
| @@ -89,7 +89,7 @@ void IRS::GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx) { | |||
| 89 | rb.PushCopyObjects(&system.Kernel().GetIrsSharedMem()); | 89 | rb.PushCopyObjects(&system.Kernel().GetIrsSharedMem()); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) { | 92 | void IRS::StopImageProcessor(HLERequestContext& ctx) { |
| 93 | IPC::RequestParser rp{ctx}; | 93 | IPC::RequestParser rp{ctx}; |
| 94 | struct Parameters { | 94 | struct Parameters { |
| 95 | Core::IrSensor::IrCameraHandle camera_handle; | 95 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -117,7 +117,7 @@ void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) { | |||
| 117 | rb.Push(result); | 117 | rb.Push(result); |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | void IRS::RunMomentProcessor(Kernel::HLERequestContext& ctx) { | 120 | void IRS::RunMomentProcessor(HLERequestContext& ctx) { |
| 121 | IPC::RequestParser rp{ctx}; | 121 | IPC::RequestParser rp{ctx}; |
| 122 | struct Parameters { | 122 | struct Parameters { |
| 123 | Core::IrSensor::IrCameraHandle camera_handle; | 123 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -149,7 +149,7 @@ void IRS::RunMomentProcessor(Kernel::HLERequestContext& ctx) { | |||
| 149 | rb.Push(result); | 149 | rb.Push(result); |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) { | 152 | void IRS::RunClusteringProcessor(HLERequestContext& ctx) { |
| 153 | IPC::RequestParser rp{ctx}; | 153 | IPC::RequestParser rp{ctx}; |
| 154 | struct Parameters { | 154 | struct Parameters { |
| 155 | Core::IrSensor::IrCameraHandle camera_handle; | 155 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -182,7 +182,7 @@ void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) { | |||
| 182 | rb.Push(result); | 182 | rb.Push(result); |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { | 185 | void IRS::RunImageTransferProcessor(HLERequestContext& ctx) { |
| 186 | IPC::RequestParser rp{ctx}; | 186 | IPC::RequestParser rp{ctx}; |
| 187 | struct Parameters { | 187 | struct Parameters { |
| 188 | Core::IrSensor::IrCameraHandle camera_handle; | 188 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -231,7 +231,7 @@ void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { | |||
| 231 | rb.Push(result); | 231 | rb.Push(result); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | void IRS::GetImageTransferProcessorState(Kernel::HLERequestContext& ctx) { | 234 | void IRS::GetImageTransferProcessorState(HLERequestContext& ctx) { |
| 235 | IPC::RequestParser rp{ctx}; | 235 | IPC::RequestParser rp{ctx}; |
| 236 | struct Parameters { | 236 | struct Parameters { |
| 237 | Core::IrSensor::IrCameraHandle camera_handle; | 237 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -272,7 +272,7 @@ void IRS::GetImageTransferProcessorState(Kernel::HLERequestContext& ctx) { | |||
| 272 | rb.PushRaw(state); | 272 | rb.PushRaw(state); |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | void IRS::RunTeraPluginProcessor(Kernel::HLERequestContext& ctx) { | 275 | void IRS::RunTeraPluginProcessor(HLERequestContext& ctx) { |
| 276 | IPC::RequestParser rp{ctx}; | 276 | IPC::RequestParser rp{ctx}; |
| 277 | struct Parameters { | 277 | struct Parameters { |
| 278 | Core::IrSensor::IrCameraHandle camera_handle; | 278 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -308,7 +308,7 @@ void IRS::RunTeraPluginProcessor(Kernel::HLERequestContext& ctx) { | |||
| 308 | rb.Push(result); | 308 | rb.Push(result); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | void IRS::GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx) { | 311 | void IRS::GetNpadIrCameraHandle(HLERequestContext& ctx) { |
| 312 | IPC::RequestParser rp{ctx}; | 312 | IPC::RequestParser rp{ctx}; |
| 313 | const auto npad_id{rp.PopEnum<Core::HID::NpadIdType>()}; | 313 | const auto npad_id{rp.PopEnum<Core::HID::NpadIdType>()}; |
| 314 | 314 | ||
| @@ -332,7 +332,7 @@ void IRS::GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx) { | |||
| 332 | rb.PushRaw(camera_handle); | 332 | rb.PushRaw(camera_handle); |
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | void IRS::RunPointingProcessor(Kernel::HLERequestContext& ctx) { | 335 | void IRS::RunPointingProcessor(HLERequestContext& ctx) { |
| 336 | IPC::RequestParser rp{ctx}; | 336 | IPC::RequestParser rp{ctx}; |
| 337 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; | 337 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; |
| 338 | const auto processor_config{rp.PopRaw<Core::IrSensor::PackedPointingProcessorConfig>()}; | 338 | const auto processor_config{rp.PopRaw<Core::IrSensor::PackedPointingProcessorConfig>()}; |
| @@ -359,7 +359,7 @@ void IRS::RunPointingProcessor(Kernel::HLERequestContext& ctx) { | |||
| 359 | rb.Push(result); | 359 | rb.Push(result); |
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { | 362 | void IRS::SuspendImageProcessor(HLERequestContext& ctx) { |
| 363 | IPC::RequestParser rp{ctx}; | 363 | IPC::RequestParser rp{ctx}; |
| 364 | struct Parameters { | 364 | struct Parameters { |
| 365 | Core::IrSensor::IrCameraHandle camera_handle; | 365 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -385,7 +385,7 @@ void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { | |||
| 385 | rb.Push(result); | 385 | rb.Push(result); |
| 386 | } | 386 | } |
| 387 | 387 | ||
| 388 | void IRS::CheckFirmwareVersion(Kernel::HLERequestContext& ctx) { | 388 | void IRS::CheckFirmwareVersion(HLERequestContext& ctx) { |
| 389 | IPC::RequestParser rp{ctx}; | 389 | IPC::RequestParser rp{ctx}; |
| 390 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; | 390 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; |
| 391 | const auto mcu_version{rp.PopRaw<Core::IrSensor::PackedMcuVersion>()}; | 391 | const auto mcu_version{rp.PopRaw<Core::IrSensor::PackedMcuVersion>()}; |
| @@ -407,7 +407,7 @@ void IRS::CheckFirmwareVersion(Kernel::HLERequestContext& ctx) { | |||
| 407 | rb.Push(result); | 407 | rb.Push(result); |
| 408 | } | 408 | } |
| 409 | 409 | ||
| 410 | void IRS::SetFunctionLevel(Kernel::HLERequestContext& ctx) { | 410 | void IRS::SetFunctionLevel(HLERequestContext& ctx) { |
| 411 | IPC::RequestParser rp{ctx}; | 411 | IPC::RequestParser rp{ctx}; |
| 412 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; | 412 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; |
| 413 | const auto function_level{rp.PopRaw<Core::IrSensor::PackedFunctionLevel>()}; | 413 | const auto function_level{rp.PopRaw<Core::IrSensor::PackedFunctionLevel>()}; |
| @@ -429,7 +429,7 @@ void IRS::SetFunctionLevel(Kernel::HLERequestContext& ctx) { | |||
| 429 | rb.Push(result); | 429 | rb.Push(result); |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { | 432 | void IRS::RunImageTransferExProcessor(HLERequestContext& ctx) { |
| 433 | IPC::RequestParser rp{ctx}; | 433 | IPC::RequestParser rp{ctx}; |
| 434 | struct Parameters { | 434 | struct Parameters { |
| 435 | Core::IrSensor::IrCameraHandle camera_handle; | 435 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -469,7 +469,7 @@ void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { | |||
| 469 | rb.Push(result); | 469 | rb.Push(result); |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | void IRS::RunIrLedProcessor(Kernel::HLERequestContext& ctx) { | 472 | void IRS::RunIrLedProcessor(HLERequestContext& ctx) { |
| 473 | IPC::RequestParser rp{ctx}; | 473 | IPC::RequestParser rp{ctx}; |
| 474 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; | 474 | const auto camera_handle{rp.PopRaw<Core::IrSensor::IrCameraHandle>()}; |
| 475 | const auto processor_config{rp.PopRaw<Core::IrSensor::PackedIrLedProcessorConfig>()}; | 475 | const auto processor_config{rp.PopRaw<Core::IrSensor::PackedIrLedProcessorConfig>()}; |
| @@ -497,7 +497,7 @@ void IRS::RunIrLedProcessor(Kernel::HLERequestContext& ctx) { | |||
| 497 | rb.Push(result); | 497 | rb.Push(result); |
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | void IRS::StopImageProcessorAsync(Kernel::HLERequestContext& ctx) { | 500 | void IRS::StopImageProcessorAsync(HLERequestContext& ctx) { |
| 501 | IPC::RequestParser rp{ctx}; | 501 | IPC::RequestParser rp{ctx}; |
| 502 | struct Parameters { | 502 | struct Parameters { |
| 503 | Core::IrSensor::IrCameraHandle camera_handle; | 503 | Core::IrSensor::IrCameraHandle camera_handle; |
| @@ -525,7 +525,7 @@ void IRS::StopImageProcessorAsync(Kernel::HLERequestContext& ctx) { | |||
| 525 | rb.Push(result); | 525 | rb.Push(result); |
| 526 | } | 526 | } |
| 527 | 527 | ||
| 528 | void IRS::ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx) { | 528 | void IRS::ActivateIrsensorWithFunctionLevel(HLERequestContext& ctx) { |
| 529 | IPC::RequestParser rp{ctx}; | 529 | IPC::RequestParser rp{ctx}; |
| 530 | struct Parameters { | 530 | struct Parameters { |
| 531 | Core::IrSensor::PackedFunctionLevel function_level; | 531 | Core::IrSensor::PackedFunctionLevel function_level; |
diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h index b76ad7854..a8fa19025 100644 --- a/src/core/hle/service/hid/irs.h +++ b/src/core/hle/service/hid/irs.h | |||
| @@ -38,24 +38,24 @@ private: | |||
| 38 | }; | 38 | }; |
| 39 | static_assert(sizeof(StatusManager) == 0x8000, "StatusManager is an invalid size"); | 39 | static_assert(sizeof(StatusManager) == 0x8000, "StatusManager is an invalid size"); |
| 40 | 40 | ||
| 41 | void ActivateIrsensor(Kernel::HLERequestContext& ctx); | 41 | void ActivateIrsensor(HLERequestContext& ctx); |
| 42 | void DeactivateIrsensor(Kernel::HLERequestContext& ctx); | 42 | void DeactivateIrsensor(HLERequestContext& ctx); |
| 43 | void GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx); | 43 | void GetIrsensorSharedMemoryHandle(HLERequestContext& ctx); |
| 44 | void StopImageProcessor(Kernel::HLERequestContext& ctx); | 44 | void StopImageProcessor(HLERequestContext& ctx); |
| 45 | void RunMomentProcessor(Kernel::HLERequestContext& ctx); | 45 | void RunMomentProcessor(HLERequestContext& ctx); |
| 46 | void RunClusteringProcessor(Kernel::HLERequestContext& ctx); | 46 | void RunClusteringProcessor(HLERequestContext& ctx); |
| 47 | void RunImageTransferProcessor(Kernel::HLERequestContext& ctx); | 47 | void RunImageTransferProcessor(HLERequestContext& ctx); |
| 48 | void GetImageTransferProcessorState(Kernel::HLERequestContext& ctx); | 48 | void GetImageTransferProcessorState(HLERequestContext& ctx); |
| 49 | void RunTeraPluginProcessor(Kernel::HLERequestContext& ctx); | 49 | void RunTeraPluginProcessor(HLERequestContext& ctx); |
| 50 | void GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx); | 50 | void GetNpadIrCameraHandle(HLERequestContext& ctx); |
| 51 | void RunPointingProcessor(Kernel::HLERequestContext& ctx); | 51 | void RunPointingProcessor(HLERequestContext& ctx); |
| 52 | void SuspendImageProcessor(Kernel::HLERequestContext& ctx); | 52 | void SuspendImageProcessor(HLERequestContext& ctx); |
| 53 | void CheckFirmwareVersion(Kernel::HLERequestContext& ctx); | 53 | void CheckFirmwareVersion(HLERequestContext& ctx); |
| 54 | void SetFunctionLevel(Kernel::HLERequestContext& ctx); | 54 | void SetFunctionLevel(HLERequestContext& ctx); |
| 55 | void RunImageTransferExProcessor(Kernel::HLERequestContext& ctx); | 55 | void RunImageTransferExProcessor(HLERequestContext& ctx); |
| 56 | void RunIrLedProcessor(Kernel::HLERequestContext& ctx); | 56 | void RunIrLedProcessor(HLERequestContext& ctx); |
| 57 | void StopImageProcessorAsync(Kernel::HLERequestContext& ctx); | 57 | void StopImageProcessorAsync(HLERequestContext& ctx); |
| 58 | void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx); | 58 | void ActivateIrsensorWithFunctionLevel(HLERequestContext& ctx); |
| 59 | 59 | ||
| 60 | Result IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const; | 60 | Result IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const; |
| 61 | Core::IrSensor::DeviceFormat& GetIrCameraSharedMemoryDeviceEntry( | 61 | Core::IrSensor::DeviceFormat& GetIrCameraSharedMemoryDeviceEntry( |