From df4bbcf2d700cc785304fce0cc79b4b0774443a3 Mon Sep 17 00:00:00 2001 From: yellows8 Date: Fri, 1 Nov 2019 19:11:18 -0400 Subject: [PATCH] Use const for various hid vibration funcs. --- nx/include/switch/services/hid.h | 10 +++++----- nx/source/services/hid.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nx/include/switch/services/hid.h b/nx/include/switch/services/hid.h index b2c6b21a..8d39f23b 100644 --- a/nx/include/switch/services/hid.h +++ b/nx/include/switch/services/hid.h @@ -797,13 +797,13 @@ Result hidMergeSingleJoyAsDualJoy(HidControllerID id0, HidControllerID id1); Result hidInitializeVibrationDevices(u32 *VibrationDeviceHandles, s32 total_handles, HidControllerID id, HidControllerType type); /// Gets HidVibrationDeviceInfo for the specified VibrationDeviceHandle. -Result hidGetVibrationDeviceInfo(u32 *VibrationDeviceHandle, HidVibrationDeviceInfo *VibrationDeviceInfo); +Result hidGetVibrationDeviceInfo(const u32 *VibrationDeviceHandle, HidVibrationDeviceInfo *VibrationDeviceInfo); /// Send the VibrationValue to the specified VibrationDeviceHandle. -Result hidSendVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue); +Result hidSendVibrationValue(const u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue); /// Gets the current HidVibrationValue for the specified VibrationDeviceHandle. -Result hidGetActualVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue); +Result hidGetActualVibrationValue(const u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue); /// Sets whether vibration is allowed, this also affects the config displayed by System Settings. Result hidPermitVibration(bool flag); @@ -812,10 +812,10 @@ Result hidPermitVibration(bool flag); Result hidIsVibrationPermitted(bool *flag); /// Send VibrationValues[index] to VibrationDeviceHandles[index], where count is the number of entries in the VibrationDeviceHandles/VibrationValues arrays. -Result hidSendVibrationValues(u32 *VibrationDeviceHandles, HidVibrationValue *VibrationValues, s32 count); +Result hidSendVibrationValues(const u32 *VibrationDeviceHandles, HidVibrationValue *VibrationValues, s32 count); /// Gets whether vibration is available with the specified device. Only available on [7.0.0+]. -Result hidIsVibrationDeviceMounted(u32 *VibrationDeviceHandle, bool *flag); +Result hidIsVibrationDeviceMounted(const u32 *VibrationDeviceHandle, bool *flag); /// Gets SixAxisSensorHandles. total_handles==2 can only be used with TYPE_JOYCON_PAIR. Result hidGetSixAxisSensorHandles(u32 *SixAxisSensorHandles, s32 total_handles, HidControllerID id, HidControllerType type); diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 7ab7e615..a9cda9e4 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -859,11 +859,11 @@ static Result _hidActivateVibrationDevice(Service* srv, u32 VibrationDeviceHandl return _hidCmdInU32NoOut(srv, VibrationDeviceHandle, 0); } -Result hidGetVibrationDeviceInfo(u32 *VibrationDeviceHandle, HidVibrationDeviceInfo *VibrationDeviceInfo) { +Result hidGetVibrationDeviceInfo(const u32 *VibrationDeviceHandle, HidVibrationDeviceInfo *VibrationDeviceInfo) { return serviceDispatchInOut(&g_hidSrv, 200, *VibrationDeviceHandle, *VibrationDeviceInfo); } -Result hidSendVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue) { +Result hidSendVibrationValue(const u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue) { Result rc; u64 AppletResourceUserId; @@ -883,7 +883,7 @@ Result hidSendVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue *Vibr ); } -Result hidGetActualVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue) { +Result hidGetActualVibrationValue(const u32 *VibrationDeviceHandle, HidVibrationValue *VibrationValue) { Result rc; u64 AppletResourceUserId; @@ -909,7 +909,7 @@ Result hidIsVibrationPermitted(bool *flag) { return _hidCmdNoInOutBool(flag, 205); } -Result hidSendVibrationValues(u32 *VibrationDeviceHandles, HidVibrationValue *VibrationValues, s32 count) { +Result hidSendVibrationValues(const u32 *VibrationDeviceHandles, HidVibrationValue *VibrationValues, s32 count) { Result rc; u64 AppletResourceUserId; @@ -929,7 +929,7 @@ Result hidSendVibrationValues(u32 *VibrationDeviceHandles, HidVibrationValue *Vi ); } -Result hidIsVibrationDeviceMounted(u32 *VibrationDeviceHandle, bool *flag) { +Result hidIsVibrationDeviceMounted(const u32 *VibrationDeviceHandle, bool *flag) { if (hosversionBefore(7,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);