Skip to content

Commit 4ee4ec2

Browse files
yuvaramachandran-gurusamyyuvaramachandran-gurusamy
committed
RDKEMW-4129: Prepare native build script
Signed-off-by: yuvaramachandran_gurusamy <yuvaramachandran_gurusamy@comcast.com>
1 parent 024882a commit 4ee4ec2

11 files changed

Lines changed: 481 additions & 20 deletions

‎build_dependencies.sh‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ set -x
33
set -e
44
##############################
55
GITHUB_WORKSPACE="${PWD}"
6-
ls -la ${GITHUB_WORKSPACE}
6+
77
cd ${GITHUB_WORKSPACE}
88

99
# # #############################
1010
#1. Install Dependencies and packages
1111

1212
apt update
13-
#apt install -y libsqlite3-dev libcurl4-openssl-dev valgrind lcov clang libsystemd-dev libboost-all-dev libwebsocketpp-dev meson libcunit1 libcunit1-dev curl protobuf-compiler-grpc libgrpc-dev libgrpc++-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
13+
apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev valac pandoc
1414
pip install jsonref
1515

1616
############################
@@ -26,15 +26,37 @@ cd ..
2626
###########################################
2727
# Clone the required repositories
2828

29+
rm -rf iarmbus
30+
git clone https://github.com/rdkcentral/iarmbus.git
31+
export IARMBUS_PATH=$GITHUB_WORKSPACE/iarmbus
2932

33+
rm -rf ThunderTools
3034
git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git
3135

36+
rm -rf Thunder
3237
git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git
3338

39+
rm -rf entservices-apis
3440
git clone --branch main https://github.com/rdkcentral/entservices-apis.git
3541

3642
git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git
3743

44+
rm -rf gssdp
45+
git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git
46+
47+
############################
48+
# Build gssdp-1.2
49+
echo "======================================================================================"
50+
echo "buliding gssdp-1.2"
51+
cd gssdp
52+
53+
rm -rf build
54+
meson setup build
55+
56+
ninja -C build
57+
ninja -C build install
58+
cd -
59+
3860
############################
3961
# Build Thunder-Tools
4062
echo "======================================================================================"
@@ -77,7 +99,6 @@ cmake -G Ninja -S Thunder -B build/Thunder \
7799

78100
cmake --build build/Thunder --target install
79101

80-
81102
############################
82103
# Build entservices-apis
83104
echo "======================================================================================"
@@ -93,3 +114,19 @@ cmake -G Ninja -S entservices-apis -B build/entservices-apis \
93114

94115
cmake --build build/entservices-apis --target install
95116

