diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2022-10-21 21:28:08 -0500 | 
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-10-21 21:54:31 -0500 | 
| commit | 82fdfb33ac7cc6da4f24c5a8bd88855287e93fcc (patch) | |
| tree | af4c2eca9ffbcb800be3794666a45b025d04e98d | |
| parent | 6b71530fa8d3ce811537110a42dc8cd554629fb2 (diff) | |
service: nfp: remove unnecessary include
| -rw-r--r-- | src/core/hle/service/nfp/nfp_device.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp_device.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp_types.h | 5 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp_user.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp_user.h | 8 | 
5 files changed, 7 insertions, 11 deletions
| diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 76f8a267a..4e6b8e558 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -17,6 +17,7 @@  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h"  #include "core/hle/service/mii/mii_manager.h" +#include "core/hle/service/mii/types.h"  #include "core/hle/service/nfp/amiibo_crypto.h"  #include "core/hle/service/nfp/nfp.h"  #include "core/hle/service/nfp/nfp_device.h" diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index a5b72cf19..76d0e9ae4 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -8,7 +8,6 @@  #include "common/common_funcs.h"  #include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/mii/types.h"  #include "core/hle/service/nfp/nfp_types.h"  #include "core/hle/service/service.h" diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index c09f9ddb6..63d5917cb 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -17,11 +17,6 @@ enum class ServiceType : u32 {      System,  }; -enum class State : u32 { -    NonInitialized, -    Initialized, -}; -  enum class DeviceState : u32 {      Initialized,      SearchingForTag, diff --git a/src/core/hle/service/nfp/nfp_user.cpp b/src/core/hle/service/nfp/nfp_user.cpp index 4ed53b534..33e2ef518 100644 --- a/src/core/hle/service/nfp/nfp_user.cpp +++ b/src/core/hle/service/nfp/nfp_user.cpp @@ -6,12 +6,9 @@  #include "common/logging/log.h"  #include "core/core.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h"  #include "core/hid/hid_types.h"  #include "core/hle/ipc_helpers.h"  #include "core/hle/kernel/k_event.h" -#include "core/hle/service/mii/mii_manager.h"  #include "core/hle/service/nfp/nfp_device.h"  #include "core/hle/service/nfp/nfp_result.h"  #include "core/hle/service/nfp/nfp_user.h" diff --git a/src/core/hle/service/nfp/nfp_user.h b/src/core/hle/service/nfp/nfp_user.h index 68c60ae82..47aff3695 100644 --- a/src/core/hle/service/nfp/nfp_user.h +++ b/src/core/hle/service/nfp/nfp_user.h @@ -4,8 +4,7 @@  #pragma once  #include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfp/nfp.h" -#include "core/hle/service/nfp/nfp_types.h" +#include "core/hle/service/service.h"  namespace Service::NFP {  class NfpDevice; @@ -15,6 +14,11 @@ public:      explicit IUser(Core::System& system_);  private: +    enum class State : u32 { +        NonInitialized, +        Initialized, +    }; +      void Initialize(Kernel::HLERequestContext& ctx);      void Finalize(Kernel::HLERequestContext& ctx);      void ListDevices(Kernel::HLERequestContext& ctx); | 
