Change to get stub proc name from hal-api-common

Since the stub proc name can be vary, it should not be hard-coded but
comes from the stub.
To accomplish this, an api function from the hal-api-common is used:
hal_common_get_stub_proc_name().
This function returns stub proc name which created dynamically in the
build time.

Change-Id: I1f30edd5e005593354332c1674142da13bba1d49
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/src/hal-api-device-battery-ipc.c b/src/hal-api-device-battery-ipc.c
index 8f7d0feaa524b4b8f0b7b77f51fd11663d9d6189..c5064d96de3a009174e02618becb22de986d97d9 100644 (file)
--- a/src/hal-api-device-battery-ipc.c
+++ b/src/hal-api-device-battery-ipc.c
@@ -17,6 +17,8 @@
 #include <assert.h>
 #include <glib.h>
 
+#include <hal/hal-common.h>
+
 #include "hal-api-device-battery-ipc.h"
 #include "src/generated/hal_device_battery_proxy_1.h"
 
@@ -32,8 +34,6 @@ struct hal_device_battery_updated_cb_info {
        void *data;
 };
 
-#define HAL_BACKEND_SERVICE_APPID              "d::HalBackendService"
-
 static int hal_device_battery_ipc_cleanup_changed_event_callback_handle(rpc_port_proxy_hal_device_battery_proxy_1_device_battery_updated_cb_h *handle);
 
 static int add_updated_cb_info(hal_device_battery_updated_cb updated_cb, void *user_data)
