diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-10-09 23:46:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 23:46:45 +0200 |
| commit | c3cae9d99263afd46a1d3205b29cfa62bebd18b3 (patch) | |
| tree | ec1f256daf46822a808a5abbab415bb6137ecd75 /src/core | |
| parent | Merge pull request #8766 from Kelebek1/regs (diff) | |
| parent | input_common: have an unique vector in callback status (diff) | |
| download | yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.gz yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.bz2 yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.lz yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.xz yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.zst yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hid/input_converter.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index fe9915abe..5d8b75b50 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -277,7 +277,10 @@ Common::Input::CameraStatus TransformToCamera(const Common::Input::CallbackStatu Common::Input::CameraStatus camera{}; switch (callback.type) { case Common::Input::InputType::IrSensor: - camera = callback.camera_status; + camera = { + .format = callback.camera_status, + .data = callback.raw_data, + }; break; default: LOG_ERROR(Input, "Conversion from type {} to camera not implemented", callback.type); @@ -291,7 +294,10 @@ Common::Input::NfcStatus TransformToNfc(const Common::Input::CallbackStatus& cal Common::Input::NfcStatus nfc{}; switch (callback.type) { case Common::Input::InputType::Nfc: - return callback.nfc_status; + nfc = { + .state = callback.nfc_status, + .data = callback.raw_data, + }; break; default: LOG_ERROR(Input, "Conversion from type {} to NFC not implemented", callback.type); |