[rpcsx-os] hid: fix R3 button mapping

RPCSX · Aug 7, 2023 · dce6674 · dce6674
1 parent 6358be3
commit dce6674
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/rpcsx-gpu/main.cpp b/rpcsx-gpu/main.cpp
@@ -850,7 +850,7 @@ int main(int argc, const char *argv[]) {
         bridge->kbPadState.r2 = 0xff;
       }
       if (glfwGetKey(window, GLFW_KEY_APOSTROPHE) == GLFW_PRESS) {
-        bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL3;
+        bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR3;
       }
 
       if (glfwGetKey(window, GLFW_KEY_ENTER) == GLFW_PRESS) {

diff --git a/rpcsx-os/linker.cpp b/rpcsx-os/linker.cpp
@@ -10,9 +10,7 @@
 #include <bit>
 #include <crypto/sha1.h>
 #include <elf.h>
-#include <fstream>
 #include <map>
-#include <memory>
 #include <orbis/thread/Process.hpp>
 #include <sys/mman.h>
 #include <unordered_map>
@@ -34,10 +32,8 @@ static std::vector<std::byte> unself(const std::byte *image, std::size_t size) {
     std::uint16_t unk1;
     std::uint32_t padding3;
   };
-
-  static_assert(0x18 == 24);
-
   static_assert(sizeof(Header) == 0x20);
+
   struct [[gnu::packed]] Segment {
     std::uint64_t flags;
     std::uint64_t offset;