diff options
| author | 2022-12-26 12:49:49 -0600 | |
|---|---|---|
| committer | 2023-01-19 18:05:22 -0600 | |
| commit | 5cb437703fa441a08db295f8a916caedc3a581f2 (patch) | |
| tree | 148c35e47d18462f0b8f8e116e2247b4cbfdbde2 /src/core/hle | |
| parent | input_common: Use DriverResult on all engines (diff) | |
| download | yuzu-5cb437703fa441a08db295f8a916caedc3a581f2.tar.gz yuzu-5cb437703fa441a08db295f8a916caedc3a581f2.tar.xz yuzu-5cb437703fa441a08db295f8a916caedc3a581f2.zip | |
yuzu: Add ring controller test button
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/nfc/nfc_device.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp_device.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp index 78578f723..c9815edbc 100644 --- a/src/core/hle/service/nfc/nfc_device.cpp +++ b/src/core/hle/service/nfc/nfc_device.cpp | |||
| @@ -130,7 +130,8 @@ Result NfcDevice::StartDetection(NFP::TagProtocol allowed_protocol) { | |||
| 130 | return WrongDeviceState; | 130 | return WrongDeviceState; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | if (!npad_device->SetPollingMode(Common::Input::PollingMode::NFC)) { | 133 | if (npad_device->SetPollingMode(Common::Input::PollingMode::NFC) != |
| 134 | Common::Input::DriverResult::Success) { | ||
| 134 | LOG_ERROR(Service_NFC, "Nfc not supported"); | 135 | LOG_ERROR(Service_NFC, "Nfc not supported"); |
| 135 | return NfcDisabled; | 136 | return NfcDisabled; |
| 136 | } | 137 | } |
diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index c860fd1a1..7b8013961 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp | |||
| @@ -152,7 +152,8 @@ Result NfpDevice::StartDetection(TagProtocol allowed_protocol) { | |||
| 152 | return WrongDeviceState; | 152 | return WrongDeviceState; |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | if (!npad_device->SetPollingMode(Common::Input::PollingMode::NFC)) { | 155 | if (npad_device->SetPollingMode(Common::Input::PollingMode::NFC) != |
| 156 | Common::Input::DriverResult::Success) { | ||
| 156 | LOG_ERROR(Service_NFP, "Nfc not supported"); | 157 | LOG_ERROR(Service_NFP, "Nfc not supported"); |
| 157 | return NfcDisabled; | 158 | return NfcDisabled; |
| 158 | } | 159 | } |