From 37ff33b0a2c5493933b4d4d49cbcc3887f78733f Mon Sep 17 00:00:00 2001 From: Zerocker Date: Sun, 24 May 2020 23:49:49 +0900 Subject: [PATCH] Added blank SDL functions for rumble support. --- src/pc/controller/controller_entry_point.c | 13 ++++++++++++- src/pc/controller/controller_sdl.c | 12 ++++++++++++ src/pc/controller/controller_sdl.h | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/pc/controller/controller_entry_point.c b/src/pc/controller/controller_entry_point.c index 90c10c1d..4887c6ff 100644 --- a/src/pc/controller/controller_entry_point.c +++ b/src/pc/controller/controller_entry_point.c @@ -3,7 +3,6 @@ #include "controller_recorded_tas.h" #include "controller_keyboard.h" - #include "controller_sdl.h" // Analog camera movement by Pathétique (github.com/vrmiguel), y0shin and Mors @@ -28,6 +27,18 @@ s32 osContInit(OSMesgQueue *mq, u8 *controllerBits, OSContStatus *status) { return 0; } +s32 osMotorStart(void *pfs) { + return controller_rumble_play(0.5, 1000); +} + +s32 osMotorStop(void *pfs) { + return controller_rumble_stop(); +} + +u32 osMotorInit(OSMesgQueue *mq, void *pfs, s32 port) { + return controller_rumble_init(); +} + s32 osContStartReadData(OSMesgQueue *mesg) { return 0; } diff --git a/src/pc/controller/controller_sdl.c b/src/pc/controller/controller_sdl.c index cbdd6178..7690e785 100644 --- a/src/pc/controller/controller_sdl.c +++ b/src/pc/controller/controller_sdl.c @@ -217,6 +217,18 @@ static void controller_sdl_shutdown(void) { init_ok = false; } +s32 controller_rumble_init(void) { + return 0; +} + +s32 controller_rumble_play(f32 strength, u32 length) { + return 0; +} + +s32 controller_rumble_stop(void) { + return 0; +} + struct ControllerAPI controller_sdl = { VK_BASE_SDL_GAMEPAD, controller_sdl_init, diff --git a/src/pc/controller/controller_sdl.h b/src/pc/controller/controller_sdl.h index bbe8a62c..8a3a587c 100644 --- a/src/pc/controller/controller_sdl.h +++ b/src/pc/controller/controller_sdl.h @@ -7,4 +7,8 @@ extern struct ControllerAPI controller_sdl; +s32 controller_rumble_init(void); +s32 controller_rumble_play(f32 strength, u32 length); +s32 controller_rumble_stop(void); + #endif