From df9685a21c105962e90dbd95133c5a1bcef7886f Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Wed, 28 Jun 2023 00:20:38 -0600
Subject: input_common: Remove duplicated DriverResult enum
---
src/input_common/helpers/joycon_protocol/irs.h | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
(limited to 'src/input_common/helpers/joycon_protocol/irs.h')
diff --git a/src/input_common/helpers/joycon_protocol/irs.h b/src/input_common/helpers/joycon_protocol/irs.h
index 76dfa02ea5..714cbb6b2a 100644
--- a/src/input_common/helpers/joycon_protocol/irs.h
+++ b/src/input_common/helpers/joycon_protocol/irs.h
@@ -13,19 +13,23 @@
#include "input_common/helpers/joycon_protocol/common_protocol.h"
#include "input_common/helpers/joycon_protocol/joycon_types.h"
+namespace Common::Input {
+enum class DriverResult;
+}
+
namespace InputCommon::Joycon {
class IrsProtocol final : private JoyconCommonProtocol {
public:
explicit IrsProtocol(std::shared_ptr<JoyconHandle> handle);
- DriverResult EnableIrs();
+ Common::Input::DriverResult EnableIrs();
- DriverResult DisableIrs();
+ Common::Input::DriverResult DisableIrs();
- DriverResult SetIrsConfig(IrsMode mode, IrsResolution format);
+ Common::Input::DriverResult SetIrsConfig(IrsMode mode, IrsResolution format);
- DriverResult RequestImage(std::span<u8> buffer);
+ Common::Input::DriverResult RequestImage(std::span<u8> buffer);
std::vector<u8> GetImage() const;
@@ -34,13 +38,13 @@ public:
bool IsEnabled() const;
private:
- DriverResult ConfigureIrs();
+ Common::Input::DriverResult ConfigureIrs();
- DriverResult WriteRegistersStep1();
- DriverResult WriteRegistersStep2();
+ Common::Input::DriverResult WriteRegistersStep1();
+ Common::Input::DriverResult WriteRegistersStep2();
- DriverResult RequestFrame(u8 frame);
- DriverResult ResendFrame(u8 frame);
+ Common::Input::DriverResult RequestFrame(u8 frame);
+ Common::Input::DriverResult ResendFrame(u8 frame);
IrsMode irs_mode{IrsMode::ImageTransfer};
IrsResolution resolution{IrsResolution::Size40x30};
--
cgit v1.2.3-70-g09d2