separate efl:sl

Author: 3096

include/eiffel.h

@@ -1,20 +1,3 @@
 #pragma once
 
-#include <switch.h>
-
-#define EIFFEL_SERVICE_NAME "efl"
-
-typedef enum {
-    EFL_CMD_LOG = 0,
-} EiffelCommandId;
-
-typedef enum {
-    EFL_LOG_LEVEL_INFO = 0,
-    EFL_LOG_LEVEL_WARNING = 1,
-    EFL_LOG_LEVEL_ERROR = 2,
-} EiffelLogLevel;
-
-Result eiffelInitialize();
-void eiffelExit();
-
-Result eiffelLog(const char* moduleName, EiffelLogLevel level, const char* logContent);
+#include "eiffel/user.h"

include/eiffel/sl.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <switch.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define EIFFEL_SKYLINE_SERVICE_NAME "efl:sl"
+
+typedef enum {
+    EFL_SL_CMD_LOG = 0,
+} EiffelSlCommandId;
+
+typedef enum {
+    EFL_LOG_LEVEL_INFO = 0,
+    EFL_LOG_LEVEL_WARNING = 1,
+    EFL_LOG_LEVEL_ERROR = 2,
+} EiffelLogLevel;
+
+Result eiffelSlInitialize();
+void eiffelSlExit();
+
+Result eiffelSlLog(const char* moduleName, EiffelLogLevel level, const char* logContent);
+
+#ifdef __cplusplus
+}
+#endif

include/eiffel/user.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <switch.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define EIFFEL_USER_SERVICE_NAME "efl:u"
+
+typedef enum {
+    EFL_U_CMD_GET_PLUGIN_READY_EVENT = 0,
+    EFL_U_CMD_GET_PLUGIN_INFO = 1,
+} EiffelUserCommandId;
+
+Result eiffelInitialize();
+void eiffelExit();
+
+#ifdef __cplusplus
+}
+#endif

src/eiffel.c renamed to src/efl_sl.c

@@ -1,19 +1,18 @@
-#include "eiffel.h"
-
 #include <string.h>
 
+#include "eiffel/sl.h"
 #include "service_guard.h"
 
-static Service g_eiffelSrv;
+static Service g_eiffelSlSrv;
 
-NX_GENERATE_SERVICE_GUARD(eiffel);
+NX_GENERATE_SERVICE_GUARD(eiffelSl);
 
-Result _eiffelInitialize() { return smGetService(&g_eiffelSrv, EIFFEL_SERVICE_NAME); }
+Result _eiffelSlInitialize() { return smGetService(&g_eiffelSlSrv, EIFFEL_SKYLINE_SERVICE_NAME); }
 
-void _eiffelCleanup(void) { serviceClose(&g_eiffelSrv); }
+void _eiffelSlCleanup(void) { serviceClose(&g_eiffelSlSrv); }
 
-Result eiffelLog(const char* moduleName, EiffelLogLevel level, const char* logContent) {
-    return serviceDispatchIn(&g_eiffelSrv, EFL_CMD_LOG, level,
+Result eiffelSlLog(const char* moduleName, EiffelLogLevel level, const char* logContent) {
+    return serviceDispatchIn(&g_eiffelSlSrv, EFL_SL_CMD_LOG, level,
                              .buffer_attrs =
                                  {
                                      SfBufferAttr_HipcMapAlias | SfBufferAttr_In,

src/efl_u.c

@@ -0,0 +1,10 @@
+#include "eiffel/user.h"
+#include "service_guard.h"
+
+static Service g_eiffelSrv;
+
+NX_GENERATE_SERVICE_GUARD(eiffel);
+
+Result _eiffelInitialize() { return smGetService(&g_eiffelSrv, EIFFEL_USER_SERVICE_NAME); }
+
+void _eiffelCleanup(void) { serviceClose(&g_eiffelSrv); }