summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid/hid.cpp39
-rw-r--r--src/yuzu_cmd/CMakeLists.txt1
-rw-r--r--src/yuzu_cmd/resource.h16
3 files changed, 38 insertions, 18 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 4c1c0ac68..2aa1942cb 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -19,6 +19,7 @@
19#include "core/hle/kernel/k_shared_memory.h" 19#include "core/hle/kernel/k_shared_memory.h"
20#include "core/hle/kernel/k_writable_event.h" 20#include "core/hle/kernel/k_writable_event.h"
21#include "core/hle/kernel/kernel.h" 21#include "core/hle/kernel/kernel.h"
22#include "core/hle/kernel/transfer_memory.h"
22#include "core/hle/service/hid/errors.h" 23#include "core/hle/service/hid/errors.h"
23#include "core/hle/service/hid/hid.h" 24#include "core/hle/service/hid/hid.h"
24#include "core/hle/service/hid/irs.h" 25#include "core/hle/service/hid/irs.h"
@@ -1484,7 +1485,43 @@ void Hid::StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx) {
1484} 1485}
1485 1486
1486void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { 1487void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) {
1487 LOG_WARNING(Service_HID, "(STUBBED) called"); 1488 IPC::RequestParser rp{ctx};
1489 const auto applet_resource_user_id{rp.Pop<u64>()};
1490 const auto t_mem_1_size{rp.Pop<u64>()};
1491 const auto t_mem_2_size{rp.Pop<u64>()};
1492 const auto t_mem_1_handle{ctx.GetCopyHandle(0)};
1493 const auto t_mem_2_handle{ctx.GetCopyHandle(1)};
1494
1495 ASSERT_MSG(t_mem_1_size == 0x1000, "t_mem_1_size is not 0x1000 bytes");
1496 ASSERT_MSG(t_mem_2_size == 0x7F000, "t_mem_2_size is not 0x7F000 bytes");
1497
1498 auto t_mem_1 =
1499 system.CurrentProcess()->GetHandleTable().Get<Kernel::TransferMemory>(t_mem_1_handle);
1500
1501 if (t_mem_1 == nullptr) {
1502 LOG_ERROR(Service_HID, "t_mem_1 is a nullptr for handle=0x{:08X}", t_mem_1_handle);
1503 IPC::ResponseBuilder rb{ctx, 2};
1504 rb.Push(RESULT_UNKNOWN);
1505 return;
1506 }
1507
1508 auto t_mem_2 =
1509 system.CurrentProcess()->GetHandleTable().Get<Kernel::TransferMemory>(t_mem_2_handle);
1510
1511 if (t_mem_2 == nullptr) {
1512 LOG_ERROR(Service_HID, "t_mem_2 is a nullptr for handle=0x{:08X}", t_mem_2_handle);
1513 IPC::ResponseBuilder rb{ctx, 2};
1514 rb.Push(RESULT_UNKNOWN);
1515 return;
1516 }
1517
1518 ASSERT_MSG(t_mem_1->GetSize() == 0x1000, "t_mem_1 has incorrect size");
1519 ASSERT_MSG(t_mem_2->GetSize() == 0x7F000, "t_mem_2 has incorrect size");
1520
1521 LOG_WARNING(Service_HID,
1522 "(STUBBED) called, t_mem_1_handle=0x{:08X}, t_mem_2_handle=0x{:08X}, "
1523 "applet_resource_user_id={}",
1524 t_mem_1_handle, t_mem_2_handle, applet_resource_user_id);
1488 1525
1489 IPC::ResponseBuilder rb{ctx, 2}; 1526 IPC::ResponseBuilder rb{ctx, 2};
1490 rb.Push(RESULT_SUCCESS); 1527 rb.Push(RESULT_SUCCESS);
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 8461f8896..4bf25727b 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -20,7 +20,6 @@ add_executable(yuzu-cmd
20 emu_window/emu_window_sdl2_gl.h 20 emu_window/emu_window_sdl2_gl.h
21 emu_window/emu_window_sdl2_vk.cpp 21 emu_window/emu_window_sdl2_vk.cpp
22 emu_window/emu_window_sdl2_vk.h 22 emu_window/emu_window_sdl2_vk.h
23 resource.h
24 yuzu.cpp 23 yuzu.cpp
25 yuzu.rc 24 yuzu.rc
26) 25)
diff --git a/src/yuzu_cmd/resource.h b/src/yuzu_cmd/resource.h
deleted file mode 100644
index df8e459e4..000000000
--- a/src/yuzu_cmd/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
1//{{NO_DEPENDENCIES}}
2// Microsoft Visual C++ generated include file.
3// Used by pcafe.rc
4//
5#define IDI_ICON3 103
6
7// Next default values for new objects
8//
9#ifdef APSTUDIO_INVOKED
10#ifndef APSTUDIO_READONLY_SYMBOLS
11#define _APS_NEXT_RESOURCE_VALUE 105
12#define _APS_NEXT_COMMAND_VALUE 40001
13#define _APS_NEXT_CONTROL_VALUE 1001
14#define _APS_NEXT_SYMED_VALUE 101
15#endif
16#endif