Fix #if-#endif declaration for WII mode

Loc15 · May 31, 2024 · 4e40c86 · 4e40c86
1 parent c4a6a31
commit 4e40c86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/convert_data.c b/src/convert_data.c
@@ -5,7 +5,9 @@
 #include "SwitchDescriptors.h"
 #include "PS3_Descriptors.h"
 #include "controller_simulator.h"
-#include "wiimote.h"
+#if PICO_W
+    #include "wiimote.h"
+#endif
 //Host
 #include "xinput_definitions.h"
 #include "hid_definitions.h"
@@ -23,9 +25,11 @@
 
 #define KEYBOARD_MASK_REVERSE(a,b)    ((a >> b)&1)
 
-#define XINPUT_TO_WIIMOTE(a) ((a>>8))
-#define XINPUT_TO_CLASSIC_X(a) ((a>>10) + 32)
-#define XINPUT_TO_CLASSIC_Y(a) ((a>>11) + 32)
+#if PICO_W
+    #define XINPUT_TO_WIIMOTE(a) ((a>>8))
+    #define XINPUT_TO_CLASSIC_X(a) ((a>>10) + 32)
+    #define XINPUT_TO_CLASSIC_Y(a) ((a>>11) + 32)
+#endif
 
 /*XINPUT TO SWITCH*/
 const uint8_t SWITCH_DEVICE_HAT[] = {SWITCH_HAT_NOTHING, SWITCH_HAT_UP, SWITCH_HAT_DOWN, SWITCH_HAT_NOTHING, SWITCH_HAT_LEFT, 
@@ -300,6 +304,7 @@ void new_report_fun(void *report, MODE mode_host, void *new_report, MODE mode_de
         }
             break;
         case WII: {
+#if PICO_W
             WiimoteReport *device_report = new_report;
 
             // No guide button for some controllers then using right thumbstick
@@ -449,6 +454,7 @@ void new_report_fun(void *report, MODE mode_host, void *new_report, MODE mode_de
                         }
                     }
             }
+#endif
         }
             break;
         default:

diff --git a/src/main.c b/src/main.c
@@ -116,6 +116,7 @@ static PSXInputState psxReport = {
         .r2 = 0x00
 };
 
+#if PICO_W
 static WiimoteReport wiimote_report = {
         .wiimote = {0},
         .nunchuk = {0},
@@ -125,6 +126,7 @@ static WiimoteReport wiimote_report = {
         .fake_motion = 0,
         .center_accel = 0
 };
+#endif
 
 /*------------- MAIN -------------*/
 
@@ -236,8 +238,8 @@ int main(void) {
             btstack_hid(&switchReport);
 #endif
             break;
-#if PICO_W
         case WII:
+#if PICO_W
             // Set led functions
             wiimote_emulator_set_led(led_on, led_off);
             // Wiimote emulator
@@ -369,7 +371,9 @@ static void sendReportData(void *original_data) {
             new_report_fun(original_data, HOST, &psxReport, PSX);
             break;
         case WII:
+#if PICO_W
             new_report_fun(original_data, HOST, &wiimote_report, WII);
+#endif
             break;
         default:
             break;