diff options
| author |  liamwhite | 2023-06-29 10:01:19 -0400 |
|---|---|---|
| committer |  GitHub | 2023-06-29 10:01:19 -0400 |
| commit | 4c705db73edfa3c7210eb5821b3f4e5324d642d1 (patch) | |
| tree | 470116d2d52b3a74ad0cd761304f0f65386af708 /src/common | |
| parent | Merge pull request #10946 from goldenx86/amdBlending (diff) | |
| parent | input_common: Allow timeouts to happen while scanning for a ring (diff) | |
| download | yuzu-4c705db73edfa3c7210eb5821b3f4e5324d642d1.tar.gz yuzu-4c705db73edfa3c7210eb5821b3f4e5324d642d1.tar.xz yuzu-4c705db73edfa3c7210eb5821b3f4e5324d642d1.zip | |
Merge pull request #10937 from german77/ring
input_common: Remove duplicated enum and fix ring detection
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/input.h b/src/common/input.h index ea30770ae..2c4ccea22 100644 --- a/src/common/input.h +++ b/src/common/input.h | |||
| @@ -75,8 +75,10 @@ enum class DriverResult { | |||
| 75 | ErrorWritingData, | 75 | ErrorWritingData, |
| 76 | NoDeviceDetected, | 76 | NoDeviceDetected, |
| 77 | InvalidHandle, | 77 | InvalidHandle, |
| 78 | InvalidParameters, | ||
| 78 | NotSupported, | 79 | NotSupported, |
| 79 | Disabled, | 80 | Disabled, |
| 81 | Delayed, | ||
| 80 | Unknown, | 82 | Unknown, |
| 81 | }; | 83 | }; |
| 82 | 84 | ||