Merge pull request #2314 from mailwl/account

Service/ACT: move ACT services to folder

6 files changed, 132 insertions, 0 deletions

diff --git a/src/core/hle/service/act/act.cpp b/src/core/hle/service/act/act.cpp
new file mode 100644
index 000000000..9600036c0
--- /dev/null
+++ b/src/core/hle/service/act/act.cpp
@@ -0,0 +1,18 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/hle/service/act/act.h"
+#include "core/hle/service/act/act_a.h"
+#include "core/hle/service/act/act_u.h"
+
+namespace Service {
+namespace ACT {
+
+void Init() {
+    AddService(new ACT_A);
+    AddService(new ACT_U);
+}
+
+} // namespace ACT
+} // namespace Service
diff --git a/src/core/hle/service/act/act.h b/src/core/hle/service/act/act.h
new file mode 100644
index 000000000..3481532c0
--- /dev/null
+++ b/src/core/hle/service/act/act.h
@@ -0,0 +1,14 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace Service {
+namespace ACT {
+
+/// Initialize AM service
+void Init();
+
+} // namespace ACT
+} // namespace Service
diff --git a/src/core/hle/service/act/act_a.cpp b/src/core/hle/service/act/act_a.cpp
new file mode 100644
index 000000000..5c523368f
--- /dev/null
+++ b/src/core/hle/service/act/act_a.cpp
@@ -0,0 +1,30 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/hle/service/act/act.h"
+#include "core/hle/service/act/act_a.h"
+
+namespace Service {
+namespace ACT {
+
+const Interface::FunctionInfo FunctionTable[] = {
+    // act:u shared commands
+    {0x00010084, nullptr, "Initialize"},
+    {0x00020040, nullptr, "GetErrorCode"},
+    {0x000600C2, nullptr, "GetAccountDataBlock"},
+    {0x000B0042, nullptr, "AcquireEulaList"},
+    {0x000D0040, nullptr, "GenerateUuid"},
+    // act:a
+    {0x041300C2, nullptr, "UpdateMiiImage"},
+    {0x041B0142, nullptr, "AgreeEula"},
+    {0x04210042, nullptr, "UploadMii"},
+    {0x04230082, nullptr, "ValidateMailAddress"},
+};
+
+ACT_A::ACT_A() {
+    Register(FunctionTable);
+}
+
+} // namespace ACT
+} // namespace Service
diff --git a/src/core/hle/service/act/act_a.h b/src/core/hle/service/act/act_a.h
new file mode 100644
index 000000000..e3adb03e5
--- /dev/null
+++ b/src/core/hle/service/act/act_a.h
@@ -0,0 +1,22 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+namespace Service {
+namespace ACT {
+
+class ACT_A final : public Service::Interface {
+public:
+    ACT_A();
+
+    std::string GetPortName() const override {
+        return "act:a";
+    }
+};
+
+} // namespace ACT
+} // namespace Service
diff --git a/src/core/hle/service/act/act_u.cpp b/src/core/hle/service/act/act_u.cpp
new file mode 100644
index 000000000..cf98aa1d6
--- /dev/null
+++ b/src/core/hle/service/act/act_u.cpp
@@ -0,0 +1,26 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/hle/service/act/act.h"
+#include "core/hle/service/act/act_u.h"
+
+namespace Service {
+namespace ACT {
+
+const Interface::FunctionInfo FunctionTable[] = {
+    // clang-format off
+    {0x00010084, nullptr, "Initialize"},
+    {0x00020040, nullptr, "GetErrorCode"},
+    {0x000600C2, nullptr, "GetAccountDataBlock"},
+    {0x000B0042, nullptr, "AcquireEulaList"},
+    {0x000D0040, nullptr, "GenerateUuid"},
+    // clang-format on
+};
+
+ACT_U::ACT_U() {
+    Register(FunctionTable);
+}
+
+} // namespace ACT
+} // namespace Service
diff --git a/src/core/hle/service/act/act_u.h b/src/core/hle/service/act/act_u.h
new file mode 100644
index 000000000..9d8538fbf
--- /dev/null
+++ b/src/core/hle/service/act/act_u.h
@@ -0,0 +1,22 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+namespace Service {
+namespace ACT {
+
+class ACT_U final : public Interface {
+public:
+    ACT_U();
+
+    std::string GetPortName() const override {
+        return "act:u";
+    }
+};
+
+} // namespace ACT
+} // namespace Service