diff options
| author | 2023-02-11 13:28:03 -0500 | |
|---|---|---|
| committer | 2023-02-14 12:33:11 -0500 | |
| commit | 45e13b03f372230dbf780f3fa87dd88f388af605 (patch) | |
| tree | 555593e7e5016b6ba2a777d7417ada244abce458 /src/input_common/drivers/gc_adapter.cpp | |
| parent | Merge pull request #9795 from Kelebek1/biquad_fix (diff) | |
| download | yuzu-45e13b03f372230dbf780f3fa87dd88f388af605.tar.gz yuzu-45e13b03f372230dbf780f3fa87dd88f388af605.tar.xz yuzu-45e13b03f372230dbf780f3fa87dd88f388af605.zip | |
add static lifetime to constexpr values to force compile time evaluation where possible
Signed-off-by: arades79 <scravers@protonmail.com>
Diffstat (limited to 'src/input_common/drivers/gc_adapter.cpp')
| -rw-r--r-- | src/input_common/drivers/gc_adapter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index d09ff178b..a4faab15e 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp | |||
| @@ -223,8 +223,8 @@ void GCAdapter::AdapterScanThread(std::stop_token stop_token) { | |||
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | bool GCAdapter::Setup() { | 225 | bool GCAdapter::Setup() { |
| 226 | constexpr u16 nintendo_vid = 0x057e; | 226 | constexpr static u16 nintendo_vid = 0x057e; |
| 227 | constexpr u16 gc_adapter_pid = 0x0337; | 227 | constexpr static u16 gc_adapter_pid = 0x0337; |
| 228 | usb_adapter_handle = | 228 | usb_adapter_handle = |
| 229 | std::make_unique<LibUSBDeviceHandle>(libusb_ctx->get(), nintendo_vid, gc_adapter_pid); | 229 | std::make_unique<LibUSBDeviceHandle>(libusb_ctx->get(), nintendo_vid, gc_adapter_pid); |
| 230 | if (!usb_adapter_handle->get()) { | 230 | if (!usb_adapter_handle->get()) { |
| @@ -346,7 +346,7 @@ void GCAdapter::UpdateVibrations() { | |||
| 346 | // Use 8 states to keep the switching between on/off fast enough for | 346 | // Use 8 states to keep the switching between on/off fast enough for |
| 347 | // a human to feel different vibration strenght | 347 | // a human to feel different vibration strenght |
| 348 | // More states == more rumble strengths == slower update time | 348 | // More states == more rumble strengths == slower update time |
| 349 | constexpr u8 vibration_states = 8; | 349 | constexpr static u8 vibration_states = 8; |
| 350 | 350 | ||
| 351 | vibration_counter = (vibration_counter + 1) % vibration_states; | 351 | vibration_counter = (vibration_counter + 1) % vibration_states; |
| 352 | 352 | ||
| @@ -363,7 +363,7 @@ void GCAdapter::SendVibrations() { | |||
| 363 | return; | 363 | return; |
| 364 | } | 364 | } |
| 365 | s32 size{}; | 365 | s32 size{}; |
| 366 | constexpr u8 rumble_command = 0x11; | 366 | constexpr static u8 rumble_command = 0x11; |
| 367 | const u8 p1 = pads[0].enable_vibration; | 367 | const u8 p1 = pads[0].enable_vibration; |
| 368 | const u8 p2 = pads[1].enable_vibration; | 368 | const u8 p2 = pads[1].enable_vibration; |
| 369 | const u8 p3 = pads[2].enable_vibration; | 369 | const u8 p3 = pads[2].enable_vibration; |