@@ -229,6 +229,13 @@ static void hal_device_battery_ipc_rejected_cb(rpc_port_proxy_hal_device_battery
 int hal_device_battery_ipc_get_backend(void)
 {
        int ret = 0;
+       const char *stub_proc_name = NULL;
+
+       ret = hal_common_get_stub_proc_name(HAL_MODULE_DEVICE_BATTERY, &stub_proc_name);
+       if (ret != 0) {
+               _E("Failed to get stub proc name for device-battery: ret(%d)", ret);
+               return ret;
+       }
 
        rpc_port_proxy_hal_device_battery_proxy_1_device_battery_callback_s callback = {
                .connected = hal_device_battery_ipc_connected_cb,
@@ -237,7 +244,7 @@ int hal_device_battery_ipc_get_backend(void)
        };
 
        if (!g_hal_device_battery_ipc_h) {
-               ret = rpc_port_proxy_hal_device_battery_proxy_1_device_battery_create(HAL_BACKEND_SERVICE_APPID,
+               ret = rpc_port_proxy_hal_device_battery_proxy_1_device_battery_create(stub_proc_name,
                                &callback, NULL, &g_hal_device_battery_ipc_h);
                if (ret != RPC_PORT_ERROR_NONE) {
                        _E("device-battery: Failed to create ipc handle(%d)", ret);

diff --git a/src/hal-api-device-display-ipc.c b/src/hal-api-device-display-ipc.c
index c3ec6acb413a96ac25532d177c1437122d771cbf..cab66737cd0a071ddd76bb3d3c24cef00d530f43 100644 (file)
--- a/src/hal-api-device-display-ipc.c
+++ b/src/hal-api-device-display-ipc.c
@@ -59,17 +59,24 @@ static void hal_device_display_ipc_rejected_cb(rpc_port_proxy_hal_device_display
 int hal_device_display_ipc_get_backend(void)
 {
        int ret = 0;
+       const char *stub_proc_name = NULL;
 
        if (g_hal_device_display_ipc_h)
                return 0;
 
+       ret = hal_common_get_stub_proc_name(HAL_MODULE_DEVICE_DISPLAY, &stub_proc_name);
+       if (ret != 0) {
+               _E("Failed to get stub proc name for device-display: ret(%d)", ret);
+               return ret;
+       }
+
        rpc_port_proxy_hal_device_display_proxy_1_device_display_callback_s callback = {
                .connected = hal_device_display_ipc_connected_cb,
                .disconnected = hal_device_display_ipc_disconnected_cb,
                .rejected = hal_device_display_ipc_rejected_cb
        };
 
-       ret = rpc_port_proxy_hal_device_display_proxy_1_device_display_create(HAL_BACKEND_SERVICE_APPID,
+       ret = rpc_port_proxy_hal_device_display_proxy_1_device_display_create(stub_proc_name,
                                                                &callback, NULL, &g_hal_device_display_ipc_h);
        if (ret != RPC_PORT_ERROR_NONE) {
                _E("Failed to create display ipc handle(%d)", ret);

diff --git a/src/hal-api-device-display-ipc.h b/src/hal-api-device-display-ipc.h
index 01a0548c83d39307fba0b8bab2fc8e2f0b2ca357..6931801f2bf9db9242298de7bf9026540832a793 100644 (file)
--- a/src/hal-api-device-display-ipc.h
+++ b/src/hal-api-device-display-ipc.h
@@ -24,8 +24,6 @@
 extern "C" {
 #endif
 
-#define HAL_BACKEND_SERVICE_APPID              "d::HalBackendService"
-
 int hal_device_display_ipc_get_backend(void);
 int hal_device_display_ipc_put_backend(void);
 int hal_device_display_ipc_get_max_brightness(int *brightness);
@@ -55,4 +53,4 @@ int hal_device_display_ipc_set_rotation_angle(int display_index, hal_device_disp
 }
 #endif
 
-#endif  // __HAL_DEVICE_DISPLAY_IPC_H__
\ No newline at end of file
+#endif  // __HAL_DEVICE_DISPLAY_IPC_H__

diff --git a/src/hal-api-device-led-ipc.c b/src/hal-api-device-led-ipc.c
index cbefead212cbffec48e8c177a35c7e04d5840bc2..a1655c4e2b19a23f0c5592371c53cf03ee10891f 100644 (file)
--- a/src/hal-api-device-led-ipc.c
+++ b/src/hal-api-device-led-ipc.c
@@ -56,17 +56,24 @@ static void hal_device_led_ipc_rejected_cb(rpc_port_proxy_hal_device_led_proxy_1
 int hal_device_led_ipc_get_backend(void)
 {
        int ret = 0;
+       const char *stub_proc_name = NULL;
 
        if (g_hal_device_led_ipc_funcs_h)
                return 0;
 
+       ret = hal_common_get_stub_proc_name(HAL_MODULE_DEVICE_DISPLAY, &stub_proc_name);
+       if (ret != 0) {
+               _E("Failed to get stub proc name for device-display: ret(%d)", ret);
+               return ret;
+       }
+
        rpc_port_proxy_hal_device_led_proxy_1_device_led_callback_s callback = {
                .connected = hal_device_led_ipc_connected_cb,
                .disconnected = hal_device_led_ipc_disconnected_cb,
                .rejected = hal_device_led_ipc_rejected_cb
        };
 
-       ret = rpc_port_proxy_hal_device_led_proxy_1_device_led_create(HAL_BACKEND_SERVICE_APPID,
+       ret = rpc_port_proxy_hal_device_led_proxy_1_device_led_create(stub_proc_name,
                                                                &callback, NULL, &g_hal_device_led_ipc_funcs_h);
        if (ret != RPC_PORT_ERROR_NONE) {
                _E("Failed to create led ipc handle(%d)", ret);

diff --git a/src/hal-api-device-led-ipc.h b/src/hal-api-device-led-ipc.h
index 7c08b68f04b29420b42f310b50e1830c8e7388b6..94870a32d31492e8a185dfbfce89712802adaff0 100644 (file)
--- a/src/hal-api-device-led-ipc.h
+++ b/src/hal-api-device-led-ipc.h
@@ -24,8 +24,6 @@
 extern "C" {
 #endif
 
-#define HAL_BACKEND_SERVICE_APPID              "d::HalBackendService"
-
 int hal_device_led_ipc_get_backend(void);
 int hal_device_led_ipc_put_backend(void);
 int hal_device_led_ipc_set_state(hal_device_led_device_type_e type, hal_device_led_state_s *state);