4 files changed, 58 insertions, 0 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b1ebd942f..f67481359 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -34,6 +34,7 @@ set(SRCS
             hle/service/apt_u.cpp
             hle/service/cfg_u.cpp
             hle/service/dsp_dsp.cpp
+            hle/service/err_f.cpp
             hle/service/fs_user.cpp
             hle/service/gsp_gpu.cpp
             hle/service/hid_user.cpp
@@ -103,6 +104,7 @@ set(HEADERS
             hle/service/apt_u.h
             hle/service/cfg_u.h
             hle/service/dsp_dsp.h
+            hle/service/err_f.h
             hle/service/fs_user.h
             hle/service/gsp_gpu.h
             hle/service/hid_user.h
diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp
new file mode 100644
index 000000000..917b2f8ca
--- /dev/null
+++ b/src/core/hle/service/err_f.cpp
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/err_f.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace ERR_F
+
+namespace ERR_F {
+
+    const Interface::FunctionInfo FunctionTable[] = {
+        {0x00010800, nullptr,               "ThrowFatalError"}
+    };
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Interface class
+
+    Interface::Interface() {
+        Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+    }
+    
+    Interface::~Interface() {
+    }
+    
+} // namespace
diff --git a/src/core/hle/service/err_f.h b/src/core/hle/service/err_f.h
new file mode 100644
index 000000000..5da663267
--- /dev/null
+++ b/src/core/hle/service/err_f.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace ERR_F
+
+namespace ERR_F {
+
+    class Interface : public Service::Interface {
+    public:
+        Interface();
+        ~Interface();
+        /**
+         * Gets the string port name used by CTROS for the service
+         * @return Port name of service
+         */
+        std::string GetPortName() const {
+            return "err:f";
+        }
+    };
+    
+} // namespace
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index ab1b37ff5..b144a77d4 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -10,6 +10,7 @@
 #include "core/hle/service/apt_u.h"
 #include "core/hle/service/cfg_u.h"
 #include "core/hle/service/dsp_dsp.h"
+#include "core/hle/service/err_f.h"
 #include "core/hle/service/fs_user.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hle/service/hid_user.h"
@@ -78,6 +79,7 @@ void Init() {
     g_manager->AddService(new APT_U::Interface);
     g_manager->AddService(new CFG_U::Interface);
     g_manager->AddService(new DSP_DSP::Interface);
+    g_manager->AddService(new ERR_F::Interface);
     g_manager->AddService(new FS_User::Interface);
     g_manager->AddService(new GSP_GPU::Interface);
     g_manager->AddService(new HID_User::Interface);