input

src/backend/core/mmio/CMakeLists.txt

@@ -1,4 +1,8 @@
 file(GLOB_RECURSE SOURCES *.cpp)
 file(GLOB_RECURSE HEADERS *.hpp)
 
-add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp)
+find_package(gainput REQUIRED)
+
+add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp)
+
+target_link_libraries(mmio PRIVATE gainput)

src/backend/core/mmio/PIF.cpp

@@ -186,6 +186,7 @@ void PIF::ProcessCommands(Mem &mem) {
             channel++;
             break;
           case 1:
+            UpdateController();
             if(!ReadButtons(res)) {
               cmd[1] |= 0x80;
             }
@@ -333,8 +334,8 @@ void PIF::EepromWrite(const u8* cmd, u8* res, const Mem& mem) {
   }
 }
 
-void PIF::UpdateController(Controller value) {
-  joybusDevices[channel].controller = value;
+void PIF::UpdateController() {
+  //joybusDevices[channel].controller = value;
 
   if (joybusDevices[channel].controller.joy_reset) {
     joybusDevices[channel].controller.start = false;

src/backend/core/mmio/PIF.hpp

@@ -115,7 +115,7 @@ struct PIF {
   void CICChallenge();
   static void ExecutePIF(Mem& mem, Registers& regs);
   static void DoPIFHLE(Mem& mem, Registers& regs, bool pal, CICType cicType);
-  void UpdateController(Controller);
+  void UpdateController();
   bool ReadButtons(u8*) const;
   void ControllerID(u8*) const;
   void MempakRead(const u8*, u8*);