117+
############################
118+
119+
############################
120+
# Build and deploy stubs for IARMBus and WPEFramework securityagent
121+
mkdir -p /usr/include/WPEFramework/securityagent
122+
cp $GITHUB_WORKSPACE/stubs/securityagent/* /usr/include/WPEFramework/securityagent/ -v
123+
124+
echo "======================================================================================"
125+
echo "Building IARMBus and WPEFramework securityagent stubs"
126+
cd $GITHUB_WORKSPACE
127+
cd ./stubs
128+
g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$GITHUB_WORKSPACE/stubs -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$IARMBUS_PATH/core -I$IARMBUS_PATH/core/include -fpermissive
129+
g++ -fPIC -shared -o libWPEFrameworkSecurityUtil.so securityagent/SecurityTokenUtil.cpp -I$GITHUB_WORKSPACE/stubs -fpermissive
130+
131+
cp libIARMBus.so /usr/local/lib/
132+
cp libWPEFrameworkSecurityUtil.so /usr/local/lib/

‎cov_build.sh‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ ls -la ${GITHUB_WORKSPACE}
99
echo "buliding xdialserver"
1010

1111
cd ${GITHUB_WORKSPACE}
12-
cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/xdialserver \
13-
-DUSE_THUNDER_R4=ON \
14-
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" \
15-
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
16-
-DCMAKE_VERBOSE_MAKEFILE=ON \
17-
-DCMAKE_CXX_FLAGS="-DEXCEPTIONS_ENABLE=ON \
18-
-I ${GITHUB_WORKSPACE}/Thunder/Source \
19-
-I ${GITHUB_WORKSPACE}/Thunder/Source/core" \
2012

21-
cmake --build build/xdialserver --target install
13+
make
14+
2215
echo "======================================================================================"
2316
exit 0

‎entservices-testframework_old/patches/00010-R4.4-Add-support-for-project-dir.patch‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
diff --git a/JsonGenerator/source/class_emitter.py b/JsonGenerator/source/class_emitter.py
2+
index 7f2fb01..67a6469 100644
3+
--- a/JsonGenerator/source/class_emitter.py
4+
+++ b/JsonGenerator/source/class_emitter.py
5+
@@ -113,7 +113,6 @@
6+
emit.Line("#include <core/Enumerate.h>")
7+
emit.Line()
8+
9+
- emit.Line("#include \"definitions.h\"")
10+
11+
if not config.NO_INCLUDES:
12+
if if_file.endswith(".h"):
13+
diff --git a/ProxyStubGenerator/StubGenerator.py b/ProxyStubGenerator/StubGenerator.py
14+
index 6e079b6..d2de681 100755
15+
--- a/ProxyStubGenerator/StubGenerator.py
16+
+++ b/ProxyStubGenerator/StubGenerator.py
17+
@@ -193,7 +193,7 @@
18+
19+
20+
# Generate interface information in lua
21+
-def GenerateLuaData(emit, interfaces_list, enums_list, source_file=None, tree=None, ns=None):
22+
+def GenerateLuaData(emit, interfaces_list, enums_list, project_dir, source_file=None, tree=None, ns=None):
23+
24+
if not source_file:
25+
assert(tree==None)
26+
@@ -535,7 +535,7 @@
27+
28+
return tree
29+
30+
-def GenerateStubs2(output_file, source_file, tree, ns, scan_only=False):
31+
+def GenerateStubs2(output_file, source_file, project_dir, tree, ns, scan_only=False):
32+
log.Info("Scanning '%s' (in %s)..." % (source_file, ns))
33+
34+
if not FORCE and (os.path.exists(output_file) and (os.path.getmtime(source_file) < os.path.getmtime(output_file))):
35+
@@ -579,7 +579,7 @@
36+
emit.Line
37+
emit.Line()
38+
39+
- if os.path.isfile(os.path.join(os.path.dirname(source_file), "Module.h")):
40+
+ if os.path.isfile(os.path.join(project_dir, "Module.h")):
41+
emit.Line('#include "Module.h"')
42+
43+
if os.path.isfile(os.path.join(os.path.dirname(source_file), interface_header_name)):
44+
@@ -2085,6 +2085,8 @@
45+
help="include an additional C++ header file, may be used multiple times (default: include 'Ids.h')")
46+
argparser.add_argument('-I', dest="includePaths", metavar="INCLUDE_DIR", action='append', default=[], type=str,
47+
help='add an include search path, can be used multiple times')
48+
+ argparser.add_argument("--projectdir",dest="project_dir",metavar="DIR",type=str,default="",
49+
+ help="specify the project directory")
50+
51+
args = argparser.parse_args(sys.argv[1:])
52+
SHOW_WARNINGS = not args.no_warnings
53+
@@ -2221,7 +2223,10 @@
54+
55+
for source_file in interface_files:
56+
try:
57+
- _extra_includes = [ os.path.join("@" + os.path.dirname(source_file), IDS_DEFINITIONS_FILE) ]
58+
+ if args.project_dir is not None:
59+
+ _extra_includes = [ os.path.join("@" + args.project_dir, IDS_DEFINITIONS_FILE) ]
60+
+ else:
61+
+ _extra_includes = [ os.path.join("@" + os.path.dirname(source_file), IDS_DEFINITIONS_FILE) ]
62+
_extra_includes.extend(args.extra_includes)
63+
64+
tree = Parse(source_file, args.includePaths,
65+
@@ -2242,7 +2247,7 @@
66+
some_omitted = False
67+
68+
for ns in INTERFACE_NAMESPACES:
69+
- output, some_omitted = GenerateStubs2(output_file, source_file, tree, ns, scan_only)
70+
+ output, some_omitted = GenerateStubs2(output_file, source_file, args.project_dir, tree, ns, scan_only)
71+
72+
new_faces += output
73+
74+
@@ -2265,7 +2270,7 @@
75+
log.Print("(lua generator) Scanning %s..." % os.path.basename(source_file))
76+
77+
for ns in INTERFACE_NAMESPACES:
78+
- GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums, source_file, tree, ns)
79+
+ GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums, args.project_dir, source_file, tree, ns)
80+
81+
except NotModifiedException as err:
82+
log.Print("skipped file %s, up-to-date" % os.path.basename(output_file))
83+
@@ -2316,7 +2321,7 @@
84+
if args.lua_code:
85+
# Epilogue
86+
for ns in INTERFACE_NAMESPACES:
87+
- GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums)
88+
+ GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums,args.project_dir)
89+
log.Print("Created %s (%s interfaces, %s enums)" % (lua_file.name, len(lua_interfaces), len(lua_enums)))
90+
91+
else:
92+
93+
diff --git a/cmake/FindProxyStubGenerator.cmake.in b/cmake/FindProxyStubGenerator.cmake.in
94+
index 1344452..a8dbcea 100644
95+
--- a/cmake/FindProxyStubGenerator.cmake.in
96+
+++ b/cmake/FindProxyStubGenerator.cmake.in.
97+
@@ -31,7 +31,7 @@ function(ProxyStubGenerator)
98+
endif()
99+
100+
set(optionsArgs SECURE COHERENT TRACES VERBOSE NO_WARNINGS KEEP FORCE_GENERATE)
101+
- set(oneValueArgs OUTDIR)
102+
+ set(oneValueArgs OUTDIR PROJECT_DIR)
103+
set(multiValueArgs INPUT INCLUDE INCLUDE_PATH NAMESPACE)
104+
105+
cmake_parse_arguments(Argument "${optionsArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
106+
@@ -81,6 +81,10 @@ function(ProxyStubGenerator)
107+
list(APPEND _execute_command "--outdir" "${Argument_OUTDIR}")
108+
endif()
109+
110+
+ if(Argument_PROJECT_DIR)
111+
+ list(APPEND _execute_command "--projectdir" "${Argument_PROJECT_DIR}")
112+
+ endif()
113+
+
114+
foreach(_include ${Argument_INCLUDE})
115+
list(APPEND _execute_command "-I" "${_include}")
116+
endforeach(_include)

‎entservices-testframework_old/patches/1004-Add-support-for-project-dir.patch‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff --git a/Source/plugins/CMakeLists.txt b/Source/plugins/CMakeLists.txt
2+
index 4d362d545..9357c647c 100644
3+
--- a/Source/plugins/CMakeLists.txt
4+
+++ b/Source/plugins/CMakeLists.txt
5+
@@ -20,14 +20,14 @@
6+
string(TOLOWER ${NAMESPACE} NAMESPACE_LIB)
7+
8+
option(VIRTUALINPUT_TOOLS "Build VirtualInput tools" OFF)
9+
-
10+
-ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IPlugin.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
11+
-ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IShell.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
12+
-ProxyStubGenerator(NAMESPACE "WPEFramework::Exchange" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IController.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
13+
-ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IControllerDeprecated.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
14+
-ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IStateControl.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
15+
-ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
16+
-ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
17+
+set(PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
18+
+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IPlugin.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR})
19+
+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IShell.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR})
20+
+ProxyStubGenerator(NAMESPACE "WPEFramework::Exchange" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IController.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." PROJECT_DIR ${PROJECT_DIR})
21+
+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IControllerDeprecated.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." PROJECT_DIR ${PROJECT_DIR})
22+
+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IStateControl.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR})
23+
+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR})
24+
+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR})
25+
26+
JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES LEGACY_ALT)
27+
28+
diff --git a/Source/com/CMakeLists.txt b/Source/com/CMakeLists.txt
29+
index 1de9ac176..bcf9489d1 100644
30+
--- a/Source/com/CMakeLists.txt
31+
+++ b/Source/com/CMakeLists.txt
32+
@@ -16,8 +16,8 @@
33+
# limitations under the License.
34+
35+
set(TARGET ${NAMESPACE}COM)
36+
-
37+
-ProxyStubGenerator(NAMESPACE "WPEFramework::RPC" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ICOM.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
38+
+set(PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
39+
+ProxyStubGenerator(NAMESPACE "WPEFramework::RPC" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ICOM.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR})
40+
41+
add_library(${TARGET} SHARED
42+
Administrator.cpp

‎entservices-testframework_old/patches/RDKEMW-733-Add-ENTOS-IDS.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From: Sitaram, Soundaryaa <Soundaryaa_Sitaram@comcast.com>
2+
Date: 05 Feb 2025 17:24:43 +0000
3+
Subject: [PATCH] ENTOS IDs offset to be adjusted in rdkservices-apis
4+
5+
Upstream-Status: None
6+
Signed-off-by: ssitar583 <Soundaryaa_Sitaram@comcast.com>
7+
---
8+
diff --git a/Source/com/Ids.h b/Source/com/Ids.h
9+
index cf2060333..75d235bbd 100644
10+
--- a/Source/com/Ids.h
11+
+++ b/Source/com/Ids.h
12+
@@ -74,7 +74,8 @@ namespace RPC {
13+
ID_COMREQUEST_NOTIFICATION = (ID_OFFSET_INTERNAL + 0x003D),
14+
ID_SYSTEM_METADATA = (ID_OFFSET_INTERNAL + 0x003E),
15+
16+
- ID_EXTERNAL_INTERFACE_OFFSET = (ID_OFFSET_INTERNAL + 0x0040)
17+
+ ID_EXTERNAL_INTERFACE_OFFSET = (ID_OFFSET_INTERNAL + 0x0040),
18+
+ ID_EXTERNAL_CC_INTERFACE_OFFSET = (0xCC00) // ends on 0xDFFF
19+
};
20+
}
21+
}

‎entservices-testframework_old/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
commit 810aae64cb31c907698e468b615797750094b847
2+
Author: Pesala Lakshmi Jwala Priya <plakshmijwalapriya@synamedia.com>
3+
Date: Thu Aug 29 12:31:30 2024 +0530
4+
5+
Alt change
6+
7+
diff --git a/Source/plugins/CMakeLists.txt b/Source/plugins/CMakeLists.txt
8+
index 4d362d54..cdb53cdc 100644
9+
--- a/Source/plugins/CMakeLists.txt
10+
+++ b/Source/plugins/CMakeLists.txt
11+
@@ -29,7 +29,7 @@ ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_S
12+
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
13+
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
14+
15+
-JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES)
16+
+JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES LEGACY_ALT)
17+
18+
add_library(${TARGET} SHARED
19+
Channel.cpp
20+

‎entservices-testframework_old/patches/error_code_R4_4.patch‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
diff --git a/Source/WPEFramework/PluginServer.h b/Source/WPEFramework/PluginServer.h
2+
index e87933d9a..591385222 100644
3+
--- a/Source/WPEFramework/PluginServer.h
4+
+++ b/Source/WPEFramework/PluginServer.h
5+
@@ -1535,6 +1535,22 @@ namespace PluginHost {
6+
response->Error.SetError(Core::ERROR_ILLEGAL_STATE);
7+
response->Error.Text = _T("The service is in an illegal state!!!.");
8+
break;
9+
+ case Core::ERROR_INVALID_PARAMETER:
10+
+ response->Error.SetError(Core::ERROR_INVALID_SIGNATURE);
11+
+ response->Error.Text = _T("Invalid Parameter");
12+
+ break;
13+
+ case Core::ERROR_INVALID_DEVICENAME:
14+
+ response->Error.SetError(Core::ERROR_INVALID_DEVICENAME);
15+
+ response->Error.Text = _T("Invalid device name");
16+
+ break;
17+
+ case Core::ERROR_INVALID_MOUNTPOINT:
18+
+ response->Error.SetError(Core::ERROR_INVALID_MOUNTPOINT);
19+
+ response->Error.Text = _T("Invalid mount path");
20+
+ break;
21+
+ case Core::ERROR_FIRMWAREUPDATE_INPROGRESS:
22+
+ response->Error.SetError(Core::ERROR_FIRMWAREUPDATE_INPROGRESS);
23+
+ response->Error.Text = _T("Firmware update already in progress");
24+
+ break;
25+
case static_cast<uint32_t>(~0):
26+
response.Release();
27+
break;
28+
diff --git a/Source/core/JSONRPC.h b/Source/core/JSONRPC.h
29+
index a9c4360fb..5fcef161d 100644
30+
--- a/Source/core/JSONRPC.h
31+
+++ b/Source/core/JSONRPC.h
32+
@@ -98,6 +98,15 @@ namespace Core {
33+
case Core::ERROR_TIMEDOUT:
34+
Code = -32000; // Server defined, now mapped to Timed out
35+
break;
36+
+ case Core::ERROR_INVALID_DEVICENAME:
37+
+ Code = -32001; // Invalid device name
38+
+ break;
39+
+ case Core::ERROR_INVALID_MOUNTPOINT:
40+
+ Code = -32002; // Invalid mount path
41+
+ break;
42+
+ case Core::ERROR_FIRMWAREUPDATE_INPROGRESS:
43+
+ Code = -32003; // Firmware update inprogress
44+
+ break;
45+
default:
46+
Code = static_cast<int32_t>(frameworkError);
47+
break;
48+
diff --git a/Source/core/Portability.h b/Source/core/Portability.h
49+
index 01e34d398..a5728eebf 100644
50+
--- a/Source/core/Portability.h
51+
+++ b/Source/core/Portability.h
52+
@@ -874,7 +874,11 @@ namespace Core {
53+
ERROR_CODE(ERROR_HIBERNATED, 46) \
54+
ERROR_CODE(ERROR_INPROC, 47) \
55+
ERROR_CODE(ERROR_FAILED_REGISTERED, 48) \
56+
- ERROR_CODE(ERROR_FAILED_UNREGISTERED, 49)
57+
+ ERROR_CODE(ERROR_FAILED_UNREGISTERED, 49) \
58+
+ ERROR_CODE(ERROR_INVALID_PARAMETER, 54) \
59+
+ ERROR_CODE(ERROR_INVALID_DEVICENAME, 59) \
60+
+ ERROR_CODE(ERROR_INVALID_MOUNTPOINT, 60) \
61+
+ ERROR_CODE(ERROR_FIRMWAREUPDATE_INPROGRESS,61)
62+
63+
#define ERROR_CODE(CODE, VALUE) CODE = VALUE,
64+

‎server/include/gdial-config.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* limitations under the License.
1818
*/
1919

20-
#ifndef GDIAL_H_
21-
#define GDIAL_H_
20+
#ifndef _GDIAL_CONFIG_H_
21+
#define _GDIAL_CONFIG_H_
2222

2323
#ifdef __cplusplus
2424
extern "C" {
@@ -81,12 +81,6 @@ extern "C" {
8181
#define GDIAL_THROTTLE_DELAY_US 100000
8282
#define GDIAL_DEBUG g_print
8383

84-
enum {
85-
GDIAL_ERROR_NONE = 0,
86-
GDIAL_ERROR_NOT_REGISTERED,
87-
GDIAL_ERROR_FAIL_TO_START,
88-
} GDialError;
89-
9084
#define GDIAL_GERROR_CHECK_AND_FREE(err, msg) \
9185
{\
9286
if (err) {\

0 commit comments

Comments
 (0)