Merge branch 'release/1.15.10'

Author: actions-user

CHANGELOG.md

@@ -4,9 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.15.10](https://github.com/rdkcentral/entservices-apis/compare/1.15.9...1.15.10)
+
+- RDKEMW-6718 : Add support for plugin specific error codes [`#507`](https://github.com/rdkcentral/entservices-apis/pull/507)
+- RDKEMW-6718: Create entservices_errorcodes.h [`4827b3a`](https://github.com/rdkcentral/entservices-apis/commit/4827b3aed79e56181e31c0b00b0f0a736f2814f8)
+- Update entservices_errorcodes.h [`225d8eb`](https://github.com/rdkcentral/entservices-apis/commit/225d8eb06c2c1266f61c56713f5c5f02d62b4270)
+- Update entservices_errorcodes.h [`e2de366`](https://github.com/rdkcentral/entservices-apis/commit/e2de3668f895cb2b0cd80895a2775029882456be)
+
 #### [1.15.9](https://github.com/rdkcentral/entservices-apis/compare/1.15.8...1.15.9)
 
+> 10 September 2025
+
 - RDKEMW-7984 : Add SharedStorage to the api documentation [`#505`](https://github.com/rdkcentral/entservices-apis/pull/505)
+- 1.15.9 release changelog updates [`e0adbd5`](https://github.com/rdkcentral/entservices-apis/commit/e0adbd5c1185a149b05c5dd54739ed214ee1feb8)
 - Merge tag '1.15.8' into develop [`e3906c7`](https://github.com/rdkcentral/entservices-apis/commit/e3906c73c9e0e503f55654ad6d35024878c02435)
 
 #### [1.15.8](https://github.com/rdkcentral/entservices-apis/compare/1.15.7...1.15.8)

CMakeLists.txt

@@ -38,8 +38,9 @@ if(NOT GENERATOR_SEARCH_PATH)
     set(GENERATOR_SEARCH_PATH ${CMAKE_SYSROOT}${CMAKE_INSTALL_PREFIX}/include/${NAMESPACE})
 endif()
 
+file(GLOB_RECURSE INPUT_INTERFACES_HEADERS ./apis/*/I*.h ./apis/I*.h)
 set(PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/apis")
-ProxyStubGenerator(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/apis/*" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/apis" PROJECT_DIR ${PROJECT_DIR})
+ProxyStubGenerator(INPUT "${INPUT_INTERFACES_HEADERS}" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/apis" PROJECT_DIR ${PROJECT_DIR})
 
 file(GLOB_RECURSE INTERFACES_HEADERS ./apis/*/I*.h ./apis/*.h)
 file(GLOB PROXY_STUB_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/ProxyStubs*.cpp")

apis/Module.h

@@ -36,3 +36,4 @@
 // in the file calls Ids.h, please extend it with your requried interface number
 // if you are creating a new interface.
 #include "Ids.h"
+#include <interfaces/entservices_errorcodes.h>

apis/entservices_errorcodes.h

@@ -0,0 +1,48 @@
+#ifndef ENTSERVICES_ERRORCODES_H
+#define ENTSERVICES_ERRORCODES_H
+#pragma once
+#include <stdio.h>
+
+// 1. A list of Plugin specific errors.
+// As per https://www.jsonrpc.org/specification#error_object, implementation defined error range is -32000 to -32099
+// So, we have room for only 100 errors across all entertainment services in RDK. 
+// Please define error code in reusable form (or generic form), wherever possible. 
+// Always consult Thunder Framework defined errors before defining a new error.
+#define ERROR_LIST \
+    X(ERROR_INVALID_DEVICENAME, "Invalid device name") \
+    X(ERROR_INVALID_MOUNTPOINT, "Invalid mount path") \
+    X(ERROR_FIRMWAREUPDATE_INPROGRESS, "Firmware update already in progress") \
+    X(ERROR_FIRMWAREUPDATE_UPTODATE, "Firmware is already upto date") \
+    X(ERROR_FILE_IO, "File Read or Write error") \
+
+
+/******** PLEASE DO NOT MODIFY ANYTHING BELOW THIS **********/
+// 2. Define the 'X' macro to generate the enum.
+#define X(name, string) name,
+enum ErrorCodeEnum{
+    // Start the first error code at 1000
+    ERROR_BASE = 1000,
+    ERROR_LIST
+    MAX_ERROR_CODE
+};
+// Undefine 'X' to avoid conflicts.
+#undef X
+
+// 3. Define the 'X' macro to generate the string array.
+#define X(name, string) string,
+const char* const error_strings[] = {
+    "Error base",
+    ERROR_LIST
+    "Unknown error code"
+};
+
+//4.Check if Error code is within the entservices error code range.
+#define IS_ENTSERVICES_ERRORCODE(errorcode) \
+    ((errorcode) >= ERROR_BASE && \
+     (errorcode) <  MAX_ERROR_CODE)
+
+
+//5.Fetch Error strings
+#define ERROR_MESSAGE(errorcode) (error_strings[(errorcode) - ERROR_BASE])
+
+#endif //ENTSERVICES_ERRORCODES_H