From aca70aaac7a6cc430872609e91bae79fd983f208 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Mon, 21 Dec 2020 14:38:17 +0900 Subject: [PATCH 01/16] Remove touch key/led Touch key/led is not supported on wearable target. Change-Id: I521c0e5cdc77a1c29d95dbd1bd339b7a8a17ca96 Signed-off-by: lokilee73 --- plugins/wearable/display/core.c | 18 ++-------- plugins/wearable/display/device-interface.c | 4 --- plugins/wearable/display/key-filter.c | 52 ++--------------------------- 3 files changed, 5 insertions(+), 69 deletions(-) diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index c7c924a..72902ce 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -563,7 +563,7 @@ void lcd_on_procedure(int state, enum device_flags flag) * step 5. set pmstate of vconf * step 6. display on operate * - a. display on - * - b. TSP(touch screen) and touchkey enable + * - b. TSP(touch screen) enable * step 7. broadcast lcd on complete signal * step 8. key backlight enable */ @@ -611,9 +611,6 @@ void lcd_on_procedure(int state, enum device_flags flag) lcdon_broadcast = true; } - if (CHECK_OPS(keyfilter_ops, backlight_enable)) - keyfilter_ops->backlight_enable(true); - touch_blocked = false; } @@ -646,7 +643,7 @@ inline void lcd_off_procedure(enum device_flags flag) * step 2. set pmstate of vconf * step 3. display off operate * - a. display off - * - b. TSP(touch screen) and touchkey disable + * - b. TSP(touch screen) disable * step 4. broadcast lcd off complete siganl * step 5. enter doze mode if it is enabled */ @@ -673,9 +670,6 @@ inline void lcd_off_procedure(enum device_flags flag) set_setting_pmstate(S_LCDOFF); - if (CHECK_OPS(keyfilter_ops, backlight_enable)) - keyfilter_ops->backlight_enable(false); - if (transit_timer) { g_source_remove(transit_timer); transit_timer = 0; @@ -1991,10 +1985,6 @@ static int update_setting(int key_idx, int val) break; case SETTING_LOCK_SCREEN: set_lock_screen_state(val); - if (val == VCONFKEY_IDLE_UNLOCK) { - if (CHECK_OPS(keyfilter_ops, backlight_enable)) - keyfilter_ops->backlight_enable(false); - } /* LCD on if lock screen show before waiting time */ if ((get_pm_cur_state() == S_NORMAL) && @@ -2100,10 +2090,6 @@ static void init_lcd_operation(void) if (!check_default(ops)) DD_LIST_APPEND(lcdon_ops, ops); - ops = find_device("touchkey"); - if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); - ops = find_device("touchscreen"); if (!check_default(ops)) DD_LIST_APPEND(lcdon_ops, ops); diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c index 655a102..b368fba 100644 --- a/plugins/wearable/display/device-interface.c +++ b/plugins/wearable/display/device-interface.c @@ -916,10 +916,6 @@ int exit_sysfs(void) if (!check_default(ops)) ops->start(NORMAL_MODE); - ops = find_device("touchkey"); - if (!check_default(ops)) - ops->start(NORMAL_MODE); - unregister_notifier(DEVICE_NOTIFIER_VITAL_STATE, vital_state_changed); return 0; diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index cdea506..5f8989b 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -103,7 +103,6 @@ static bool touch_pressed = false; static int skip_lcd_off = false; static int skip_combination = false; static int bezel_wakeup = true; -static const struct device_ops *touchled; static int booting_check = true; static inline int current_state_in_on(void) @@ -521,30 +520,6 @@ static int process_screenlock_key(struct input_event *pinput) return true; } -static void process_hardkey_backlight(struct input_event *pinput) -{ - int opt; - - _E("pinput->value : %d", pinput->value); - if (pinput->value == KEY_PRESSED) { - if (touchled && touchled->execute) { - opt = TOUCHLED_PRESS; - touchled->execute(&opt); - } - } else if (pinput->value == KEY_RELEASED) { - /* if lockscreen is idle lock */ - if (__get_lock_screen_state() == VCONFKEY_IDLE_LOCK) { - _D("Lock state, key backlight is off when phone is unlocked!"); - return; - } - - if (touchled && touchled->execute) { - opt = TOUCHLED_RELEASE; - touchled->execute(&opt); - } - } -} - static void update_vital_state(struct input_event *pinput) { int type; @@ -582,17 +557,13 @@ static int check_key(struct input_event *pinput, int fd) case KEY_BACK: ignore = process_back_key(pinput); stop_key_combination(NULL); - if (current_state_in_on()) { - process_hardkey_backlight(pinput); + if (current_state_in_on()) ignore = false; - } break; case KEY_PHONE: stop_key_combination(NULL); - if (current_state_in_on()) { - process_hardkey_backlight(pinput); + if (current_state_in_on()) ignore = false; - } break; case KEY_VOLUMEUP: case KEY_VOLUMEDOWN: @@ -739,33 +710,16 @@ static void keyfilter_init(void) display_add_actor(&display_powerkey_actor); display_add_actor(&display_menukey_actor); - touchled = find_device(TOUCHLED_NAME); - register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done_cb); register_notifier(DEVICE_NOTIFIER_BEZEL_WAKEUP, bezel_wakeup_cb); } -static void key_backlight_enable(bool enable) -{ - int opt; - - if (!touchled || !touchled->execute) - return; - - if (enable) - opt = TOUCHLED_DIRECT_ON; - else - opt = TOUCHLED_DIRECT_OFF; - - touchled->execute(&opt); -} - static const struct display_keyfilter_ops normal_keyfilter_ops = { .init = keyfilter_init, .check = check_key_filter, .set_powerkey_ignore = NULL, .powerkey_lcdoff = NULL, - .backlight_enable = key_backlight_enable, + .backlight_enable = NULL, }; const struct display_keyfilter_ops *keyfilter_ops = &normal_keyfilter_ops; -- 2.7.4 From 682fd24e22d596677d97e59d4187d582e9c8d62d Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Thu, 7 Jan 2021 14:37:39 +0900 Subject: [PATCH 02/16] Apply screen timeout for iot Change-Id: I6e3597d513616d3d269f6c1a96fe18571fb7e201 Signed-off-by: Youngjae Cho --- conf/iot-display.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/iot-display.conf b/conf/iot-display.conf index 4e14b86..10769a8 100644 --- a/conf/iot-display.conf +++ b/conf/iot-display.conf @@ -34,6 +34,6 @@ # If this value is no, LCD is turned off just by external requests. # TimeoutEnable=(yes or no) -LCDAlwaysOn=yes -TimeoutEnable=no +LCDAlwaysOn=no +TimeoutEnable=yes SleepSupport=no -- 2.7.4 From 965cb8542001f1a03fb08407f8cf9fa33d9838b2 Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Wed, 6 Jan 2021 17:14:04 +0900 Subject: [PATCH 03/16] Use list of libsyscommon Change-Id: Icf0ebaa385aa4e0f99bb8c17ffc872b946dbe8c9 Signed-off-by: Youngjae Cho --- plugins/iot/display/core.c | 30 +++++++++---------- plugins/mobile/display/core.c | 30 +++++++++---------- plugins/tv/display/core.c | 30 +++++++++---------- plugins/wearable/display/core.c | 44 +++++++++++++-------------- src/auto-test/result.c | 2 +- src/auto-test/test.c | 28 +++++++++--------- src/auto-test/test.h | 2 +- src/battery/battery-ops.c | 20 ++++++------- src/battery/lowbat-handler.c | 10 +++---- src/core/device-notifier.c | 28 +++++++++--------- src/core/devices.c | 31 ++++++++++---------- src/core/devices.h | 5 ++-- src/core/list.h | 62 --------------------------------------- src/core/udev.c | 24 +++++++-------- src/cpu/pmqos.c | 20 ++++++------- src/display/core.h | 2 +- src/display/display-actor.c | 10 +++---- src/display/display-dbus.c | 10 +++---- src/display/display-dpms.c | 16 +++++----- src/display/display-lock.c | 38 ++++++++++++------------ src/display/display-lock.h | 2 +- src/display/display-ops.c | 20 ++++++------- src/display/display.c | 8 ++--- src/display/lock-detector.c | 44 +++++++++++++-------------- src/dump/dump.c | 8 ++--- src/extcon/extcon.c | 18 ++++++------ src/extcon/extcon.h | 2 +- src/extcon/hdmi.c | 2 +- src/led/rgb.c | 22 +++++++------- src/libdeviced/usbhost.c | 32 ++++++++++---------- src/power/power-handler.c | 34 ++++++++++----------- src/time/time-handler.c | 2 +- src/tzip/tzip.c | 2 +- src/usb-host-test/usb-host-test.c | 2 +- src/usbhost/usb-host.c | 60 ++++++++++++++++++------------------- 35 files changed, 319 insertions(+), 381 deletions(-) delete mode 100644 src/core/list.h diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index e01f281..5e5a727 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "util.h" @@ -49,7 +50,6 @@ #include "core/devices.h" #include "core/device-notifier.h" #include "core/udev.h" -#include "core/list.h" #include "core/common.h" #include "core/launch.h" #include "apps/apps.h" @@ -111,7 +111,7 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT; static struct timeval lcdon_tv; static int lcd_paneloff_mode = false; static int stay_touchscreen_off = false; -dd_list *lcdon_ops; +GList *lcdon_ops; /* * The two variables(lcdon_broadcast, pmstate_suspend) must be set initial * state because it should be sent from previous state at booting time. @@ -340,7 +340,7 @@ static gboolean late_transit_on(void *data) void lcd_on_procedure(int state, enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_on_flags(); flags |= flag; @@ -384,7 +384,7 @@ void lcd_on_procedure(int state, enum device_flags flag) else if (state == LCD_DIM) set_setting_pmstate(S_LCDDIM); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->start(flags); if (!lcdon_broadcast) { @@ -418,7 +418,7 @@ static unsigned long get_lcd_off_flags(void) inline void lcd_off_procedure(enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_off_flags(); flags |= flag; @@ -462,7 +462,7 @@ inline void lcd_off_procedure(enum device_flags flag) if (flags & LCD_PHASED_TRANSIT_MODE) backlight_ops->transit_state(DPMS_OFF); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->stop(flags); if (flags & AMBIENT_MODE) { @@ -1168,7 +1168,7 @@ void print_info(int fd) int ret; char pname[PATH_MAX]; PmLockNode *t; - dd_list *elem; + GList *elem; char time_buf[30]; if (fd < 0) @@ -1207,7 +1207,7 @@ void print_info(int fd) _E("Write() failed: %d", errno); for (s_index = S_NORMAL; s_index < S_END; s_index++) { - DD_LIST_FOREACH(get_cond_head(s_index), elem, t) { + SYS_G_LIST_FOREACH(get_cond_head(s_index), elem, t) { get_pname((pid_t)t->pid, pname); ctime_r(&t->time, time_buf); time_buf[strlen(time_buf) - 1] = 0; @@ -1815,25 +1815,25 @@ static void init_lcd_operation(void) ops = find_device("display"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchkey"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchscreen"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); } static void exit_lcd_operation(void) { - dd_list *l = NULL; - dd_list *l_next = NULL; + GList *l = NULL; + GList *l_next = NULL; const struct device_ops *ops = NULL; - DD_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) - DD_LIST_REMOVE_LIST(lcdon_ops, l); + SYS_G_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) + SYS_G_LIST_REMOVE_LIST(lcdon_ops, l); } enum { diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index 1c708b0..d7f8aea 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "util.h" @@ -49,7 +50,6 @@ #include "core/devices.h" #include "core/device-notifier.h" #include "core/udev.h" -#include "core/list.h" #include "core/common.h" #include "core/launch.h" #include "apps/apps.h" @@ -114,7 +114,7 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT; static struct timeval lcdon_tv; static int lcd_paneloff_mode = false; static int stay_touchscreen_off = false; -dd_list *lcdon_ops; +GList *lcdon_ops; /* * The two variables(lcdon_broadcast, pmstate_suspend) must be set initial * state because it should be sent from previous state at booting time. @@ -348,7 +348,7 @@ static gboolean late_transit_on(void *data) void lcd_on_procedure(int state, enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_on_flags(); flags |= flag; @@ -392,7 +392,7 @@ void lcd_on_procedure(int state, enum device_flags flag) else if (state == LCD_DIM) set_setting_pmstate(S_LCDDIM); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->start(flags); if (!lcdon_broadcast) { @@ -426,7 +426,7 @@ static unsigned long get_lcd_off_flags(void) inline void lcd_off_procedure(enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_off_flags(); flags |= flag; @@ -470,7 +470,7 @@ inline void lcd_off_procedure(enum device_flags flag) if (flags & LCD_PHASED_TRANSIT_MODE) backlight_ops->transit_state(DPMS_OFF); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->stop(flags); if (flags & AMBIENT_MODE) { @@ -1179,7 +1179,7 @@ void print_info(int fd) int ret; char pname[PATH_MAX]; PmLockNode *t; - dd_list *elem; + GList *elem; char time_buf[30]; if (fd < 0) @@ -1218,7 +1218,7 @@ void print_info(int fd) _E("Write() failed: %d", errno); for (s_index = S_NORMAL; s_index < S_END; s_index++) { - DD_LIST_FOREACH(get_cond_head(s_index), elem, t) { + SYS_G_LIST_FOREACH(get_cond_head(s_index), elem, t) { get_pname((pid_t)t->pid, pname); ctime_r(&t->time, time_buf); time_buf[strlen(time_buf) - 1] = 0; @@ -1826,25 +1826,25 @@ static void init_lcd_operation(void) ops = find_device("display"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchkey"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchscreen"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); } static void exit_lcd_operation(void) { - dd_list *l = NULL; - dd_list *l_next = NULL; + GList *l = NULL; + GList *l_next = NULL; const struct device_ops *ops = NULL; - DD_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) - DD_LIST_REMOVE_LIST(lcdon_ops, l); + SYS_G_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) + SYS_G_LIST_REMOVE_LIST(lcdon_ops, l); } enum { diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c index aaa62db..4fe32fa 100644 --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "util.h" @@ -49,7 +50,6 @@ #include "core/devices.h" #include "core/device-notifier.h" #include "core/udev.h" -#include "core/list.h" #include "core/common.h" #include "core/launch.h" #include "apps/apps.h" @@ -112,7 +112,7 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT; static struct timeval lcdon_tv; static int lcd_paneloff_mode = false; static int stay_touchscreen_off = false; -dd_list *lcdon_ops; +GList *lcdon_ops; /* * The two variables(lcdon_broadcast, pmstate_suspend) must be set initial * state because it should be sent from previous state at booting time. @@ -341,7 +341,7 @@ static gboolean late_transit_on(void *data) void lcd_on_procedure(int state, enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_on_flags(); flags |= flag; @@ -385,7 +385,7 @@ void lcd_on_procedure(int state, enum device_flags flag) else if (state == LCD_DIM) set_setting_pmstate(S_LCDDIM); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->start(flags); if (!lcdon_broadcast) { @@ -419,7 +419,7 @@ static unsigned long get_lcd_off_flags(void) inline void lcd_off_procedure(enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_off_flags(); flags |= flag; @@ -463,7 +463,7 @@ inline void lcd_off_procedure(enum device_flags flag) if (flags & LCD_PHASED_TRANSIT_MODE) backlight_ops->transit_state(DPMS_OFF); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->stop(flags); if (flags & AMBIENT_MODE) { @@ -1169,7 +1169,7 @@ void print_info(int fd) int ret; char pname[PATH_MAX]; PmLockNode *t; - dd_list *elem; + GList *elem; char time_buf[30]; if (fd < 0) @@ -1208,7 +1208,7 @@ void print_info(int fd) _E("Write() failed: %d", errno); for (s_index = S_NORMAL; s_index < S_END; s_index++) { - DD_LIST_FOREACH(get_cond_head(s_index), elem, t) { + SYS_G_LIST_FOREACH(get_cond_head(s_index), elem, t) { get_pname((pid_t)t->pid, pname); ctime_r(&t->time, time_buf); time_buf[strlen(time_buf) - 1] = 0; @@ -1816,25 +1816,25 @@ static void init_lcd_operation(void) ops = find_device("display"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchkey"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchscreen"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); } static void exit_lcd_operation(void) { - dd_list *l = NULL; - dd_list *l_next = NULL; + GList *l = NULL; + GList *l_next = NULL; const struct device_ops *ops = NULL; - DD_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) - DD_LIST_REMOVE_LIST(lcdon_ops, l); + SYS_G_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) + SYS_G_LIST_REMOVE_LIST(lcdon_ops, l); } enum { diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index 72902ce..d69a3b6 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "auto-brightness-sensorhub.h" #include "ambient-mode.h" @@ -50,7 +51,6 @@ #include "core/devices.h" #include "core/device-notifier.h" #include "core/udev.h" -#include "core/list.h" #include "core/common.h" #include "core/launch.h" #include "apps/apps.h" @@ -120,7 +120,7 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT; static struct timeval lcdon_tv; static int lcd_paneloff_mode = false; static int stay_touchscreen_off = false; -dd_list *lcdon_ops; +GList *lcdon_ops; /* * The two variables(lcdon_broadcast, pmstate_suspend) must be set initial * state because it should be sent from previous state at booting time. @@ -200,7 +200,7 @@ static int pmlock_check(void *data); static int powerlock_load_config(struct parse_result *result, void *user_data); static void free_killable_daemon_list(void); -static dd_list *display_lock_killable_daemon; +static GList *display_lock_killable_daemon; static bool initialized_killable_daemon_list; static struct display_config display_conf = { @@ -372,13 +372,13 @@ static bool is_killable_daemon(pid_t pid) { char pname[PATH_MAX] = {0, }; const char *blacklist; - dd_list *l; + GList *l; get_comm(pid, pname); if (!(*pname)) return false; - DD_LIST_FOREACH(display_lock_killable_daemon, l, blacklist) { + SYS_G_LIST_FOREACH(display_lock_killable_daemon, l, blacklist) { if (MATCH(pname, blacklist)) return true; } @@ -500,14 +500,14 @@ killable_marked: static void free_killable_daemon_list(void) { - dd_list *l, *l_next; + GList *l, *l_next; char *blacklist; if (!display_lock_killable_daemon) return; - DD_LIST_FOREACH_SAFE(display_lock_killable_daemon, l, l_next, blacklist) { - DD_LIST_REMOVE(display_lock_killable_daemon, blacklist); + SYS_G_LIST_FOREACH_SAFE(display_lock_killable_daemon, l, l_next, blacklist) { + SYS_G_LIST_REMOVE(display_lock_killable_daemon, blacklist); free(blacklist); } display_lock_killable_daemon = NULL; @@ -548,7 +548,7 @@ static gboolean late_transit_on(void *data) void lcd_on_procedure(int state, enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_on_flags(); flags |= flag; @@ -600,7 +600,7 @@ void lcd_on_procedure(int state, enum device_flags flag) else if (state == LCD_DIM) set_setting_pmstate(S_LCDDIM); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->start(flags); if (!lcdon_broadcast) { @@ -631,7 +631,7 @@ static unsigned long get_lcd_off_flags(void) inline void lcd_off_procedure(enum device_flags flag) { - dd_list *l = NULL; + GList *l = NULL; const struct device_ops *ops = NULL; unsigned long flags = get_lcd_off_flags(); flags |= flag; @@ -678,7 +678,7 @@ inline void lcd_off_procedure(enum device_flags flag) if (flags & LCD_PHASED_TRANSIT_MODE) backlight_ops->transit_state(DPMS_OFF); - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->stop(flags); if (flags & AMBIENT_MODE) { @@ -1425,7 +1425,7 @@ void print_info(int fd) int ret; char pname[PATH_MAX]; PmLockNode *t; - dd_list *elem; + GList *elem; char time_buf[30]; if (fd < 0) @@ -1464,7 +1464,7 @@ void print_info(int fd) _E("Write() failed: %d", errno); for (s_index = S_NORMAL; s_index < S_END; s_index++) { - DD_LIST_FOREACH(get_cond_head(s_index), elem, t) { + SYS_G_LIST_FOREACH(get_cond_head(s_index), elem, t) { get_pname((pid_t)t->pid, pname); ctime_r(&t->time, time_buf); time_buf[strlen(time_buf) - 1] = 0; @@ -2088,25 +2088,25 @@ static void init_lcd_operation(void) ops = find_device("display"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("touchscreen"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); ops = find_device("bezel"); if (!check_default(ops)) - DD_LIST_APPEND(lcdon_ops, ops); + SYS_G_LIST_APPEND(lcdon_ops, ops); } static void exit_lcd_operation(void) { - dd_list *l = NULL; - dd_list *l_next = NULL; + GList *l = NULL; + GList *l_next = NULL; const struct device_ops *ops = NULL; - DD_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) - DD_LIST_REMOVE_LIST(lcdon_ops, l); + SYS_G_LIST_FOREACH_SAFE(lcdon_ops, l, l_next, ops) + SYS_G_LIST_REMOVE_LIST(lcdon_ops, l); } enum { @@ -2254,7 +2254,7 @@ static int powerlock_load_config(struct parse_result *result, void *user_data) } CRITICAL_LOG("Add %s to killable daemon list.", name); - DD_LIST_APPEND(display_lock_killable_daemon, name); + SYS_G_LIST_APPEND(display_lock_killable_daemon, name); } return 0; diff --git a/src/auto-test/result.c b/src/auto-test/result.c index 9c0feb3..a16441f 100644 --- a/src/auto-test/result.c +++ b/src/auto-test/result.c @@ -18,8 +18,8 @@ #include #include +#include -#include "core/list.h" #include "core/common.h" #ifdef ENABLE_TEST_DLOG diff --git a/src/auto-test/test.c b/src/auto-test/test.c index 0deda46..696a1d3 100644 --- a/src/auto-test/test.c +++ b/src/auto-test/test.c @@ -19,27 +19,27 @@ #include "test.h" #include "config.h" -static dd_list *dd_head; +static GList *dd_head; void add_test(const struct test_ops *d) { if (d->priority == TEST_PRIORITY_HIGH) - DD_LIST_PREPEND(dd_head, d); + SYS_G_LIST_PREPEND(dd_head, d); else - DD_LIST_APPEND(dd_head, d); + SYS_G_LIST_APPEND(dd_head, d); } void remove_test(const struct test_ops *d) { - DD_LIST_REMOVE(dd_head, d); + SYS_G_LIST_REMOVE(dd_head, d); } const struct test_ops *find_test(const char *name) { - dd_list *elem; + GList *elem; const struct test_ops *d; - DD_LIST_FOREACH(dd_head, elem, d) { + SYS_G_LIST_FOREACH(dd_head, elem, d) { if (!strcasecmp(d->name, name)) return d; } @@ -48,22 +48,22 @@ const struct test_ops *find_test(const char *name) void config_test() { - dd_list *elem, *next; + GList *elem, *next; const struct test_ops *d; - DD_LIST_FOREACH_SAFE(dd_head, elem, next, d) { + SYS_G_LIST_FOREACH_SAFE(dd_head, elem, next, d) { if (!test_config_is_supported(d->name)) - DD_LIST_REMOVE(dd_head, d); + SYS_G_LIST_REMOVE(dd_head, d); } } void test_init(void *data) { - dd_list *elem; + GList *elem; const struct test_ops *d; - _D("test module count(%d)", DD_LIST_LENGTH(dd_head)); - DD_LIST_FOREACH(dd_head, elem, d) { + _D("test module count(%d)", SYS_G_LIST_LENGTH(dd_head)); + SYS_G_LIST_FOREACH(dd_head, elem, d) { _D("[%s] initialize", d->name); if (d->init) d->init(data); @@ -72,10 +72,10 @@ void test_init(void *data) void test_exit(void *data) { - dd_list *elem; + GList *elem; const struct test_ops *d; - DD_LIST_FOREACH(dd_head, elem, d) { + SYS_G_LIST_FOREACH(dd_head, elem, d) { _D("[%s] deinitialize", d->name); if (d->exit) d->exit(data); diff --git a/src/auto-test/test.h b/src/auto-test/test.h index 848a646..33e221c 100644 --- a/src/auto-test/test.h +++ b/src/auto-test/test.h @@ -24,10 +24,10 @@ #include #include #include +#include #include #include -#include "core/list.h" #include "core/common.h" #include "core/udev.h" diff --git a/src/battery/battery-ops.c b/src/battery/battery-ops.c index 3c2b172..1d41a02 100644 --- a/src/battery/battery-ops.c +++ b/src/battery/battery-ops.c @@ -19,30 +19,30 @@ #include #include +#include #include "battery-ops.h" -#include "core/list.h" #include "core/common.h" #include "shared/log-macro.h" -static dd_list *batt_head; +static GList *batt_head; void add_battery(const struct battery_ops *batt) { - DD_LIST_APPEND(batt_head, batt); + SYS_G_LIST_APPEND(batt_head, batt); } void remove_battery(const struct battery_ops *batt) { - DD_LIST_REMOVE(batt_head, batt); + SYS_G_LIST_REMOVE(batt_head, batt); } const struct battery_ops *find_battery_feature(const char *name) { - dd_list *elem; + GList *elem; const struct battery_ops *batt; - DD_LIST_FOREACH(batt_head, elem, batt) { + SYS_G_LIST_FOREACH(batt_head, elem, batt) { if (!strcmp(batt->name, name)) return batt; } @@ -51,10 +51,10 @@ const struct battery_ops *find_battery_feature(const char *name) void battery_ops_init(void *data) { - dd_list *elem; + GList *elem; const struct battery_ops *batt; - DD_LIST_FOREACH(batt_head, elem, batt) { + SYS_G_LIST_FOREACH(batt_head, elem, batt) { _D("[%s] initialize.", batt->name); if (batt->init) batt->init(data); @@ -63,10 +63,10 @@ void battery_ops_init(void *data) void battery_ops_exit(void *data) { - dd_list *elem; + GList *elem; const struct battery_ops *batt; - DD_LIST_FOREACH(batt_head, elem, batt) { + SYS_G_LIST_FOREACH(batt_head, elem, batt) { _D("[%s] deinitialize.", batt->name); if (batt->exit) batt->exit(data); diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c index c8bb7c1..6914562 100644 --- a/src/battery/lowbat-handler.c +++ b/src/battery/lowbat-handler.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "lowbat-handler.h" #include "battery-ops.h" @@ -36,7 +37,6 @@ #include "core/devices.h" #include "core/device-notifier.h" #include "core/common.h" -#include "core/list.h" #include "core/udev.h" #include "shared/eventsystem.h" #include "shared/plugin.h" @@ -85,7 +85,7 @@ struct battery_config_info battery_info = { .realoff = BATTERY_REALOFF, }; -static dd_list *lpe; +static GList *lpe; static int scenario_count; static guint low_batt_sig_timer; @@ -105,13 +105,13 @@ static int lowbat_initialized(void *data) static int lowbat_scenario(int old, int now, void *data) { - dd_list *n; + GList *n; struct lowbat_process_entry *scenario; int found = 0; if (old == now && battery->charge_now) return found; - DD_LIST_FOREACH(lpe, n, scenario) { + SYS_G_LIST_FOREACH(lpe, n, scenario) { if (old != scenario->old || now != scenario->now) continue; if (!scenario->func) @@ -144,7 +144,7 @@ static int lowbat_add_scenario(int old, int now, int (*func)(void *data)) scenario->now = now; scenario->func = func; - DD_LIST_APPEND(lpe, scenario); + SYS_G_LIST_APPEND(lpe, scenario); scenario_count++; return 0; } diff --git a/src/core/device-notifier.c b/src/core/device-notifier.c index 78dc63a..f606525 100644 --- a/src/core/device-notifier.c +++ b/src/core/device-notifier.c @@ -19,10 +19,10 @@ #include "log.h" #include "device-notifier.h" -#include "list.h" #include "common.h" #include "core/devices.h" #include +#include struct device_notifier { bool deleted; @@ -30,7 +30,7 @@ struct device_notifier { int (*func)(void *data); }; -static dd_list *device_notifier_list; +static GList *device_notifier_list; static guint idl; static guint late_init_timer; @@ -38,7 +38,7 @@ static guint late_init_timer; #define DEFAULT_LATE_INIT_VALUE (guint)0x0DEF0DEF #define FIND_NOTIFIER(a, b, d, e, f) \ - DD_LIST_FOREACH(a, b, d) \ + SYS_G_LIST_FOREACH(a, b, d) \ if (e == d->e && f == (d->f)) #define NOTIFY_STR(x) [(x)] = __stringify((x)) @@ -82,7 +82,7 @@ static const char *device_notifier_type_str[DEVICE_NOTIFIER_MAX] = { int __register_notifier(enum device_notifier_type type, notify_cb func, const char *caller) { - dd_list *n; + GList *n; struct device_notifier *notifier; _I("%s, %p by %s", device_notifier_type_str[type], func, caller); @@ -107,14 +107,14 @@ int __register_notifier(enum device_notifier_type type, notify_cb func, const ch notifier->type = type; notifier->func = func; - DD_LIST_APPEND(device_notifier_list, notifier); + SYS_G_LIST_APPEND(device_notifier_list, notifier); return 0; } int __unregister_notifier(enum device_notifier_type type, notify_cb func, const char *caller) { - dd_list *n; + GList *n; struct device_notifier *notifier; if (!func) { @@ -132,13 +132,13 @@ int __unregister_notifier(enum device_notifier_type type, notify_cb func, const static gboolean delete_unused_notifier_cb(void *data) { - dd_list *n; - dd_list *next; + GList *n; + GList *next; struct device_notifier *notifier; - DD_LIST_FOREACH_SAFE(device_notifier_list, n, next, notifier) { + SYS_G_LIST_FOREACH_SAFE(device_notifier_list, n, next, notifier) { if (notifier->deleted) { - DD_LIST_REMOVE_LIST(device_notifier_list, n); + SYS_G_LIST_REMOVE_LIST(device_notifier_list, n); free(notifier); } } @@ -149,10 +149,10 @@ static gboolean delete_unused_notifier_cb(void *data) void device_notify(enum device_notifier_type type, void *data) { - dd_list *n; + GList *n; struct device_notifier *notifier; - DD_LIST_FOREACH(device_notifier_list, n, notifier) { + SYS_G_LIST_FOREACH(device_notifier_list, n, notifier) { if (!notifier->deleted && type == notifier->type) { if (notifier->func) notifier->func(data); @@ -165,10 +165,10 @@ void device_notify(enum device_notifier_type type, void *data) void device_notify_once(enum device_notifier_type type, void *data) { - dd_list *n; + GList *n; struct device_notifier *notifier; - DD_LIST_FOREACH(device_notifier_list, n, notifier) { + SYS_G_LIST_FOREACH(device_notifier_list, n, notifier) { if (!notifier->deleted && type == notifier->type) { if (notifier->func) notifier->func(data); diff --git a/src/core/devices.c b/src/core/devices.c index 393e9da..da86123 100644 --- a/src/core/devices.c +++ b/src/core/devices.c @@ -21,7 +21,6 @@ #include #include "log.h" -#include "list.h" #include "common.h" #include "devices.h" @@ -29,9 +28,9 @@ static const struct device_ops default_ops = { DECLARE_NAME_LEN("default-ops"), }; -static dd_list *dev_head; +static GList *dev_head; -dd_list *get_device_list_head(void) +GList *get_device_list_head(void) { return dev_head; } @@ -39,19 +38,19 @@ dd_list *get_device_list_head(void) void add_device(const struct device_ops *dev) { if (dev->priority == DEVICE_PRIORITY_HIGH) - DD_LIST_PREPEND(dev_head, dev); + SYS_G_LIST_PREPEND(dev_head, dev); else - DD_LIST_APPEND(dev_head, dev); + SYS_G_LIST_APPEND(dev_head, dev); } void remove_device(const struct device_ops *dev) { - DD_LIST_REMOVE(dev_head, dev); + SYS_G_LIST_REMOVE(dev_head, dev); } const struct device_ops *find_device(const char *name) { - dd_list *elem; + GList *elem; const struct device_ops *dev; int len; @@ -62,7 +61,7 @@ const struct device_ops *find_device(const char *name) len = strlen(name); - DD_LIST_FOREACH(dev_head, elem, dev) { + SYS_G_LIST_FOREACH(dev_head, elem, dev) { if (dev->len != len) continue; if (dev->len == 0) @@ -84,11 +83,11 @@ static GVariant *dbus_device_list(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { - dd_list *elem; + GList *elem; const struct device_ops *dev; _I("Device list."); - DD_LIST_FOREACH(dev_head, elem, dev) + SYS_G_LIST_FOREACH(dev_head, elem, dev) _I("%s", dev->name); g_dbus_method_invocation_return_value(invocation, NULL); @@ -109,19 +108,19 @@ static const dbus_interface_u dbus_interface = { void devices_init(void *data) { - dd_list *elem, *elem_n; + GList *elem, *elem_n; const struct device_ops *dev; int ret; - DD_LIST_FOREACH_SAFE(dev_head, elem, elem_n, dev) { + SYS_G_LIST_FOREACH_SAFE(dev_head, elem, elem_n, dev) { if (dev->probe && dev->probe(data) != 0) { _E("[%s] Failed to probe.", dev->name); - DD_LIST_REMOVE(dev_head, dev); + SYS_G_LIST_REMOVE(dev_head, dev); continue; } } - DD_LIST_FOREACH_SAFE(dev_head, elem, elem_n, dev) { + SYS_G_LIST_FOREACH_SAFE(dev_head, elem, elem_n, dev) { _D("[%s] Initialization.", dev->name); if (dev->init) dev->init(data); @@ -138,10 +137,10 @@ void devices_init(void *data) void devices_exit(void *data) { - dd_list *elem; + GList *elem; const struct device_ops *dev; - DD_LIST_FOREACH(dev_head, elem, dev) { + SYS_G_LIST_FOREACH(dev_head, elem, dev) { _D("[%s] Deinitialize.", dev->name); if (dev->exit) dev->exit(data); diff --git a/src/core/devices.h b/src/core/devices.h index 7b48710..506bb87 100644 --- a/src/core/devices.h +++ b/src/core/devices.h @@ -21,8 +21,9 @@ #define __DEVICES_H__ #include +#include + #include "common.h" -#include "list.h" enum device_priority { DEVICE_PRIORITY_NORMAL = 0, @@ -132,7 +133,7 @@ static void __DESTRUCTOR__ module_exit(void) \ remove_device(dev); \ } -dd_list *get_device_list_head(void); +GList *get_device_list_head(void); void add_device(const struct device_ops *dev); void remove_device(const struct device_ops *dev); diff --git a/src/core/list.h b/src/core/list.h deleted file mode 100644 index 1b8f8c6..0000000 --- a/src/core/list.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * deviced - * - * Copyright (c) 2012 - 2013 Samsung Electronics Co., Ltd. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __LIST_H__ -#define __LIST_H__ - -#include -typedef GList dd_list; - -#define DD_LIST_PREPEND(a, b) \ - a = g_list_prepend(a, (gpointer)b) -#define DD_LIST_APPEND(a, b) \ - a = g_list_append(a, (gpointer)b) -#define DD_LIST_REMOVE(a, b) \ - a = g_list_remove(a, (gpointer)b) -#define DD_LIST_REMOVE_LIST(a, b) \ - a = g_list_delete_link(a, b) -#define DD_LIST_LENGTH(a) \ - g_list_length(a) -#define DD_LIST_NTH(a, b) \ - g_list_nth_data(a, b) -#define DD_LIST_FIND(a, b) \ - g_list_find(a, (gpointer)b) -#define DD_LIST_FREE_LIST(a) \ - g_list_free(a) -#define DD_LIST_SORT(a, func) \ - a = g_list_sort(a, func) -#define DD_LIST_FOREACH(head, elem, node) \ - for (elem = head, node = NULL; \ - elem && ((node = elem->data) != NULL); \ - elem = elem->next, node = NULL) -#define DD_LIST_FOREACH_SAFE(head, elem, elem_next, node) \ - for (elem = head, elem_next = g_list_next(elem), node = NULL; \ - elem && ((node = elem->data) != NULL); \ - elem = elem_next, elem_next = g_list_next(elem), node = NULL) -#define DD_LIST_REVERSE_FOREACH(head, elem, node) \ - for (elem = g_list_last(head), node = NULL; \ - elem && ((node = elem->data) != NULL); \ - elem = g_list_previous(elem), node = NULL) -#define DD_LIST_REVERSE_FOREACH_SAFE(head, elem, elem_next, node) \ - for (elem = g_list_last(head), elem_next = g_list_previous(elem), node = NULL; \ - elem && ((node = elem->data) != NULL); \ - elem = elem_next, elem_next = g_list_previous(elem), node = NULL) -#define DD_LIST_NEXT(a) \ - g_list_next(a) - -#endif diff --git a/src/core/udev.c b/src/core/udev.c index 322fb79..008ebf2 100644 --- a/src/core/udev.c +++ b/src/core/udev.c @@ -21,12 +21,12 @@ #include #include #include +#include #include "log.h" #include "device-notifier.h" #include "devices.h" #include "udev.h" -#include "list.h" #define KERNEL "kernel" #define UDEV "udev" @@ -36,7 +36,7 @@ struct uevent_info { struct udev_monitor *mon; guint fdh; - dd_list *event_list; + GList *event_list; }; /* Uevent */ @@ -50,7 +50,7 @@ static gboolean uevent_control_cb(gint fd, GIOCondition cond, void *data) struct uevent_info *info = data; struct udev_device *dev; struct uevent_handler *l; - dd_list *elem; + GList *elem; const char *subsystem; int len; @@ -65,7 +65,7 @@ static gboolean uevent_control_cb(gint fd, GIOCondition cond, void *data) goto out; len = strlen(subsystem); - DD_LIST_FOREACH(info->event_list, elem, l) { + SYS_G_LIST_FOREACH(info->event_list, elem, l) { if (!strncmp(l->subsystem, subsystem, len) && l->uevent_func) l->uevent_func(dev); @@ -103,7 +103,7 @@ static int uevent_control_start(const char *type, struct uevent_info *info) { struct uevent_handler *l; - dd_list *elem; + GList *elem; int fd; int ret; @@ -138,7 +138,7 @@ static int uevent_control_start(const char *type, goto stop; } - DD_LIST_FOREACH(info->event_list, elem, l) { + SYS_G_LIST_FOREACH(info->event_list, elem, l) { ret = udev_monitor_filter_add_match_subsystem_devtype( info->mon, l->subsystem, NULL); @@ -180,7 +180,7 @@ static int register_uevent_control(struct uevent_info *info, const struct uevent_handler *uh) { struct uevent_handler *l; - dd_list *elem; + GList *elem; int r; bool matched = false; int len; @@ -194,7 +194,7 @@ static int register_uevent_control(struct uevent_info *info, len = strlen(uh->subsystem); /* check if the same subsystem is already added */ - DD_LIST_FOREACH(info->event_list, elem, l) { + SYS_G_LIST_FOREACH(info->event_list, elem, l) { if (!strncmp(l->subsystem, uh->subsystem, len)) { matched = true; break; @@ -216,7 +216,7 @@ static int register_uevent_control(struct uevent_info *info, _E("Failed to update udev monitor filter: %d", r); add_list: - DD_LIST_APPEND(info->event_list, uh); + SYS_G_LIST_APPEND(info->event_list, uh); return 0; } @@ -224,17 +224,17 @@ static int unregister_uevent_control(struct uevent_info *info, const struct uevent_handler *uh) { struct uevent_handler *l; - dd_list *n, *next; + GList *n, *next; int len; if (!info || !uh || !uh->subsystem) return -EINVAL; len = strlen(uh->subsystem); - DD_LIST_FOREACH_SAFE(info->event_list, n, next, l) { + SYS_G_LIST_FOREACH_SAFE(info->event_list, n, next, l) { if (!strncmp(l->subsystem, uh->subsystem, len) && l->uevent_func == uh->uevent_func) { - DD_LIST_REMOVE(info->event_list, l); + SYS_G_LIST_REMOVE(info->event_list, l); return 0; } } diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c index 1b1f381..eb87cab 100644 --- a/src/cpu/pmqos.c +++ b/src/cpu/pmqos.c @@ -24,11 +24,11 @@ #include #include #include +#include #include "core/log.h" #include "core/devices.h" #include "core/common.h" -#include "core/list.h" #include "core/device-notifier.h" #define DEFAULT_PMQOS_TIMER 3000 @@ -41,7 +41,7 @@ struct pmqos_cpu { guint timeout_id; }; -static dd_list *pmqos_head; +static GList *pmqos_head; static struct cpu_device *cpu_dev; static long get_current_monotonic_ms(void) @@ -75,7 +75,7 @@ int set_cpu_pmqos(const char *name, int val) static int pmqos_cpu_cancel(const char *name) { - dd_list *elem; + GList *elem; struct pmqos_cpu *cpu; size_t len; @@ -84,7 +84,7 @@ static int pmqos_cpu_cancel(const char *name) /* Find previous request */ len = strlen(name) + 1; - DD_LIST_FOREACH(pmqos_head, elem, cpu) { + SYS_G_LIST_FOREACH(pmqos_head, elem, cpu) { if (!strncmp(cpu->name, name, len)) break; } @@ -115,7 +115,7 @@ static gboolean pmqos_cpu_timeout(void *data) static int pmqos_cpu_request(const char *name, int val) { - dd_list *elem; + GList *elem; struct pmqos_cpu *cpu; size_t len; long next_timeout; @@ -128,7 +128,7 @@ static int pmqos_cpu_request(const char *name, int val) /* find cpu */ len = strlen(name) + 1; - DD_LIST_FOREACH(pmqos_head, elem, cpu) { + SYS_G_LIST_FOREACH(pmqos_head, elem, cpu) { if (!strncmp(cpu->name, name, len)) break; } @@ -142,7 +142,7 @@ static int pmqos_cpu_request(const char *name, int val) cpu->name = strndup(name, NAME_MAX); cpu->timeout_id = 0; cpu->timeout = 0; - DD_LIST_APPEND(pmqos_head, cpu); + SYS_G_LIST_APPEND(pmqos_head, cpu); } next_timeout = get_current_monotonic_ms() + val; @@ -377,11 +377,11 @@ static void pmqos_init(void *data) static void pmqos_exit(void *data) { - dd_list *elem, *elem_next; + GList *elem, *elem_next; struct pmqos_cpu *cpu; - DD_LIST_FOREACH_SAFE(pmqos_head, elem, elem_next, cpu) { - DD_LIST_REMOVE(pmqos_head, cpu); + SYS_G_LIST_FOREACH_SAFE(pmqos_head, elem, elem_next, cpu) { + SYS_G_LIST_REMOVE(pmqos_head, cpu); free(cpu->name); free(cpu); } diff --git a/src/display/core.h b/src/display/core.h index a819135..e623b5d 100644 --- a/src/display/core.h +++ b/src/display/core.h @@ -170,7 +170,7 @@ struct display_keyfilter_ops { }; extern const struct display_keyfilter_ops *keyfilter_ops; -extern dd_list *lcdon_ops; +extern GList *lcdon_ops; /* If the bit in a condition variable is set, * we cannot transit the state until clear this bit. */ diff --git a/src/display/display-actor.c b/src/display/display-actor.c index bab8630..5f42050 100644 --- a/src/display/display-actor.c +++ b/src/display/display-actor.c @@ -18,25 +18,25 @@ #include +#include #include "util.h" #include "display-actor.h" -#include "core/list.h" #include "core/common.h" -static dd_list *actor_head; +static GList *actor_head; void display_add_actor(struct display_actor_ops *actor) { - DD_LIST_APPEND(actor_head, actor); + SYS_G_LIST_APPEND(actor_head, actor); } static struct display_actor_ops *display_find_actor(enum display_actor_id id) { - dd_list *elem; + GList *elem; struct display_actor_ops *actor; - DD_LIST_FOREACH(actor_head, elem, actor) { + SYS_G_LIST_FOREACH(actor_head, elem, actor) { if (actor->id == id) return actor; } diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c index 5fa2168..b653706 100644 --- a/src/display/display-dbus.c +++ b/src/display/display-dbus.c @@ -992,7 +992,7 @@ struct pmlock_expired_s { pid_t pid; }; -static dd_list *expired_req_list; +static GList *expired_req_list; static int get_command(pid_t pid, char *comm, size_t len) { @@ -1083,7 +1083,7 @@ static GVariant *dbus_locktimeout_expired(GDBusConnection *conn, ex->invocation = invocation; - DD_LIST_APPEND(expired_req_list, ex); + SYS_G_LIST_APPEND(expired_req_list, ex); g_free(req_id); return NULL; @@ -1114,7 +1114,7 @@ static void expired_deliver_result(void *data) { struct pmlock_expired_s *ex = data; struct pmlock_expired_s *item = NULL; - dd_list *l; + GList *l; size_t len; int value; char *id; @@ -1123,9 +1123,9 @@ static void expired_deliver_result(void *data) return; len = strlen(ex->req_id) + 1; - DD_LIST_FOREACH(expired_req_list, l, item) { + SYS_G_LIST_FOREACH(expired_req_list, l, item) { if (!strncmp(item->req_id, ex->req_id, len)) { - DD_LIST_REMOVE(expired_req_list, item); + SYS_G_LIST_REMOVE(expired_req_list, item); break; } } diff --git a/src/display/display-dpms.c b/src/display/display-dpms.c index 418274c..258ec18 100644 --- a/src/display/display-dpms.c +++ b/src/display/display-dpms.c @@ -24,9 +24,9 @@ #include #include #include +#include #include "core/log.h" -#include "core/list.h" #include "core/device-notifier.h" #include "display/device-interface.h" #include "display/util.h" @@ -430,21 +430,21 @@ static bool dpms_is_available(void) return dpms_client; } -static dd_list *dpms_on_checklist; -static dd_list *dpms_off_checklist; +static GList *dpms_on_checklist; +static GList *dpms_off_checklist; /* Check for critical checklist before dpms control. * The checklist should be minimized for responsiveness */ static void check_dpms_checklist(int mode) { - dd_list *elem; + GList *elem; void (*checker)(void); if (mode == DPMS_ON) - DD_LIST_FOREACH(dpms_on_checklist, elem, checker) + SYS_G_LIST_FOREACH(dpms_on_checklist, elem, checker) checker(); else if (mode == DPMS_OFF || mode == DPMS_FORCE_OFF) - DD_LIST_FOREACH(dpms_off_checklist, elem, checker) + SYS_G_LIST_FOREACH(dpms_off_checklist, elem, checker) checker(); } @@ -460,9 +460,9 @@ void __register_dpms_checklist(int mode, void (*checker)(void), const char *call checker); if (mode == DPMS_ON) - DD_LIST_APPEND(dpms_on_checklist, checker); + SYS_G_LIST_APPEND(dpms_on_checklist, checker); else if (mode == DPMS_OFF || mode == DPMS_FORCE_OFF) - DD_LIST_APPEND(dpms_off_checklist, checker); + SYS_G_LIST_APPEND(dpms_off_checklist, checker); } /* diff --git a/src/display/display-lock.c b/src/display/display-lock.c index ad1b27b..2771fb5 100644 --- a/src/display/display-lock.c +++ b/src/display/display-lock.c @@ -39,17 +39,17 @@ #define no_foreground_lock(st) (check_lock_state(st) == false) static struct _backlight_ops *backlight_ops; -static dd_list *cond_head[S_END]; +static GList *cond_head[S_END]; static int trans_condition; static struct display_config *display_conf; bool check_lock_state(int state) { - dd_list *elem; + GList *elem; PmLockNode *t; - DD_LIST_FOREACH(cond_head[state], elem, t) { + SYS_G_LIST_FOREACH(cond_head[state], elem, t) { if (t->app_background == false) return true; } @@ -190,10 +190,10 @@ static gboolean default_pmlock_check(void *data) PmLockNode *find_node(enum state_t s_index, pid_t pid) { - dd_list *elem; + GList *elem; PmLockNode *t = NULL; - DD_LIST_FOREACH(cond_head[s_index], elem, t) { + SYS_G_LIST_FOREACH(cond_head[s_index], elem, t) { if (t->pid == pid) return t; } @@ -242,7 +242,7 @@ PmLockNode *add_node(enum state_t s_index, pid_t pid, guint timeout_id, default_pmlock_check, (gpointer)n); } - DD_LIST_APPEND(cond_head[s_index], n); + SYS_G_LIST_APPEND(cond_head[s_index], n); refresh_app_cond(); return n; @@ -253,7 +253,7 @@ int del_node(enum state_t s_index, PmLockNode *n) if (n == NULL) return 0; - DD_LIST_REMOVE(cond_head[s_index], n); + SYS_G_LIST_REMOVE(cond_head[s_index], n); /* delete timer */ if (n->timeout_id) { @@ -276,14 +276,14 @@ int del_node(enum state_t s_index, PmLockNode *n) int check_lock_condition(enum state_t state) { - dd_list *elem; + GList *elem; PmLockNode *t = NULL; int ret = false; pid_t owner = getpid(); _D("check holdkey block : state of %s", state_st(state)->name); - DD_LIST_FOREACH(cond_head[state], elem, t) { + SYS_G_LIST_FOREACH(cond_head[state], elem, t) { if (t->pid != owner && t->app_background == false) { ret = true; _I("state change was blocked by pid(%d)!", t->pid); @@ -296,7 +296,7 @@ int check_lock_condition(enum state_t state) int check_holdkey_block(enum state_t state) { - dd_list *elem; + GList *elem; PmLockNode *t = NULL; int ret = 0; @@ -307,7 +307,7 @@ int check_holdkey_block(enum state_t state) return 1; } - DD_LIST_FOREACH(cond_head[state], elem, t) { + SYS_G_LIST_FOREACH(cond_head[state], elem, t) { if (t->holdkey_block == true) { ret = 1; _I("Hold key blocked by pid(%d).", t->pid); @@ -320,7 +320,7 @@ int check_holdkey_block(enum state_t state) int delete_condition(enum state_t state) { - dd_list *elem, *next; + GList *elem, *next; PmLockNode *t = NULL; _I("delete condition : state of %s", state_st(state)->name); @@ -328,7 +328,7 @@ int delete_condition(enum state_t state) if (!cond_head[state]) return 0; - DD_LIST_FOREACH_SAFE(cond_head[state], elem, next, t) { + SYS_G_LIST_FOREACH_SAFE(cond_head[state], elem, next, t) { if (t->timeout_id > 0) { g_source_remove(t->timeout_id); t->timeout_id = 0; @@ -340,7 +340,7 @@ int delete_condition(enum state_t state) del_node(state, t); } - DD_LIST_FREE_LIST(cond_head[state]); + SYS_G_LIST_FREE_LIST(cond_head[state]); cond_head[state] = NULL; return 0; @@ -349,7 +349,7 @@ int delete_condition(enum state_t state) void print_node(int next) { int ret; - dd_list *elem; + GList *elem; PmLockNode *n; char buf[30]; time_t now; @@ -359,7 +359,7 @@ void print_node(int next) return; time(&now); - DD_LIST_FOREACH(cond_head[next], elem, n) { + SYS_G_LIST_FOREACH(cond_head[next], elem, n) { diff = difftime(now, n->time); ctime_r(&n->time, buf); buf[strlen(buf) - 1] = 0; @@ -393,11 +393,11 @@ void makeup_trans_condition(void) * and returns 1, else returns 0 */ int check_processes(enum state_t prohibit_state) { - dd_list *elem, *next; + GList *elem, *next; PmLockNode *t = NULL; int ret = 0; - DD_LIST_FOREACH_SAFE(cond_head[prohibit_state], elem, next, t) { + SYS_G_LIST_FOREACH_SAFE(cond_head[prohibit_state], elem, next, t) { if (t->pid == -1 || (t->pid < INTERNAL_LOCK_BASE && kill(t->pid, 0) == -1)) { _E("%d process does not exist, delete the REQ" " - prohibit state %d ", @@ -416,7 +416,7 @@ int get_trans_condition(void) return trans_condition; } -dd_list *get_cond_head(enum state_t s_index) +GList *get_cond_head(enum state_t s_index) { return cond_head[s_index]; } diff --git a/src/display/display-lock.h b/src/display/display-lock.h index 3e83771..3bc271b 100644 --- a/src/display/display-lock.h +++ b/src/display/display-lock.h @@ -61,7 +61,7 @@ void print_node(int next); void makeup_trans_condition(void); int check_processes(enum state_t prohibit_state); int get_trans_condition(void); -dd_list *get_cond_head(enum state_t s_index); +GList *get_cond_head(enum state_t s_index); int display_app_background(void *data); int display_app_foreground(void *data); int display_app_terminated(void *data); diff --git a/src/display/display-ops.c b/src/display/display-ops.c index 22b9137..d3c0d6d 100644 --- a/src/display/display-ops.c +++ b/src/display/display-ops.c @@ -18,30 +18,30 @@ #include +#include #include "util.h" #include "display-ops.h" -#include "core/list.h" #include "core/common.h" -static dd_list *disp_head; +static GList *disp_head; void add_display(const struct display_ops *disp) { - DD_LIST_APPEND(disp_head, disp); + SYS_G_LIST_APPEND(disp_head, disp); } void remove_display(const struct display_ops *disp) { - DD_LIST_REMOVE(disp_head, disp); + SYS_G_LIST_REMOVE(disp_head, disp); } const struct display_ops *find_display_feature(const char *name) { - dd_list *elem; + GList *elem; const struct display_ops *disp; - DD_LIST_FOREACH(disp_head, elem, disp) { + SYS_G_LIST_FOREACH(disp_head, elem, disp) { if (!strcmp(disp->name, name)) return disp; } @@ -50,10 +50,10 @@ const struct display_ops *find_display_feature(const char *name) void display_ops_init(void *data) { - dd_list *elem; + GList *elem; const struct display_ops *disp; - DD_LIST_FOREACH(disp_head, elem, disp) { + SYS_G_LIST_FOREACH(disp_head, elem, disp) { _D("[%s] initialize", disp->name); if (disp->init) disp->init(data); @@ -62,10 +62,10 @@ void display_ops_init(void *data) void display_ops_exit(void *data) { - dd_list *elem; + GList *elem; const struct display_ops *disp; - DD_LIST_FOREACH(disp_head, elem, disp) { + SYS_G_LIST_FOREACH(disp_head, elem, disp) { _D("[%s] deinitialize", disp->name); if (disp->exit) disp->exit(data); diff --git a/src/display/display.c b/src/display/display.c index 7ee2523..4430ae3 100644 --- a/src/display/display.c +++ b/src/display/display.c @@ -18,12 +18,12 @@ #include +#include #include "util.h" #include "core.h" #include "display-ops.h" #include "dd-display.h" -#include "core/list.h" #include "core/common.h" #include "core/config-parser.h" @@ -69,15 +69,15 @@ inline void clear_pm_status_flag(unsigned int status_flag) void lcd_direct_control(enum dpms_state state, int flags) { const struct device_ops *ops = NULL; - dd_list *l = NULL; + GList *l = NULL; switch (state) { case DPMS_ON: - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->start(flags); break; case DPMS_OFF: - DD_LIST_FOREACH(lcdon_ops, l, ops) + SYS_G_LIST_FOREACH(lcdon_ops, l, ops) ops->stop(flags); break; default: diff --git a/src/display/lock-detector.c b/src/display/lock-detector.c index 5ca0642..99a7b84 100644 --- a/src/display/lock-detector.c +++ b/src/display/lock-detector.c @@ -30,10 +30,10 @@ #include #include #include +#include #include "util.h" #include "core.h" -#include "core/list.h" #include "core/device-notifier.h" struct lock_info { @@ -58,7 +58,7 @@ struct lock_info { #define SAVE_PMLOCK_OVER_TIME 60 /* seconds */ #define LIMIT_COUNT 128 -static dd_list *lock_info_list; +static GList *lock_info_list; static const char state_string[5][8] = { "START", "NORMAL", "LCDDIM", "LCDOFF", "SLEEP" }; @@ -74,18 +74,18 @@ static time_t get_time(void) static void shrink_lock_info_list(void) { - dd_list *l, *l_prev; + GList *l, *l_prev; struct lock_info *info; unsigned int count; - count = DD_LIST_LENGTH(lock_info_list); + count = SYS_G_LIST_LENGTH(lock_info_list); if (count <= LIMIT_COUNT) return; _D("list is shrink : count %d", count); - DD_LIST_REVERSE_FOREACH_SAFE(lock_info_list, l, l_prev, info) { + SYS_G_LIST_REVERSE_FOREACH_SAFE(lock_info_list, l, l_prev, info) { if (info->locktime == 0) { - DD_LIST_REMOVE(lock_info_list, info); + SYS_G_LIST_REMOVE(lock_info_list, info); if (info->name) free(info->name); free(info); @@ -99,7 +99,7 @@ static void shrink_lock_info_list(void) int set_lock_time(pid_t pid, const char *pname, int state) { struct lock_info *info; - dd_list *l; + GList *l; unsigned long val; char ht[15]; @@ -113,7 +113,7 @@ int set_lock_time(pid_t pid, const char *pname, int state) snprintf(ht, sizeof(ht), "[%d]%d", state, pid); val = g_str_hash(ht); - DD_LIST_FOREACH(lock_info_list, l, info) { + SYS_G_LIST_FOREACH(lock_info_list, l, info) { if (!(info->hash == val) || !(info->state == state)) continue; @@ -121,8 +121,8 @@ int set_lock_time(pid_t pid, const char *pname, int state) if (info->locktime == 0) info->locktime = get_time(); info->unlocktime = 0; - DD_LIST_REMOVE(lock_info_list, info); - DD_LIST_PREPEND(lock_info_list, info); + SYS_G_LIST_REMOVE(lock_info_list, info); + SYS_G_LIST_PREPEND(lock_info_list, info); return 0; } @@ -149,7 +149,7 @@ int set_lock_time(pid_t pid, const char *pname, int state) info->unlocktime = 0; info->time = 0; - DD_LIST_APPEND(lock_info_list, info); + SYS_G_LIST_APPEND(lock_info_list, info); return 0; } @@ -191,7 +191,7 @@ int set_unlock_time(pid_t pid, int state) bool find = false; long diff; struct lock_info *info; - dd_list *l; + GList *l; unsigned long val; char ht[15]; @@ -203,10 +203,10 @@ int set_unlock_time(pid_t pid, int state) snprintf(ht, sizeof(ht), "[%d]%d", state, pid); val = g_str_hash(ht); - DD_LIST_FOREACH(lock_info_list, l, info) { + SYS_G_LIST_FOREACH(lock_info_list, l, info) { if (info->hash == val && info->state == state) { - DD_LIST_REMOVE(lock_info_list, info); - DD_LIST_PREPEND(lock_info_list, info); + SYS_G_LIST_REMOVE(lock_info_list, info); + SYS_G_LIST_PREPEND(lock_info_list, info); find = true; break; } @@ -228,7 +228,7 @@ int set_unlock_time(pid_t pid, int state) info->locktime = 0; - if (DD_LIST_LENGTH(lock_info_list) > LIMIT_COUNT) + if (SYS_G_LIST_LENGTH(lock_info_list) > LIMIT_COUNT) shrink_lock_info_list(); return 0; @@ -236,14 +236,14 @@ int set_unlock_time(pid_t pid, int state) void free_lock_info_list(void) { - dd_list *l, *l_next; + GList *l, *l_next; struct lock_info *info; if (!lock_info_list) return; - DD_LIST_FOREACH_SAFE(lock_info_list, l, l_next, info) { - DD_LIST_REMOVE(lock_info_list, info); + SYS_G_LIST_FOREACH_SAFE(lock_info_list, l, l_next, info) { + SYS_G_LIST_REMOVE(lock_info_list, info); if (info->name) free(info->name); free(info); @@ -255,7 +255,7 @@ void print_lock_info_list(int fd) { struct lock_info *info; time_t cur_time; - dd_list *l; + GList *l; long time; char cur_buf[30], lock_buf[30], unlock_buf[30], buf[255]; int ret; @@ -278,7 +278,7 @@ void print_lock_info_list(int fd) if (ret < 0) _E("write() failed (%d)", errno); - DD_LIST_FOREACH(lock_info_list, l, info) { + SYS_G_LIST_FOREACH(lock_info_list, l, info) { time = 0; if (info->locktime != 0 && info->unlocktime == 0) time = get_time() - info->locktime; @@ -319,7 +319,7 @@ static void cleanup_pmlock_statistics(void) time = get_time(); - DD_LIST_FOREACH(lock_info_list, n, info) { + SYS_G_LIST_FOREACH(lock_info_list, n, info) { if (info->unlocktime != 0) continue; diff --git a/src/dump/dump.c b/src/dump/dump.c index dc39db1..3f70f9e 100644 --- a/src/dump/dump.c +++ b/src/dump/dump.c @@ -21,10 +21,10 @@ #include #include "core/log.h" -#include "core/list.h" #include "core/common.h" #include "core/devices.h" #include +#include #define SERVICE_NAME "deviced" #define DUMP_SIGNAL "Dump" @@ -50,8 +50,8 @@ static void send_dump_signal(char *signal) static void dump_all_devices(int mode, char *path) { - dd_list *head = get_device_list_head(); - dd_list *elem; + GList *head = get_device_list_head(); + GList *elem; FILE *fp = NULL; char fname[PATH_MAX]; const struct device_ops *dev; @@ -68,7 +68,7 @@ static void dump_all_devices(int mode, char *path) _I("Failed to open '%s', print to DLOG.", fname); /* save dump each device ops */ - DD_LIST_FOREACH(head, elem, dev) { + SYS_G_LIST_FOREACH(head, elem, dev) { if (dev->dump) { _D("[%s] Get dump.", dev->name); LOG_DUMP(fp, "\n==== %s\n\n", dev->name); diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c index 9bb0118..0d6cd00 100644 --- a/src/extcon/extcon.c +++ b/src/extcon/extcon.c @@ -37,28 +37,28 @@ #define BUF_MAX 512 -static dd_list *extcon_list; +static GList *extcon_list; static struct external_connection_device *extcon_dev; void add_extcon(struct extcon_ops *dev) { - DD_LIST_APPEND(extcon_list, dev); + SYS_G_LIST_APPEND(extcon_list, dev); } void remove_extcon(struct extcon_ops *dev) { - DD_LIST_REMOVE(extcon_list, dev); + SYS_G_LIST_REMOVE(extcon_list, dev); } static struct extcon_ops *find_extcon(const char *name) { - dd_list *l; + GList *l; struct extcon_ops *dev; if (!name) return NULL; - DD_LIST_FOREACH(extcon_list, l, dev) { + SYS_G_LIST_FOREACH(extcon_list, l, dev) { if (!strcasecmp(dev->name, name)) return dev; } @@ -478,7 +478,7 @@ static int event_handler_state_changed(void *data) static void extcon_init(void *data) { int ret; - dd_list *l; + GList *l; struct extcon_ops *dev; device_notifier_state_e state = DEVICE_NOTIFIER_STATE_START; @@ -486,7 +486,7 @@ static void extcon_init(void *data) return; /* initialize extcon devices */ - DD_LIST_FOREACH(extcon_list, l, dev) { + SYS_G_LIST_FOREACH(extcon_list, l, dev) { _I("Extcon(%s) init.", dev->name); if (dev->init) dev->init(data); @@ -505,7 +505,7 @@ static void extcon_init(void *data) static void extcon_exit(void *data) { - dd_list *l; + GList *l; struct extcon_ops *dev; device_notifier_state_e state = DEVICE_NOTIFIER_STATE_STOP; @@ -514,7 +514,7 @@ static void extcon_exit(void *data) event_handler_state_changed((void *)&state); /* deinitialize extcon devices */ - DD_LIST_FOREACH(extcon_list, l, dev) { + SYS_G_LIST_FOREACH(extcon_list, l, dev) { _I("Extcon(%s) deinit.", dev->name); if (dev->exit) dev->exit(data); diff --git a/src/extcon/extcon.h b/src/extcon/extcon.h index 4148096..e35bf3b 100644 --- a/src/extcon/extcon.h +++ b/src/extcon/extcon.h @@ -21,7 +21,7 @@ #define __EXTCON_H__ #include "core/common.h" -#include "core/list.h" +#include #include #include "extcon-count.h" diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c index 15a3cf9..02e91bd 100644 --- a/src/extcon/hdmi.c +++ b/src/extcon/hdmi.c @@ -19,8 +19,8 @@ #include #include +#include #include "core/log.h" -#include "core/list.h" #include "core/bitmap.h" #include "core/device-notifier.h" #include "display/core.h" diff --git a/src/led/rgb.c b/src/led/rgb.c index bd151a3..0e39ae2 100644 --- a/src/led/rgb.c +++ b/src/led/rgb.c @@ -25,9 +25,9 @@ #include #include #include +#include #include "core/log.h" -#include "core/list.h" #include "core/common.h" #include "core/devices.h" #include "core/device-notifier.h" @@ -44,16 +44,16 @@ typedef enum { } led_custom_flags; static struct led_device *rgb_dev; -static dd_list *rgb_list; +static GList *rgb_list; static struct rgb_request *top; static guint timer; static int find_rgb_req(pid_t pid, struct rgb_request **request) { - dd_list *l; + GList *l; struct rgb_request *req; - DD_LIST_FOREACH(rgb_list, l, req) { + SYS_G_LIST_FOREACH(rgb_list, l, req) { if (req->pid == pid) { *request = req; return 0; @@ -64,15 +64,15 @@ static int find_rgb_req(pid_t pid, struct rgb_request **request) static int remove_req_from_list(pid_t pid) { - dd_list *l; + GList *l; struct rgb_request *req; - DD_LIST_FOREACH(rgb_list, l, req) { + SYS_G_LIST_FOREACH(rgb_list, l, req) { if (req->pid == pid) { _I("Remove rgb play request from pid(%d).", pid); if (req == top) top = NULL; - DD_LIST_REMOVE(rgb_list, req); + SYS_G_LIST_REMOVE(rgb_list, req); free(req); return 0; } @@ -97,7 +97,7 @@ static int add_req_to_list(pid_t pid, struct led_state *state) return -ENOMEM; } req->pid = pid; - DD_LIST_APPEND(rgb_list, req); + SYS_G_LIST_APPEND(rgb_list, req); } req->state.color = state->color; @@ -132,11 +132,11 @@ static int rgb_play(struct led_state *state) static gboolean remove_not_handled_req(gpointer data) { - dd_list *l; + GList *l; int ret = 0; struct rgb_request *req; - DD_LIST_FOREACH(rgb_list, l, req) { + SYS_G_LIST_FOREACH(rgb_list, l, req) { if (kill(req->pid, 0) == -1) { ret = remove_req_from_list(req->pid); if (ret < 0) @@ -150,7 +150,7 @@ static gboolean remove_not_handled_req(gpointer data) _E("Failed to turn off removed request: %d", ret); } - if (DD_LIST_LENGTH(rgb_list) == 0) { + if (SYS_G_LIST_LENGTH(rgb_list) == 0) { timer = 0; return G_SOURCE_REMOVE; } diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c index a813c1f..5696e8f 100644 --- a/src/libdeviced/usbhost.c +++ b/src/libdeviced/usbhost.c @@ -20,11 +20,11 @@ #include #include #include +#include #include "log.h" #include "common.h" #include "dd-usbhost.h" -#include "core/list.h" #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) @@ -49,7 +49,7 @@ struct signal_handler { void *data; }; -static dd_list *handlers; +static GList *handlers; static int register_signal_handler(const char *path, const char *iface, const char *name, GDBusSignalCallback cb, union action action, void *data) @@ -73,7 +73,7 @@ static int register_signal_handler(const char *path, const char *iface, const ch goto out; } - DD_LIST_APPEND(handlers, handler); + SYS_G_LIST_APPEND(handlers, handler); return 0; @@ -92,7 +92,7 @@ static void storage_signal_handler(GDBusConnection *conn, { char *type = NULL, *syspath = NULL; int mount = 0; - dd_list *elem; + GList *elem; struct signal_handler *handler; if (!g_variant_get_safe(param, "(ssi)", &type, &syspath, &mount)) { @@ -105,7 +105,7 @@ static void storage_signal_handler(GDBusConnection *conn, goto out; } - DD_LIST_FOREACH(handlers, elem, handler) { + SYS_G_LIST_FOREACH(handlers, elem, handler) { if (strcmp(handler->name, SIGNAL_NAME_USB_STORAGE_CHANGED)) continue; @@ -132,7 +132,7 @@ static void device_signal_handler(GDBusConnection *conn, struct usbhost_device device; int state = 0; struct signal_handler *handler; - dd_list *element; + GList *element; memset(&device, 0, sizeof(device)); if (!g_variant_get_safe(param, "(isiiiiisss)", &state, @@ -155,7 +155,7 @@ static void device_signal_handler(GDBusConnection *conn, } strncpy(device.devpath, syspath, PATH_MAX - 1); - DD_LIST_FOREACH(handlers, element, handler) { + SYS_G_LIST_FOREACH(handlers, element, handler) { if (strcmp(handler->name, SIGNAL_NAME_USB_DEVICE_CHANGED)) continue; @@ -183,11 +183,11 @@ API int init_usbhost_signal(void) API void deinit_usbhost_signal(void) { - dd_list *n, *next; + GList *n, *next; struct signal_handler *handler; - DD_LIST_FOREACH_SAFE(handlers, n, next, handler) { - DD_LIST_REMOVE(handlers, handler); + SYS_G_LIST_FOREACH_SAFE(handlers, n, next, handler) { + SYS_G_LIST_REMOVE(handlers, handler); if (handler->id) { unsubscribe_dbus_signal(NULL, handler->id); handler->id = 0; @@ -260,17 +260,17 @@ API int register_usb_device_change_handler( API int unregister_usb_storage_change_handler(void) { - dd_list *n, *next; + GList *n, *next; struct signal_handler *handler; - DD_LIST_FOREACH_SAFE(handlers, n, next, handler) { + SYS_G_LIST_FOREACH_SAFE(handlers, n, next, handler) { if (strcmp(handler->name, SIGNAL_NAME_USB_STORAGE_CHANGED)) continue; if (handler->id == 0) continue; unsubscribe_dbus_signal(NULL, handler->id); - DD_LIST_REMOVE(handlers, handler); + SYS_G_LIST_REMOVE(handlers, handler); free(handler); } @@ -280,10 +280,10 @@ API int unregister_usb_storage_change_handler(void) API int unregister_usb_device_change_handler( void (*device_changed)(struct usbhost_device *device, int state, void *data)) { - dd_list *n, *next; + GList *n, *next; struct signal_handler *handler; - DD_LIST_FOREACH_SAFE(handlers, n, next, handler) { + SYS_G_LIST_FOREACH_SAFE(handlers, n, next, handler) { if (strcmp(handler->name, SIGNAL_NAME_USB_DEVICE_CHANGED)) continue; if (handler->id == 0) @@ -292,7 +292,7 @@ API int unregister_usb_device_change_handler( continue; unsubscribe_dbus_signal(NULL, handler->id); - DD_LIST_REMOVE(handlers, handler); + SYS_G_LIST_REMOVE(handlers, handler); free(handler); } diff --git a/src/power/power-handler.c b/src/power/power-handler.c index 693c4a4..1431086 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -64,9 +64,9 @@ static struct display_plugin *disp_plgn; static struct timeval tv_start_poweroff; -static dd_list *poweroff_options; +static GList *poweroff_options; static struct power_option poweroff_opt; -static dd_list *poweroff_handles; +static GList *poweroff_handles; static const char *poweroff_type_flagpaths[] = { // index denotes type [POWEROFF_TYPE_POWEROFF] = POWER_FLAG_POWEROFF, @@ -311,9 +311,9 @@ static void make_power_flag(enum poweroff_type type, const char *option) static void poweroff_remove_handle(pid_t pid) { struct poweroff_handle *handle; - dd_list *elem; + GList *elem; - DD_LIST_FOREACH(poweroff_handles, elem, handle) { + SYS_G_LIST_FOREACH(poweroff_handles, elem, handle) { if (handle->pid == pid) break; } @@ -321,7 +321,7 @@ static void poweroff_remove_handle(pid_t pid) assert(handle); _D("Remove handle pid=%d timeout=%d timeout_id=%d.", handle->pid, handle->timeout, handle->timeout_id); - DD_LIST_REMOVE(poweroff_handles, handle); + SYS_G_LIST_REMOVE(poweroff_handles, handle); if (handle->timeout_id) { g_source_remove(handle->timeout_id); @@ -340,7 +340,7 @@ static gboolean poweroff_wait_timeout_cb(void *data) poweroff_remove_handle(pid); /* All other processes finished cleanup. Poweroff is now on standby */ - if (poweroff_stage == POWEROFF_WAIT_OTHERS && DD_LIST_LENGTH(poweroff_handles) == 0) { + if (poweroff_stage == POWEROFF_WAIT_OTHERS && SYS_G_LIST_LENGTH(poweroff_handles) == 0) { _D("The last poweroff wait timer for pid %d is expired. Poweroff is now on standby.", pid); CRITICAL_LOG("Starting poweroff sequence."); @@ -366,13 +366,13 @@ static gboolean poweroff_wait_timeout_cb(void *data) static gboolean poweroff_start_timers(void *data) { struct poweroff_handle *handle = NULL; - dd_list *l; + GList *l; bool timer_exist = false; int pid_alive = 0; poweroff_stage = POWEROFF_WAIT_OTHERS; - DD_LIST_FOREACH(poweroff_handles, l, handle) { + SYS_G_LIST_FOREACH(poweroff_handles, l, handle) { pid_alive = kill(handle->pid, 0); if (pid_alive == -1) { _D("Pid(%d) is dead.", handle->pid); @@ -411,7 +411,7 @@ static gboolean poweroff_start_timers(void *data) return G_SOURCE_REMOVE; } - DD_LIST_APPEND(poweroff_handles, handle); + SYS_G_LIST_APPEND(poweroff_handles, handle); } _D("Last Timer: timer_id=%d pid=%d timeout=%d", handle->timeout_id, handle->pid, handle->timeout); @@ -431,10 +431,10 @@ static void system_shutdown_send_system_event(void) static int poweroff_option_valid(enum poweroff_type type_e, const char *option) { - dd_list *l; + GList *l; struct power_option *elem; - DD_LIST_FOREACH(poweroff_options, l, elem) { + SYS_G_LIST_FOREACH(poweroff_options, l, elem) { if (elem->type != type_e) continue; @@ -602,7 +602,7 @@ static GVariant *add_poweroff_time(GDBusConnection *conn, struct poweroff_handle *handle; int ret; pid_t pid; - dd_list *l; + GList *l; if (poweroff_stage >= POWEROFF_WAIT_OTHERS) { _E("It's too late. Poweroff is already in waiting stage."); @@ -618,7 +618,7 @@ static GVariant *add_poweroff_time(GDBusConnection *conn, CRITICAL_LOG("PID %d requested to a poweroff timer.", pid); - DD_LIST_FOREACH(poweroff_handles, l, handle) { + SYS_G_LIST_FOREACH(poweroff_handles, l, handle) { if (handle->pid == pid) break; } @@ -638,7 +638,7 @@ static GVariant *add_poweroff_time(GDBusConnection *conn, handle->timeout_id = 0; handle->timeout = POWEROFF_WAIT_MAX; - DD_LIST_APPEND(poweroff_handles, handle); + SYS_G_LIST_APPEND(poweroff_handles, handle); _D("Add a new poweroff timer. pid=%d timeout=%d timeout_id=%d)", handle->pid, handle->timeout, handle->timeout_id); ret = 0; @@ -652,7 +652,7 @@ static GVariant *remove_poweroff_time(GDBusConnection *conn, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { struct poweroff_handle *handle; - dd_list *l; + GList *l; int ret = 0; pid_t pid; @@ -664,7 +664,7 @@ static GVariant *remove_poweroff_time(GDBusConnection *conn, CRITICAL_LOG("PID %d requested to remove poweroff timer.", pid); - DD_LIST_FOREACH(poweroff_handles, l, handle) { + SYS_G_LIST_FOREACH(poweroff_handles, l, handle) { if (handle->pid == pid) break; } @@ -721,7 +721,7 @@ static int add_poweroff_option(enum poweroff_type type, const char *option) opt->type = type; opt->option = (option ? strdup(option) : NULL); - DD_LIST_APPEND(poweroff_options, opt); + SYS_G_LIST_APPEND(poweroff_options, opt); _D("Add %s option=%s", name, opt->option); diff --git a/src/time/time-handler.c b/src/time/time-handler.c index 9647f10..42f49a6 100644 --- a/src/time/time-handler.c +++ b/src/time/time-handler.c @@ -74,7 +74,7 @@ static int tfd = -1; static gboolean tfd_cb(gint fd, GIOCondition condition, gpointer user_data); static int timerfd_check_stop(int fd); static int timerfd_check_start(void); -static dd_list* (*get_cond_head) (enum state_t state); +static GList* (*get_cond_head) (enum state_t state); char *substring(const char *str, size_t begin, size_t len) { diff --git a/src/tzip/tzip.c b/src/tzip/tzip.c index 1ba50b4..0f0dff4 100644 --- a/src/tzip/tzip.c +++ b/src/tzip/tzip.c @@ -36,10 +36,10 @@ #include #include #include +#include #include "core/log.h" #include "core/devices.h" -#include "core/list.h" #include "core/device-notifier.h" #include "core/common.h" #include "tzip-utility.h" diff --git a/src/usb-host-test/usb-host-test.c b/src/usb-host-test/usb-host-test.c index cf10da9..e87d40b 100644 --- a/src/usb-host-test/usb-host-test.c +++ b/src/usb-host-test/usb-host-test.c @@ -24,13 +24,13 @@ #include #include #include +#include #include "core/log.h" #include "core/config-parser.h" #include "core/device-idler.h" #include "core/device-notifier.h" #include "core/devices.h" -#include "core/list.h" #define SYS_DUMMY_HCD_PATH "/sys/module/dummy_hcd" #define SYS_USB_FFS_PATH "/sys/kernel/config/usb_gadget/hal-gadget/functions/ffs.sdb.default" diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c index e99777a..4bb7e0b 100644 --- a/src/usbhost/usb-host.c +++ b/src/usbhost/usb-host.c @@ -23,12 +23,12 @@ #include #include #include +#include #include "core/log.h" #include "core/devices.h" #include "core/device-notifier.h" #include "core/udev.h" -#include "core/list.h" #include "core/device-idler.h" #include "apps/apps.h" #include "extcon/extcon.h" @@ -80,7 +80,7 @@ enum usbhost_hid_protocol { USB_HOST_HID_MOUSE = 2, }; -static dd_list *usbhost_list; +static GList *usbhost_list; enum policy_value { POLICY_NONE, @@ -128,7 +128,7 @@ static inline int is_policy_temporary(struct policy_entry *entry) entry->value == POLICY_DENY_NOW; } -static dd_list *access_list; +static GList *access_list; static struct usbhost_open_request { GDBusMethodInvocation *invocation; @@ -237,7 +237,7 @@ static int add_usbhost_list(struct udev_device *dev, const char *devpath) if (str) usbhost->serial = strdup(str); - DD_LIST_APPEND(usbhost_list, usbhost); + SYS_G_LIST_APPEND(usbhost_list, usbhost); broadcast_usbhost_signal(USB_HOST_ADDED, usbhost); @@ -254,10 +254,10 @@ static int add_usbhost_list(struct udev_device *dev, const char *devpath) static int remove_usbhost_list(const char *devpath) { struct usbhost_device *usbhost; - dd_list *n, *next; + GList *n, *next; /* find the matched item */ - DD_LIST_FOREACH_SAFE(usbhost_list, n, next, usbhost) { + SYS_G_LIST_FOREACH_SAFE(usbhost_list, n, next, usbhost) { if (!strncmp(usbhost->devpath, devpath, sizeof(usbhost->devpath))) break; @@ -277,7 +277,7 @@ static int remove_usbhost_list(const char *devpath) _I("USB HOST Removed."); _I("Devpath=%s", usbhost->devpath); - DD_LIST_REMOVE(usbhost_list, usbhost); + SYS_G_LIST_REMOVE(usbhost_list, usbhost); free(usbhost->manufacturer); free(usbhost->product); free(usbhost->serial); @@ -289,15 +289,15 @@ static int remove_usbhost_list(const char *devpath) static void remove_all_usbhost_list(void) { struct usbhost_device *usbhost; - dd_list *n, *next; + GList *n, *next; - DD_LIST_FOREACH_SAFE(usbhost_list, n, next, usbhost) { + SYS_G_LIST_FOREACH_SAFE(usbhost_list, n, next, usbhost) { /* for debugging */ _I("USB HOST Removed."); _I("Devpath=%s", usbhost->devpath); - DD_LIST_REMOVE(usbhost_list, usbhost); + SYS_G_LIST_REMOVE(usbhost_list, usbhost); free(usbhost->manufacturer); free(usbhost->product); free(usbhost->serial); @@ -312,7 +312,7 @@ static void uevent_usbhost_handler(struct udev_device *dev) const char *devpath; const char *action; struct policy_entry *entry; - dd_list *n, *next; + GList *n, *next; /** * Usb host device must have at least one interface. @@ -338,11 +338,11 @@ static void uevent_usbhost_handler(struct udev_device *dev) if (strncmp(subsystem, USB_SUBSYSTEM, sizeof(USB_SUBSYSTEM)) == 0 && strncmp(devtype, USB_DEVICE_DEVTYPE, sizeof(USB_DEVICE_DEVTYPE)) == 0 && strncmp(action, UDEV_REMOVE, sizeof(UDEV_REMOVE)) == 0) { - DD_LIST_FOREACH_SAFE(access_list, n, next, entry) { + SYS_G_LIST_FOREACH_SAFE(access_list, n, next, entry) { if (is_policy_temporary(entry) && strcmp(devpath, entry->devpath) == 0) { _I("Removed temporary policy for '%s'", devpath); - DD_LIST_REMOVE(access_list, entry); + SYS_G_LIST_REMOVE(access_list, entry); free(entry->creds.sec_label); free(entry); } @@ -423,11 +423,11 @@ static GVariant *print_device_list(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { - dd_list *elem; + GList *elem; struct usbhost_device *usbhost; int cnt = 0; - DD_LIST_FOREACH(usbhost_list, elem, usbhost) { + SYS_G_LIST_FOREACH(usbhost_list, elem, usbhost) { _I("== [%2d USB HOST DEVICE] ===============", cnt++); print_usbhost(usbhost); } @@ -440,7 +440,7 @@ static GVariant *get_device_list(GDBusConnection *conn, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { GVariant *gvar = NULL; - dd_list *elem; + GList *elem; struct usbhost_device *usbhost; int baseclass; GVariantBuilder *builder = NULL; @@ -456,7 +456,7 @@ static GVariant *get_device_list(GDBusConnection *conn, goto out; } - DD_LIST_FOREACH(usbhost_list, elem, usbhost) { + SYS_G_LIST_FOREACH(usbhost_list, elem, usbhost) { if (baseclass != USB_CLASS_ALL && usbhost->baseclass != baseclass) continue; @@ -495,14 +495,14 @@ static GVariant *get_device_list_count(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { - dd_list *elem; + GList *elem; struct usbhost_device *usbhost; int baseclass; int ret = 0; g_variant_get(param, "(i)", &baseclass); - DD_LIST_FOREACH(usbhost_list, elem, usbhost) { + SYS_G_LIST_FOREACH(usbhost_list, elem, usbhost) { if (baseclass != USB_CLASS_ALL && usbhost->baseclass != baseclass) continue; ret++; @@ -571,12 +571,12 @@ static GVariant *print_policy(GDBusConnection *conn, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { char line[ENTRY_LINE_SIZE]; - dd_list *elem; + GList *elem; struct policy_entry *entry; int ret; _I("USB access policy:"); - DD_LIST_FOREACH(access_list, elem, entry) { + SYS_G_LIST_FOREACH(access_list, elem, entry) { ret = marshal_policy_entry(line, ENTRY_LINE_SIZE, entry); if (ret < 0) break; @@ -589,7 +589,7 @@ static GVariant *print_policy(GDBusConnection *conn, static int store_policy(void) { int fd; - dd_list *elem; + GList *elem; struct policy_entry *entry; char line[256]; int ret; @@ -600,7 +600,7 @@ static int store_policy(void) return -errno; } - DD_LIST_FOREACH(access_list, elem, entry) { + SYS_G_LIST_FOREACH(access_list, elem, entry) { if (is_policy_temporary(entry)) continue; @@ -688,7 +688,7 @@ static int read_policy(void) _I("%04x:%04x : %s", entry->device.idVendor, entry->device.idProduct, value_str); - DD_LIST_APPEND(access_list, entry); + SYS_G_LIST_APPEND(access_list, entry); count++; } @@ -969,7 +969,7 @@ static void popup_result_signal_handler(GDBusConnection *conn, } entry->value = value; - DD_LIST_APPEND(access_list, entry); + SYS_G_LIST_APPEND(access_list, entry); ret = add_idle_request(store_idler_cb, NULL); if (ret < 0) { @@ -986,7 +986,7 @@ out: static int get_policy_value(struct usbhost_open_request *req) { int ret; - dd_list *elem; + GList *elem; struct policy_entry *entry; memset(&req->desc, 0, sizeof(req->desc)); @@ -998,7 +998,7 @@ static int get_policy_value(struct usbhost_open_request *req) return ret; } - DD_LIST_FOREACH(access_list, elem, entry) { + SYS_G_LIST_FOREACH(access_list, elem, entry) { if (entry->creds.uid != req->cred.uid || strncmp(entry->creds.sec_label, req->cred.sec_label, strlen(req->cred.sec_label)) != 0) continue; @@ -1024,10 +1024,10 @@ static int get_policy_value(struct usbhost_open_request *req) static void remove_all_access_list(void) { struct policy_entry *entry; - dd_list *n, *next; + GList *n, *next; - DD_LIST_FOREACH_SAFE(access_list, n, next, entry) { - DD_LIST_REMOVE(access_list, entry); + SYS_G_LIST_FOREACH_SAFE(access_list, n, next, entry) { + SYS_G_LIST_REMOVE(access_list, entry); free(entry->creds.sec_label); free(entry); } -- 2.7.4 From 02c021113393b4db2c501133eedb2e2140e77576 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Tue, 12 Jan 2021 09:54:42 +0900 Subject: [PATCH 04/16] Apply next HAL architecture (hal api + backend) Change-Id: I0d11e7e89a83846bbb7ab93b17cd3dc066e911e3 Signed-off-by: lokilee73 --- CMakeLists.txt | 3 +- packaging/deviced.spec | 2 + plugins/iot/display/core.c | 1 - plugins/iot/display/device-interface.c | 198 +++++++++++++-------------- plugins/iot/display/key-filter.c | 1 - plugins/mobile/display/core.c | 1 - plugins/mobile/display/device-interface.c | 198 +++++++++++++-------------- plugins/mobile/display/key-filter.c | 1 - plugins/tv/display/core.c | 1 - plugins/tv/display/device-interface.c | 199 ++++++++++++++------------- plugins/tv/display/key-filter.c | 1 - plugins/wearable/display/bezel.c | 76 ++++------- plugins/wearable/display/core.c | 1 - plugins/wearable/display/device-interface.c | 205 ++++++++++++++-------------- plugins/wearable/display/display-handler.c | 1 - plugins/wearable/display/enhance.c | 3 +- plugins/wearable/display/key-filter.c | 1 - plugins/wearable/display/lbm.c | 23 ++-- src/battery/battery-time.c | 12 +- src/battery/lowbat-handler.c | 2 +- src/battery/power-supply.c | 58 +++----- src/board/board-info.c | 35 ++--- src/display/device-interface.h | 4 +- src/extcon/extcon.c | 46 +++---- src/extcon/extcon.h | 2 +- src/led/rgb.c | 67 ++++----- src/led/torch.c | 49 ++----- src/led/touch-key.c | 62 ++++----- src/power/power-control.c | 1 - src/thermal/thermal.c | 41 ++---- src/touchscreen/sensitivity.c | 50 ++----- src/touchscreen/touchscreen.c | 73 ++++------ src/usb/usb-dbus.c | 2 +- src/usb/usb-debug.c | 2 +- src/usb/usb-state.c | 2 +- src/usb/usb-tethering.c | 2 +- src/usb/usb.c | 205 ++-------------------------- src/usbhost/usb-host.c | 1 + 38 files changed, 642 insertions(+), 990 deletions(-) mode change 100644 => 100755 plugins/tv/display/core.c diff --git a/CMakeLists.txt b/CMakeLists.txt index b104d6e..ad7c1a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,6 @@ SET(PKG_MODULES vconf dlog libudev - device-node capi-base-common glib-2.0 gio-2.0 @@ -176,6 +175,8 @@ SET(PKG_MODULES eventsystem libtzplatform-config hwcommon + hal-api-common + hal-api-device mount capi-system-info capi-system-device diff --git a/packaging/deviced.spec b/packaging/deviced.spec index ee2b337..e638868 100644 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -25,6 +25,8 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(eventsystem) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(hwcommon) +BuildRequires: pkgconfig(hal-api-common) +BuildRequires: pkgconfig(hal-api-device) BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libinput) diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index 5e5a727..ffaa749 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -44,7 +44,6 @@ #include "ambient-mode.h" #include "util.h" #include "core.h" -#include "device-node.h" #include "lock-detector.h" #include "display-ops.h" #include "core/devices.h" diff --git a/plugins/iot/display/device-interface.c b/plugins/iot/display/device-interface.c index ea407fb..ee04a1c 100644 --- a/plugins/iot/display/device-interface.c +++ b/plugins/iot/display/device-interface.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "power/power-control.h" @@ -41,7 +42,6 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "device-node.h" #include "display/display-dpms.h" #include "display/display.h" #include "display/display-lock.h" @@ -74,7 +74,7 @@ static int custom_brightness; static int force_brightness; static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; -static struct display_device *display_dev; +static bool display_dev_available = false; static guint release_timer; static struct display_config *display_conf; @@ -83,9 +83,9 @@ inline struct _backlight_ops *get_var_backlight_ops(void) return &backlight_ops; } -struct display_device *display_dev_get(void) +bool display_dev_ready(void) { - return display_dev; + return display_dev_available; } void dpms_set_running_state(int val) @@ -129,7 +129,7 @@ static int get_lcd_power_node(void) int ret; enum display_state val; - ret = display_dev->get_state(&val); + ret = hal_device_display_get_state(&val); if (ret < 0) return ret; @@ -187,14 +187,16 @@ static void change_brightness(int start, int end, int step) _I("start %d end %d step %d", start, end, step); - if (display_dev && display_dev->set_multi_brightness) { - ret = display_dev->set_multi_brightness(end, step, LCD_PHASED_DELAY); - if (ret < 0) - _E("Failed to set_multi_brightness (%d)", ret); + if (display_dev_available) { + ret = hal_device_display_set_multi_brightness(end, step, LCD_PHASED_DELAY); + if (ret != -ENODEV) { + if (ret < 0) + _E("Failed to set_multi_brightness (%d)", ret); - backlight_ops.set_brightness(end); + backlight_ops.set_brightness(end); - return; + return; + } } diff = end - start; @@ -380,20 +382,21 @@ static int get_max_brightness(void) if (max > 0) return max; - if (!display_dev) { - _E("There is no display device."); + if (!display_dev_available) { + _E("There is no HAL for display."); return -ENOENT; } - if (!display_dev->get_max_brightness) { - max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; - return max; - } - - ret = display_dev->get_max_brightness(&max); + ret = hal_device_display_get_max_brightness(&max); if (ret < 0) { - _E("Failed to get max brightness: %d", ret); - return ret; + if (ret == -ENODEV) { + _E("Get max brightness is not supported."); + max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; + return max; + } else { + _E("Failed to get max brightness: %d", ret); + return ret; + } } return max; @@ -403,7 +406,7 @@ static int set_brightness(int val) { int max; - if (!display_dev || !display_dev->set_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } @@ -430,7 +433,7 @@ static int set_brightness(int val) _I("set brightness %d (default:%d)", val, default_brightness); device_notify(DEVICE_NOTIFIER_DISPLAY_BRIGHTNESS, (void *)&val); - return display_dev->set_brightness(val); + return hal_device_display_set_brightness(val); } static int get_brt_normalized(int brt_raw) @@ -467,14 +470,18 @@ static int get_brightness(int *val) { int brt, ret; - if (!display_dev || !display_dev->get_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_brightness(&brt); + ret = hal_device_display_get_brightness(&brt); if (ret < 0) { - _E("Failed to get brightness: %d", ret); + if (ret == -ENODEV) + _E("Get brightness is not supported."); + else + _E("Failed to get brightness: %d", ret); + return ret; } @@ -487,12 +494,16 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i int brt_raw; int ret; - if (!display_dev || !display_dev->get_auto_brightness) + if (!display_dev_available) return -ENOTSUP; - ret = display_dev->get_auto_brightness(lmax, lmin, light, &brt_raw); + ret = hal_device_display_get_auto_brightness(lmax, lmin, light, &brt_raw); if (ret < 0) { - _E("Failed to get brightness by light sensor: %d", ret); + if (ret == -ENODEV) + _E("Get auto brightness is not supported."); + else + _E("Failed to get brightness by light sensor: %d", ret); + return ret; } @@ -505,14 +516,18 @@ static int get_image_effect(enum display_image_effect *effect) int ret; enum display_image_effect val; - if (!display_dev || !display_dev->get_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_image_effect(&val); + ret = hal_device_display_get_image_effect(&val); if (ret < 0) { - _E("Failed to get image effect: %d", ret); + if (ret == -ENODEV) + _E("Get image effect is not supported."); + else + _E("Failed to get image effect: %d", ret); + return ret; } @@ -525,14 +540,18 @@ static int set_image_effect(enum display_image_effect effect) { int ret; - if (!display_dev || !display_dev->set_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_image_effect(effect); + ret = hal_device_display_set_image_effect(effect); if (ret < 0) { - _E("Failed to set image effect: %d", ret); + if (ret == -ENODEV) + _E("Set image effect is not supported."); + else + _E("Failed to set image effect: %d", ret); + return ret; } @@ -544,14 +563,18 @@ static int get_panel_mode(enum display_panel_mode *mode) int ret; enum display_panel_mode val; - if (!display_dev || !display_dev->get_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_panel_mode(&val); + ret = hal_device_display_get_panel_mode(&val); if (ret < 0) { - _E("failed to get panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Get panel mode is not supported."); + else + _E("Failed to get panel mode(%d)", ret); + return ret; } @@ -564,14 +587,18 @@ static int set_panel_mode(enum display_panel_mode mode) { int ret; - if (!display_dev || !display_dev->set_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_panel_mode(mode); + ret = hal_device_display_set_panel_mode(mode); if (ret < 0) { - _E("failed to set panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Set panel mode is not supported."); + else + _E("Failed to set panel mode(%d)", ret); + return ret; } @@ -583,10 +610,10 @@ static int get_frame_rate(int *rate) if (!rate) return -EINVAL; - if (!display_dev || !display_dev->get_frame_rate) + if (!display_dev_available) return -ENOTSUP; - return display_dev->get_frame_rate(rate); + return hal_device_display_get_frame_rate(rate); } static int set_frame_rate(int rate) @@ -594,39 +621,34 @@ static int set_frame_rate(int rate) int ret; static int fmin = -1, fmax = -1; - if (!display_dev || - !display_dev->set_frame_rate) + if (!display_dev_available) return -ENOTSUP; - if (display_dev->get_min_frame_rate) { - if (fmin < 0) { - ret = display_dev->get_min_frame_rate(&fmin); - if (ret < 0) { - _E("Failed to get min frate rate: %d", ret); - return ret; - } - } - if (rate < fmin) { - _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); - return -EINVAL; + if (fmin < 0) { + ret = hal_device_display_get_min_frame_rate(&fmin); + if (ret < 0) { + _E("Failed to get min frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate < fmin)) { + _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); + return -EINVAL; + } - if (display_dev->get_max_frame_rate) { - if (fmax < 0) { - ret = display_dev->get_max_frame_rate(&fmax); - if (ret < 0) { - _E("Failed to get max frate rate: %d", ret); - return ret; - } - } - if (rate > fmax) { - _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); - return -EINVAL; + if (fmax < 0) { + ret = hal_device_display_get_max_frame_rate(&fmax); + if (ret < 0) { + _E("Failed to get max frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate > fmax)) { + _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); + return -EINVAL; + } - return display_dev->set_frame_rate(rate); + return hal_device_display_set_frame_rate(rate); } /* It was operated only AOD enter & leave */ @@ -757,49 +779,27 @@ static struct _backlight_ops backlight_ops = { int display_service_load(void) { - struct hw_info *info; int r; - if (display_dev) + if (display_dev_available) return 0; - r = hw_get_info(DISPLAY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + r = hal_device_display_get_backend(); if (r < 0) { - _I("display shared library is not supported: %d", r); + _E("There is no HAL for display."); + display_dev_available = false; return 0; } - if (!info->open) { - _E("Failed to open display device: open(NULL)."); - return -EPERM; - } - - r = info->open(info, NULL, (struct hw_common **)&display_dev); - if (r < 0) { - _E("Failed to get display device structure: %d", r); - return -EPERM; - } - + display_dev_available = true; _D("Display device structure load success."); return 0; } int display_service_free(void) { - struct hw_info *info; - - if (!display_dev) - return -ENOENT; - - info = display_dev->common.info; - - assert(info); - - info->close((struct hw_common *)display_dev); - display_dev = NULL; - - return 0; + display_dev_available = false; + return hal_device_display_put_backend(); } /* Dummy. Do not consider detached display state */ diff --git a/plugins/iot/display/key-filter.c b/plugins/iot/display/key-filter.c index bc9d0dd..9e6e343 100644 --- a/plugins/iot/display/key-filter.c +++ b/plugins/iot/display/key-filter.c @@ -31,7 +31,6 @@ #include "util.h" #include "core.h" #include "poll.h" -#include "device-node.h" #include "display-actor.h" #include "display-ops.h" #include "core/common.h" diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index d7f8aea..a8f516c 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -44,7 +44,6 @@ #include "ambient-mode.h" #include "util.h" #include "core.h" -#include "device-node.h" #include "lock-detector.h" #include "display-ops.h" #include "core/devices.h" diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c index d4ef77b..313ec9c 100644 --- a/plugins/mobile/display/device-interface.c +++ b/plugins/mobile/display/device-interface.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "core/log.h" @@ -40,7 +41,6 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "device-node.h" #include "display/display-dpms.h" #include "display/display.h" #include "display/display-lock.h" @@ -73,7 +73,7 @@ static int custom_brightness; static int force_brightness; static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; -static struct display_device *display_dev; +static bool display_dev_available = false; static guint release_timer; static struct display_config *display_conf; @@ -82,9 +82,9 @@ inline struct _backlight_ops *get_var_backlight_ops(void) return &backlight_ops; } -struct display_device *display_dev_get(void) +bool display_dev_ready(void) { - return display_dev; + return display_dev_available; } void dpms_set_running_state(int val) @@ -128,7 +128,7 @@ static int get_lcd_power_node(void) int ret; enum display_state val; - ret = display_dev->get_state(&val); + ret = hal_device_display_get_state(&val); if (ret < 0) return ret; @@ -186,14 +186,16 @@ static void change_brightness(int start, int end, int step) _I("start %d end %d step %d", start, end, step); - if (display_dev && display_dev->set_multi_brightness) { - ret = display_dev->set_multi_brightness(end, step, LCD_PHASED_DELAY); - if (ret < 0) - _E("Failed to set_multi_brightness (%d)", ret); + if (display_dev_available) { + ret = hal_device_display_set_multi_brightness(end, step, LCD_PHASED_DELAY); + if (ret != -ENODEV) { + if (ret < 0) + _E("Failed to set_multi_brightness (%d)", ret); - backlight_ops.set_brightness(end); + backlight_ops.set_brightness(end); - return; + return; + } } diff = end - start; @@ -379,20 +381,21 @@ static int get_max_brightness(void) if (max > 0) return max; - if (!display_dev) { - _E("There is no display device."); + if (!display_dev_available) { + _E("There is no HAL for display."); return -ENOENT; } - if (!display_dev->get_max_brightness) { - max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; - return max; - } - - ret = display_dev->get_max_brightness(&max); + ret = hal_device_display_get_max_brightness(&max); if (ret < 0) { - _E("Failed to get max brightness: %d", ret); - return ret; + if (ret == -ENODEV) { + _E("Get max brightness is not supported."); + max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; + return max; + } else { + _E("Failed to get max brightness: %d", ret); + return ret; + } } return max; @@ -402,7 +405,7 @@ static int set_brightness(int val) { int max; - if (!display_dev || !display_dev->set_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } @@ -429,7 +432,7 @@ static int set_brightness(int val) _I("set brightness %d (default:%d)", val, default_brightness); device_notify(DEVICE_NOTIFIER_DISPLAY_BRIGHTNESS, (void *)&val); - return display_dev->set_brightness(val); + return hal_device_display_set_brightness(val); } static int get_brt_normalized(int brt_raw) @@ -466,14 +469,18 @@ static int get_brightness(int *val) { int brt, ret; - if (!display_dev || !display_dev->get_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_brightness(&brt); + ret = hal_device_display_get_brightness(&brt); if (ret < 0) { - _E("Failed to get brightness: %d", ret); + if (ret == -ENODEV) + _E("Get brightness is not supported."); + else + _E("Failed to get brightness: %d", ret); + return ret; } @@ -486,12 +493,16 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i int brt_raw; int ret; - if (!display_dev || !display_dev->get_auto_brightness) + if (!display_dev_available) return -ENOTSUP; - ret = display_dev->get_auto_brightness(lmax, lmin, light, &brt_raw); + ret = hal_device_display_get_auto_brightness(lmax, lmin, light, &brt_raw); if (ret < 0) { - _E("Failed to get brightness by light sensor: %d", ret); + if (ret == -ENODEV) + _E("Get auto brightness is not supported."); + else + _E("Failed to get brightness by light sensor: %d", ret); + return ret; } @@ -504,14 +515,18 @@ static int get_image_effect(enum display_image_effect *effect) int ret; enum display_image_effect val; - if (!display_dev || !display_dev->get_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_image_effect(&val); + ret = hal_device_display_get_image_effect(&val); if (ret < 0) { - _E("Failed to get image effect: %d", ret); + if (ret == -ENODEV) + _E("Get image effect is not supported."); + else + _E("Failed to get image effect: %d", ret); + return ret; } @@ -524,14 +539,18 @@ static int set_image_effect(enum display_image_effect effect) { int ret; - if (!display_dev || !display_dev->set_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_image_effect(effect); + ret = hal_device_display_set_image_effect(effect); if (ret < 0) { - _E("Failed to set image effect: %d", ret); + if (ret == -ENODEV) + _E("Set image effect is not supported."); + else + _E("Failed to set image effect: %d", ret); + return ret; } @@ -543,14 +562,18 @@ static int get_panel_mode(enum display_panel_mode *mode) int ret; enum display_panel_mode val; - if (!display_dev || !display_dev->get_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_panel_mode(&val); + ret = hal_device_display_get_panel_mode(&val); if (ret < 0) { - _E("failed to get panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Get panel mode is not supported."); + else + _E("Failed to get panel mode(%d)", ret); + return ret; } @@ -563,14 +586,18 @@ static int set_panel_mode(enum display_panel_mode mode) { int ret; - if (!display_dev || !display_dev->set_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_panel_mode(mode); + ret = hal_device_display_set_panel_mode(mode); if (ret < 0) { - _E("failed to set panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Set panel mode is not supported."); + else + _E("Failed to set panel mode(%d)", ret); + return ret; } @@ -582,10 +609,10 @@ static int get_frame_rate(int *rate) if (!rate) return -EINVAL; - if (!display_dev || !display_dev->get_frame_rate) + if (!display_dev_available) return -ENOTSUP; - return display_dev->get_frame_rate(rate); + return hal_device_display_get_frame_rate(rate); } static int set_frame_rate(int rate) @@ -593,39 +620,34 @@ static int set_frame_rate(int rate) int ret; static int fmin = -1, fmax = -1; - if (!display_dev || - !display_dev->set_frame_rate) + if (!display_dev_available) return -ENOTSUP; - if (display_dev->get_min_frame_rate) { - if (fmin < 0) { - ret = display_dev->get_min_frame_rate(&fmin); - if (ret < 0) { - _E("Failed to get min frate rate: %d", ret); - return ret; - } - } - if (rate < fmin) { - _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); - return -EINVAL; + if (fmin < 0) { + ret = hal_device_display_get_min_frame_rate(&fmin); + if (ret < 0) { + _E("Failed to get min frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate < fmin)) { + _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); + return -EINVAL; + } - if (display_dev->get_max_frame_rate) { - if (fmax < 0) { - ret = display_dev->get_max_frame_rate(&fmax); - if (ret < 0) { - _E("Failed to get max frate rate: %d", ret); - return ret; - } - } - if (rate > fmax) { - _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); - return -EINVAL; + if (fmax < 0) { + ret = hal_device_display_get_max_frame_rate(&fmax); + if (ret < 0) { + _E("Failed to get max frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate > fmax)) { + _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); + return -EINVAL; + } - return display_dev->set_frame_rate(rate); + return hal_device_display_set_frame_rate(rate); } /* It was operated only AOD enter & leave */ @@ -756,49 +778,27 @@ static struct _backlight_ops backlight_ops = { int display_service_load(void) { - struct hw_info *info; int r; - if (display_dev) + if (display_dev_available) return 0; - r = hw_get_info(DISPLAY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + r = hal_device_display_get_backend(); if (r < 0) { - _I("display shared library is not supported: %d", r); + _E("There is no HAL for display."); + display_dev_available = false; return 0; } - if (!info->open) { - _E("Failed to open display device: open(NULL)."); - return -EPERM; - } - - r = info->open(info, NULL, (struct hw_common **)&display_dev); - if (r < 0) { - _E("Failed to get display device structure: %d", r); - return -EPERM; - } - + display_dev_available = true; _D("Display device structure load success."); return 0; } int display_service_free(void) { - struct hw_info *info; - - if (!display_dev) - return -ENOENT; - - info = display_dev->common.info; - - assert(info); - - info->close((struct hw_common *)display_dev); - display_dev = NULL; - - return 0; + display_dev_available = false; + return hal_device_display_put_backend(); } static int booting_done(void *data) diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c index 7a57a98..93bcaaf 100644 --- a/plugins/mobile/display/key-filter.c +++ b/plugins/mobile/display/key-filter.c @@ -31,7 +31,6 @@ #include "util.h" #include "core.h" #include "poll.h" -#include "device-node.h" #include "display-actor.h" #include "display-ops.h" #include "core/common.h" diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c old mode 100644 new mode 100755 index 4fe32fa..98a999a --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -44,7 +44,6 @@ #include "ambient-mode.h" #include "util.h" #include "core.h" -#include "device-node.h" #include "lock-detector.h" #include "display-ops.h" #include "core/devices.h" diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c index da6583c..d7a8221 100644 --- a/plugins/tv/display/device-interface.c +++ b/plugins/tv/display/device-interface.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "core/log.h" @@ -40,7 +41,6 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "device-node.h" #include "display/display-dpms.h" #include "display/display.h" #include "power/power-control.h" @@ -74,7 +74,7 @@ static int custom_brightness; static int force_brightness; static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; -static struct display_device *display_dev; +static bool display_dev_available = false; static guint release_timer; static struct display_config *display_conf; @@ -83,9 +83,9 @@ inline struct _backlight_ops *get_var_backlight_ops(void) return &backlight_ops; } -struct display_device *display_dev_get(void) +bool display_dev_ready(void) { - return display_dev; + return display_dev_available; } void dpms_set_running_state(int val) @@ -129,7 +129,7 @@ static int get_lcd_power_node(void) int ret; enum display_state val; - ret = display_dev->get_state(&val); + ret = hal_device_display_get_state(&val); if (ret < 0) return ret; @@ -187,14 +187,16 @@ static void change_brightness(int start, int end, int step) _I("start %d end %d step %d", start, end, step); - if (display_dev && display_dev->set_multi_brightness) { - ret = display_dev->set_multi_brightness(end, step, LCD_PHASED_DELAY); - if (ret < 0) - _E("Failed to set_multi_brightness (%d)", ret); + if (display_dev_available) { + ret = hal_device_display_set_multi_brightness(end, step, LCD_PHASED_DELAY); + if (ret != -ENODEV) { + if (ret < 0) + _E("Failed to set_multi_brightness (%d)", ret); - backlight_ops.set_brightness(end); + backlight_ops.set_brightness(end); - return; + return; + } } diff = end - start; @@ -380,20 +382,21 @@ static int get_max_brightness(void) if (max > 0) return max; - if (!display_dev) { - _E("There is no display device."); + if (!display_dev_available) { + _E("There is no HAL for display device."); return -ENOENT; } - if (!display_dev->get_max_brightness) { - max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; - return max; - } - - ret = display_dev->get_max_brightness(&max); + ret = hal_device_display_get_max_brightness(&max); if (ret < 0) { - _E("Failed to get max brightness: %d", ret); - return ret; + if (ret == -ENODEV) { + _E("Get max brightness is not supported."); + max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; + return max; + } else { + _E("Failed to get max brightness: %d", ret); + return ret; + } } return max; @@ -403,7 +406,7 @@ static int set_brightness(int val) { int max; - if (!display_dev || !display_dev->set_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } @@ -430,7 +433,7 @@ static int set_brightness(int val) _I("set brightness %d (default:%d)", val, default_brightness); device_notify(DEVICE_NOTIFIER_DISPLAY_BRIGHTNESS, (void *)&val); - return display_dev->set_brightness(val); + return hal_device_display_set_brightness(val); } static int get_brt_normalized(int brt_raw) @@ -467,14 +470,18 @@ static int get_brightness(int *val) { int brt, ret; - if (!display_dev || !display_dev->get_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_brightness(&brt); + ret = hal_device_display_get_brightness(&brt); if (ret < 0) { - _E("Failed to get brightness: %d", ret); + if (ret == -ENODEV) + _E("Get brightness is not supported."); + else + _E("Failed to get brightness: %d", ret); + return ret; } @@ -487,12 +494,16 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i int brt_raw; int ret; - if (!display_dev || !display_dev->get_auto_brightness) + if (!display_dev_available) return -ENOTSUP; - ret = display_dev->get_auto_brightness(lmax, lmin, light, &brt_raw); + ret = hal_device_display_get_auto_brightness(lmax, lmin, light, &brt_raw); if (ret < 0) { - _E("Failed to get brightness by light sensor: %d", ret); + if (ret == -ENODEV) + _E("Get auto brightness is not supported."); + else + _E("Failed to get brightness by light sensor: %d", ret); + return ret; } @@ -505,14 +516,18 @@ static int get_image_effect(enum display_image_effect *effect) int ret; enum display_image_effect val; - if (!display_dev || !display_dev->get_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_image_effect(&val); + ret = hal_device_display_get_image_effect(&val); if (ret < 0) { - _E("Failed to get image effect: %d", ret); + if (ret == -ENODEV) + _E("Get image effect is not supported."); + else + _E("Failed to get image effect: %d", ret); + return ret; } @@ -525,14 +540,18 @@ static int set_image_effect(enum display_image_effect effect) { int ret; - if (!display_dev || !display_dev->set_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_image_effect(effect); + ret = hal_device_display_set_image_effect(effect); if (ret < 0) { - _E("Failed to set image effect: %d", ret); + if (ret == -ENODEV) + _E("Set image effect is not supported."); + else + _E("Failed to set image effect: %d", ret); + return ret; } @@ -544,14 +563,18 @@ static int get_panel_mode(enum display_panel_mode *mode) int ret; enum display_panel_mode val; - if (!display_dev || !display_dev->get_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_panel_mode(&val); + ret = hal_device_display_get_panel_mode(&val); if (ret < 0) { - _E("failed to get panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Get panel mode is not supported."); + else + _E("Failed to get panel mode(%d)", ret); + return ret; } @@ -564,14 +587,18 @@ static int set_panel_mode(enum display_panel_mode mode) { int ret; - if (!display_dev || !display_dev->set_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_panel_mode(mode); + ret = hal_device_display_set_panel_mode(mode); if (ret < 0) { - _E("failed to set panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Set panel mode is not supported."); + else + _E("Failed to set panel mode(%d)", ret); + return ret; } @@ -583,10 +610,10 @@ static int get_frame_rate(int *rate) if (!rate) return -EINVAL; - if (!display_dev || !display_dev->get_frame_rate) + if (!display_dev_available) return -ENOTSUP; - return display_dev->get_frame_rate(rate); + return hal_device_display_get_frame_rate(rate); } static int set_frame_rate(int rate) @@ -594,39 +621,34 @@ static int set_frame_rate(int rate) int ret; static int fmin = -1, fmax = -1; - if (!display_dev || - !display_dev->set_frame_rate) + if (!display_dev_available) return -ENOTSUP; - if (display_dev->get_min_frame_rate) { - if (fmin < 0) { - ret = display_dev->get_min_frame_rate(&fmin); - if (ret < 0) { - _E("Failed to get min frate rate: %d", ret); - return ret; - } - } - if (rate < fmin) { - _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); - return -EINVAL; + if (fmin < 0) { + ret = hal_device_display_get_min_frame_rate(&fmin); + if (ret < 0) { + _E("Failed to get min frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate < fmin)) { + _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); + return -EINVAL; + } - if (display_dev->get_max_frame_rate) { - if (fmax < 0) { - ret = display_dev->get_max_frame_rate(&fmax); - if (ret < 0) { - _E("Failed to get max frate rate: %d", ret); - return ret; - } - } - if (rate > fmax) { - _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); - return -EINVAL; + if (fmax < 0) { + ret = hal_device_display_get_max_frame_rate(&fmax); + if (ret < 0) { + _E("Failed to get max frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate > fmax)) { + _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); + return -EINVAL; + } - return display_dev->set_frame_rate(rate); + return hal_device_display_set_frame_rate(rate); } /* It was operated only AOD enter & leave */ @@ -757,52 +779,29 @@ static struct _backlight_ops backlight_ops = { int display_service_load(void) { - struct hw_info *info; int r; - if (display_dev) + if (display_dev_available) return 0; - r = hw_get_info(DISPLAY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + r = hal_device_display_get_backend(); if (r < 0) { - _I("display shared library is not supported: %d", r); + _E("There is no HAL for display."); + display_dev_available = false; return 0; } - if (!info->open) { - _E("Failed to open display device: open(NULL)."); - return -EPERM; - } - - r = info->open(info, NULL, (struct hw_common **)&display_dev); - if (r < 0) { - _E("Failed to get display device structure: %d", r); - return -EPERM; - } - + display_dev_available = true; _D("Display device structure load success."); return 0; } int display_service_free(void) { - struct hw_info *info; - - if (!display_dev) - return -ENOENT; - - info = display_dev->common.info; - - assert(info); - - info->close((struct hw_common *)display_dev); - display_dev = NULL; - - return 0; + display_dev_available = false; + return hal_device_display_put_backend(); } - /* Dummy. Do not consider detached display state */ int is_lcdon_blocked(void) { diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c index 68fcf78..90a94dd 100644 --- a/plugins/tv/display/key-filter.c +++ b/plugins/tv/display/key-filter.c @@ -31,7 +31,6 @@ #include "util.h" #include "core.h" #include "poll.h" -#include "device-node.h" #include "display-actor.h" #include "display-ops.h" #include "core/common.h" diff --git a/plugins/wearable/display/bezel.c b/plugins/wearable/display/bezel.c index 87bd336..9cec8b3 100644 --- a/plugins/wearable/display/bezel.c +++ b/plugins/wearable/display/bezel.c @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include #include @@ -45,7 +45,7 @@ enum bezel_type { static enum bezel_state bezel_wakeup_control(void); static struct display_plugin *disp_plgn; -static struct bezel_device *bezel_dev; +static bool bezel_dev_available = false; static int bezel_wakeup = 0; static int theater_mode = 0; static int goodnight_mode = 0; @@ -70,8 +70,8 @@ static void theater_changed_cb(keynode_t *key_nodes, void *data) assert(key_nodes); - if (!bezel_dev || !bezel_dev->set_state) { - _E("bezel_dev->set_state is not supported."); + if (!bezel_dev_available) { + _E("There is no HAL for bezel."); return; } @@ -80,7 +80,7 @@ static void theater_changed_cb(keynode_t *key_nodes, void *data) if (get_pm_cur_state() == LCD_OFF) { state = bezel_wakeup_control(); - bezel_dev->set_state(state); + hal_device_bezel_set_state(state); } } @@ -90,8 +90,8 @@ static void goodnight_changed_cb(keynode_t *key_nodes, void *data) assert(key_nodes); - if (!bezel_dev || !bezel_dev->set_state) { - _E("bezel_dev->set_state is not supported."); + if (!bezel_dev_available) { + _E("There is no HAL for bezel."); return; } @@ -100,7 +100,7 @@ static void goodnight_changed_cb(keynode_t *key_nodes, void *data) if (get_pm_cur_state() == LCD_OFF) { state = bezel_wakeup_control(); - bezel_dev->set_state(state); + hal_device_bezel_set_state(state); } } @@ -113,13 +113,12 @@ static void bezel_rotary_event_cb(keynode_t *key_nodes, void *data) bezel_state = (enum bezel_state) vconf_keynode_get_bool(key_nodes); - if (!bezel_dev || !bezel_dev->set_sw_state) { - _E("bezel_dev->set_sw_state is not supported."); + if (!bezel_dev_available) { + _E("There is no HAL for bezel."); return; } - ret = bezel_dev->set_sw_state(bezel_state); - + ret = hal_device_bezel_set_sw_state(bezel_state); if (ret == 0) { _I("Bezel rotary event condition is %d", bezel_state); if (disp_plgn->pm_change_internal) @@ -133,12 +132,12 @@ static void bezel_rotary_vibration_set_state(int state) { int ret; - if (!bezel_dev || !bezel_dev->set_vib_state) { - _E("bezel_dev->set_vib_state is not supported."); + if (!bezel_dev_available) { + _E("There is no HAL for bezel."); return; } - ret = bezel_dev->set_vib_state(state); + ret = hal_device_bezel_set_vib_state(state); if (ret < 0) _E("Can't set vib state %d (ret %d)", state, ret); } @@ -158,29 +157,20 @@ static void bezel_rotary_vibration_changed_cb(keynode_t *key_nodes, void *data) static int bezel_probe(void *data) { - struct hw_info *info; int ret; - if (bezel_dev) + if (bezel_dev_available) return 0; - ret = hw_get_info(BEZEL_HARDWARE_DEVICE_ID, (const struct hw_info **)&info); + ret = hal_device_bezel_get_backend(); if (ret < 0) { - _I("bezel shared library is not supported: %d", ret); - return -ENOTSUP; - } + _E("There is no HAL for bezel."); + bezel_dev_available = false; - if (!info->open) { - _E("Fail to open bezel device : open(NULL)"); - return -ENODEV; - } - - ret = info->open(info, NULL, (struct hw_common **)&bezel_dev); - if (ret < 0) { - _E("Fail to get bezel device structure: %d", ret); return ret; } + bezel_dev_available = true; return 0; } @@ -191,13 +181,13 @@ static void bezel_init(void *data) int bezel_vib_state = -1; enum bezel_state init_bezel_state; - if (!bezel_dev) + if (!bezel_dev_available) return; - if (bezel_dev->get_sw_state && bezel_dev->get_sw_state(&init_bezel_state) == 0) { + if (hal_device_bezel_get_sw_state(&init_bezel_state) == 0) { _I("Init SW bezel, state: %d", init_bezel_state); bezel_type = BEZEL_SOFT; - } else if (bezel_dev->get_state && bezel_dev->get_state(&init_bezel_state) == 0) { + } else if (hal_device_bezel_get_state(&init_bezel_state) == 0) { _I("Init HW bezel, state: %d", init_bezel_state); bezel_type = BEZEL_HARD; } else { @@ -235,7 +225,7 @@ static void bezel_init(void *data) ret = vconf_get_bool(VCONFKEY_SETAPPL_ROTARY_EVENT_ENABLED_BOOL, &bezel_rotary_event); if (ret == 0) { - ret = bezel_dev->set_sw_state(bezel_rotary_event); + ret = hal_device_bezel_set_sw_state(bezel_rotary_event); if (ret == 0) _I("Bezel rotary event conditoin: %d.", bezel_rotary_event); else @@ -255,16 +245,8 @@ static void bezel_init(void *data) static void bezel_exit(void *data) { - struct hw_info *info; - - if (!bezel_dev) - return; - - info = bezel_dev->common.info; - - assert(info); - - info->close((struct hw_common *)bezel_dev); + bezel_dev_available = false; + hal_device_bezel_put_backend(); } static enum bezel_state bezel_wakeup_control(void) @@ -277,11 +259,11 @@ static enum bezel_state bezel_wakeup_control(void) static int bezel_start(enum device_flags flags) { - if (!bezel_dev) + if (!bezel_dev_available) return 0; if (bezel_type == BEZEL_HARD) - return bezel_dev->set_state(BEZEL_TURNON); + return hal_device_bezel_set_state(BEZEL_TURNON); return 0; } @@ -290,12 +272,12 @@ static int bezel_stop(enum device_flags flags) { enum bezel_state state; - if (!bezel_dev) + if (!bezel_dev_available) return 0; if (bezel_type == BEZEL_HARD) { state = bezel_wakeup_control(); - return bezel_dev->set_state(state); + return hal_device_bezel_set_state(state); } return 0; diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index d69a3b6..6c12358 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -45,7 +45,6 @@ #include "ambient-mode.h" #include "util.h" #include "core.h" -#include "device-node.h" #include "lock-detector.h" #include "display-ops.h" #include "core/devices.h" diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c index b368fba..d0bef60 100644 --- a/plugins/wearable/display/device-interface.c +++ b/plugins/wearable/display/device-interface.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "core/log.h" @@ -40,7 +41,6 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "device-node.h" #include "display/display-dpms.h" #include "display/display.h" #include "display/display-lock.h" @@ -80,7 +80,7 @@ static int custom_brightness; static int force_brightness; static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; -static struct display_device *display_dev; +static bool display_dev_available = false; static guint release_timer; static int aod_max_level = -1; static int aod_normal_level = -1; @@ -95,9 +95,9 @@ inline struct _backlight_ops *get_var_backlight_ops(void) return &backlight_ops; } -struct display_device *display_dev_get(void) +bool display_dev_ready(void) { - return display_dev; + return display_dev_available; } void dpms_set_running_state(int val) @@ -141,7 +141,7 @@ static int get_lcd_power_node(void) int ret; enum display_state val; - ret = display_dev->get_state(&val); + ret = hal_device_display_get_state(&val); if (ret < 0) return ret; @@ -198,14 +198,16 @@ static void change_brightness(int start, int end, int step) _I("start %d end %d step %d", start, end, step); - if (display_dev && display_dev->set_multi_brightness) { - ret = display_dev->set_multi_brightness(end, step, LCD_PHASED_DELAY); - if (ret < 0) - _E("Failed to set_multi_brightness (%d)", ret); + if (display_dev_available) { + ret = hal_device_display_set_multi_brightness(end, step, LCD_PHASED_DELAY); + if (ret != -ENODEV) { + if (ret < 0) + _E("Failed to set_multi_brightness (%d)", ret); - backlight_ops.set_brightness(end); + backlight_ops.set_brightness(end); - return; + return; + } } diff = end - start; @@ -391,20 +393,21 @@ static int get_max_brightness(void) if (max > 0) return max; - if (!display_dev) { - _E("There is no display device."); + if (!display_dev_available) { + _E("There is no HAL for display."); return -ENOENT; } - if (!display_dev->get_max_brightness) { - max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; - return max; - } - - ret = display_dev->get_max_brightness(&max); + ret = hal_device_display_get_max_brightness(&max); if (ret < 0) { - _E("Failed to get max brightness: %d", ret); - return ret; + if (ret == -ENODEV) { + _E("Get max brightness is not supported."); + max = DEFAULT_DISPLAY_MAX_BRIGHTNESS; + return max; + } else { + _E("Failed to get max brightness: %d", ret); + return ret; + } } return max; @@ -414,7 +417,7 @@ static int set_brightness(int val) { int max; - if (!display_dev || !display_dev->set_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } @@ -442,7 +445,7 @@ static int set_brightness(int val) _I("set brightness %d (default:%d)", val, default_brightness); device_notify(DEVICE_NOTIFIER_DISPLAY_BRIGHTNESS, (void *)&val); - return display_dev->set_brightness(val); + return hal_device_display_set_brightness(val); } static int get_brt_normalized(int brt_raw) @@ -479,14 +482,18 @@ static int get_brightness(int *val) { int brt, ret; - if (!display_dev || !display_dev->get_brightness) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_brightness(&brt); + ret = hal_device_display_get_brightness(&brt); if (ret < 0) { - _E("Failed to get brightness: %d", ret); + if (ret == -ENODEV) + _E("Get brightness is not supported."); + else + _E("Failed to get brightness: %d", ret); + return ret; } @@ -499,12 +506,16 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i int brt_raw; int ret; - if (!display_dev || !display_dev->get_auto_brightness) + if (!display_dev_available) return -ENOTSUP; - ret = display_dev->get_auto_brightness(lmax, lmin, light, &brt_raw); + ret = hal_device_display_get_auto_brightness(lmax, lmin, light, &brt_raw); if (ret < 0) { - _E("Failed to get brightness by light sensor: %d", ret); + if (ret == -ENODEV) + _E("Get auto brightness is not supported."); + else + _E("Failed to get brightness by light sensor: %d", ret); + return ret; } @@ -517,14 +528,18 @@ static int get_image_effect(enum display_image_effect *effect) int ret; enum display_image_effect val; - if (!display_dev || !display_dev->get_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_image_effect(&val); + ret = hal_device_display_get_image_effect(&val); if (ret < 0) { - _E("Failed to get image effect: %d", ret); + if (ret == -ENODEV) + _E("Get image effect is not supported."); + else + _E("Failed to get image effect: %d", ret); + return ret; } @@ -537,14 +552,18 @@ static int set_image_effect(enum display_image_effect effect) { int ret; - if (!display_dev || !display_dev->set_image_effect) { + if (!display_dev_available) { _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_image_effect(effect); + ret = hal_device_display_set_image_effect(effect); if (ret < 0) { - _E("Failed to set image effect: %d", ret); + if (ret == -ENODEV) + _E("Set image effect is not supported."); + else + _E("Failed to set image effect: %d", ret); + return ret; } @@ -556,14 +575,18 @@ static int get_panel_mode(enum display_panel_mode *mode) int ret; enum display_panel_mode val; - if (!display_dev || !display_dev->get_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->get_panel_mode(&val); + ret = hal_device_display_get_panel_mode(&val); if (ret < 0) { - _E("failed to get panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Get panel mode is not supported."); + else + _E("Failed to get panel mode(%d)", ret); + return ret; } @@ -576,14 +599,18 @@ static int set_panel_mode(enum display_panel_mode mode) { int ret; - if (!display_dev || !display_dev->set_panel_mode) { - _E("there is no display device"); + if (!display_dev_available) { + _E("There is no display device."); return -ENOENT; } - ret = display_dev->set_panel_mode(mode); + ret = hal_device_display_set_panel_mode(mode); if (ret < 0) { - _E("failed to set panel mode(%d)", ret); + if (ret == -ENODEV) + _E("Set panel mode is not supported."); + else + _E("Failed to set panel mode(%d)", ret); + return ret; } @@ -595,10 +622,10 @@ static int get_frame_rate(int *rate) if (!rate) return -EINVAL; - if (!display_dev || !display_dev->get_frame_rate) + if (!display_dev_available) return -ENOTSUP; - return display_dev->get_frame_rate(rate); + return hal_device_display_get_frame_rate(rate); } static int set_frame_rate(int rate) @@ -606,39 +633,34 @@ static int set_frame_rate(int rate) int ret; static int fmin = -1, fmax = -1; - if (!display_dev || - !display_dev->set_frame_rate) + if (!display_dev_available) return -ENOTSUP; - if (display_dev->get_min_frame_rate) { - if (fmin < 0) { - ret = display_dev->get_min_frame_rate(&fmin); - if (ret < 0) { - _E("Failed to get min frate rate: %d", ret); - return ret; - } - } - if (rate < fmin) { - _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); - return -EINVAL; + if (fmin < 0) { + ret = hal_device_display_get_min_frame_rate(&fmin); + if (ret < 0) { + _E("Failed to get min frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate < fmin)) { + _E("Invalid rate(%d). (Valid rate: %d <= rate)", rate, fmin); + return -EINVAL; + } - if (display_dev->get_max_frame_rate) { - if (fmax < 0) { - ret = display_dev->get_max_frame_rate(&fmax); - if (ret < 0) { - _E("Failed to get max frate rate: %d", ret); - return ret; - } - } - if (rate > fmax) { - _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); - return -EINVAL; + if (fmax < 0) { + ret = hal_device_display_get_max_frame_rate(&fmax); + if (ret < 0) { + _E("Failed to get max frate rate: %d", ret); + return ret; } } + if ((ret != -ENODEV) && (rate > fmax)) { + _E("Invalid rate(%d). (Valid rate: rate <= %d)", rate, fmax); + return -EINVAL; + } - return display_dev->set_frame_rate(rate); + return hal_device_display_set_frame_rate(rate); } /* It was operated only AOD enter & leave */ @@ -824,56 +846,27 @@ static struct _backlight_ops backlight_ops = { int display_service_load(void) { - struct hw_info *info; int r; - if (display_dev) + if (display_dev_available) return 0; - r = hw_get_info(DISPLAY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + r = hal_device_display_get_backend(); if (r < 0) { - _I("display shared library is not supported: %d", r); + _E("There is no HAL for display."); + display_dev_available = false; return 0; } - if (!info->open) { - _E("Failed to open display device: open(NULL)."); - return -EPERM; - } - - r = info->open(info, NULL, (struct hw_common **)&display_dev); - if (r < 0) { - _E("Failed to get display device structure: %d", r); - return -EPERM; - } - - if (display_dev && display_dev->get_aod_brightness) { - display_dev->get_aod_brightness(&aod_max_level, &aod_normal_level, &aod_min_level, &aod_charging_level); - _I("Use various AOD brightness: max %d, normal %d, min %d, charging %d.", - aod_max_level, aod_normal_level, aod_min_level, aod_charging_level); - } - + display_dev_available = true; _D("Display device structure load success."); - return 0; } int display_service_free(void) { - struct hw_info *info; - - if (!display_dev) - return -ENOENT; - - info = display_dev->common.info; - - assert(info); - - info->close((struct hw_common *)display_dev); - display_dev = NULL; - - return 0; + display_dev_available = false; + return hal_device_display_put_backend(); } int is_lcdon_blocked(void) diff --git a/plugins/wearable/display/display-handler.c b/plugins/wearable/display/display-handler.c index ed2e9ba..0b0c784 100644 --- a/plugins/wearable/display/display-handler.c +++ b/plugins/wearable/display/display-handler.c @@ -20,7 +20,6 @@ #include #include #include -#include #include "auto-brightness-sensorhub.h" #include "core/device-notifier.h" diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c index 0ac0b64..d4e0495 100644 --- a/plugins/wearable/display/enhance.c +++ b/plugins/wearable/display/enhance.c @@ -19,9 +19,8 @@ #include #include -#include #include -#include +#include #include #include "display/core.h" diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index 5f8989b..17ee67e 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -31,7 +31,6 @@ #include "util.h" #include "core.h" #include "poll.h" -#include "device-node.h" #include "display-actor.h" #include "display-ops.h" #include "core/common.h" diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c index e10b09c..0635348 100644 --- a/plugins/wearable/display/lbm.c +++ b/plugins/wearable/display/lbm.c @@ -18,6 +18,7 @@ #include #include +#include #include "auto-brightness-sensorhub.h" #include "lbm.h" @@ -49,7 +50,7 @@ static struct lbm_config lbm_conf = { static struct _backlight_ops *backlight_ops; static int lbm_setting_mode; static int system_brightness; -static struct display_device *display_dev; +static bool display_dev_available = false; static void broadcast_lbm_state(int state) { @@ -112,7 +113,7 @@ static int lbm_set_brightness(int val) { int brt = 0; - if (!display_dev || !display_dev->set_brightness) { + if(!display_dev_available) { _E("There is no display device."); return -ENOENT; } @@ -127,7 +128,7 @@ static int lbm_set_brightness(int val) _I("Set brightness(LBM on) system=%d, real=%d.", val, brt); device_notify(DEVICE_NOTIFIER_DISPLAY_BRIGHTNESS, (void *)&val); - return display_dev->set_brightness(brt); + return hal_device_display_set_brightness(brt); } static void lbm_change_brightness(int start, int end, int step) @@ -154,16 +155,18 @@ static void lbm_change_brightness(int start, int end, int step) _I("Start %d, end %d, step %d.", start, end, step); - if (display_dev && display_dev->set_multi_brightness) { + if (display_dev_available) { diff = lbm_down_brt(end); - ret = display_dev->set_multi_brightness(diff, step, LCD_PHASED_DELAY); - if (ret < 0) - _E("Failed to set_multi_brightness, %d.", ret); + ret = hal_device_display_set_multi_brightness(diff, step, LCD_PHASED_DELAY); + if (ret != -ENODEV) { + if (ret < 0) + _E("Failed to set_multi_brightness, %d.", ret); - backlight_ops->set_brightness(end); + backlight_ops->set_brightness(end); - return; + return; + } } diff = end - start; @@ -330,7 +333,7 @@ static void lbm_init(void *data) if (ret < 0) _E("Failed to init dbus method, %d.", ret); - display_dev = display_dev_get(); + display_dev_available = display_dev_ready(); _I("LBM setting value is %d.", lbm_setting_mode); } diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c index 712824a..7e12b30 100644 --- a/src/battery/battery-time.c +++ b/src/battery/battery-time.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "core/common.h" @@ -402,14 +402,13 @@ static const dbus_interface_u dbus_interface = { static int battery_probe(void *data) { - struct hw_info *info; int ret; - ret = hw_get_info(BATTERY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); - - if (ret < 0) /* There is no HAL for battery */ + ret = hal_device_battery_get_backend(); + if (ret < 0) { + _E("There is no HAL for battery."); return -ENODEV; + } return 0; } @@ -428,6 +427,7 @@ static void battery_init(void *data) static void battery_exit(void *data) { end_battinfo_gathering(); + hal_device_battery_put_backend(); } static const struct device_ops battery_time_device_ops = { diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c index 6914562..3e280bc 100644 --- a/src/battery/lowbat-handler.c +++ b/src/battery/lowbat-handler.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index c5109c5..41dad87 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "core/devices.h" @@ -107,9 +107,7 @@ bool battery_do_not_disturb(void); int battery_pm_change_internal(int pid, int s_bits); static int booting_done(void *data); static void update_health(enum battery_noti_status status); - -static struct battery_device *battery_dev; - +static bool battery_dev_available = false; static int load_uevent(struct parse_result *result, void *user_data); static int event_handler_state_changed(void *data); @@ -1037,8 +1035,8 @@ static void power_supply_status_init(void) { int r; - if (battery_dev && battery_dev->get_current_state) { - r = battery_dev->get_current_state(battery_changed, NULL); + r = hal_device_battery_get_current_state(battery_changed, NULL); + if (battery_dev_available && (r != -ENODEV)) { if (r < 0 || battery.capacity < 0) { _E("Failed to get battery capacity (capa: %d, ret: %d)", battery.capacity, r); return; @@ -1302,7 +1300,7 @@ static GVariant *dbus_power_supply_handler(GDBusConnection *conn, _D("C(%d) S(%s) H(%s) O(%d) P(%d) F(%d) SRC(%s) Vol(%d %d) Cur(%d %d) T(%d)", info.capacity, info.status, info.health, info.online, info.present, info.freq_strength, info.power_source, info.voltage_now, info.voltage_average, info.current_now, info.current_average, info.temperature); - if (battery_dev) + if (battery_dev_available) battery_changed(&info, NULL); snprintf(battery.status_s, sizeof(battery.status_s), "%s", @@ -1404,8 +1402,8 @@ static GVariant *dbus_get_battery_info(GDBusConnection *conn, if (battery_initialized) goto out; - if (battery_dev && battery_dev->get_current_state) { - ret = battery_dev->get_current_state(battery_get_info, &info); + ret = hal_device_battery_get_current_state(battery_get_info, &info); + if (battery_dev_available && (ret != -ENODEV)) { if (ret < 0) _E("Failed to get battery info: %d", ret); @@ -1599,37 +1597,24 @@ static int load_uevent(struct parse_result *result, void *user_data) static int power_supply_probe(void *data) { - struct hw_info *info; int ret, r; - if (battery_dev) + + if (battery_dev_available) return 0; - ret = hw_get_info(BATTERY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); - if (ret < 0) { /* There is no HAL for battery */ + ret = hal_device_battery_get_backend(); + if (ret < 0) { + _E("There is no HAL for battery."); + battery_dev_available = false; if (access(POWER_PATH, R_OK) == 0) return 0; /* Just power_supply uevent is used */ - goto out; - } - if (!info->open) { - _E("Failed to open battery device: open(NULL)"); - return -ENODEV; - } - - ret = info->open(info, NULL, (struct hw_common**)&battery_dev); - if (ret < 0) { - _E("Failed to get battery device structure: %d", ret); - return ret; - } - - if (!battery_dev || !battery_dev->get_current_state) { - _E("get_current_state() is not supported by the Battery HAL."); - return -ENODEV; + goto out; } _I("Battery device structure load success."); + battery_dev_available = true; return 0; out: @@ -1654,11 +1639,9 @@ static void add_power_supply_handler(void) { int ret; - if (battery_dev) { - if (battery_dev->register_changed_event) - battery_dev->register_changed_event(battery_changed, NULL); - if (battery_dev->get_current_state) - battery_dev->get_current_state(battery_changed, NULL); + if (battery_dev_available) { + hal_device_battery_register_changed_event(battery_changed, NULL); + hal_device_battery_get_current_state(battery_changed, NULL); } else { ret = config_parse(POWER_SUPPLY_UEVENT, load_uevent, &battery); if (ret < 0) @@ -1671,8 +1654,8 @@ static void add_power_supply_handler(void) static void remove_power_supply_handler(void) { - if (battery_dev && battery_dev->unregister_changed_event) - battery_dev->unregister_changed_event(battery_changed); + if (battery_dev_available) + hal_device_battery_unregister_changed_event(battery_changed); else unregister_kernel_uevent_control(&uh); } @@ -1729,6 +1712,7 @@ static void power_supply_exit(void *data) event_handler_state_changed((void *)&state); battery_ops_exit(NULL); + battery_dev_available = false; } static const struct device_ops power_supply_ops = { diff --git a/src/board/board-info.c b/src/board/board-info.c index 73a2252..9bafc6f 100644 --- a/src/board/board-info.c +++ b/src/board/board-info.c @@ -22,8 +22,9 @@ #include "core/log.h" #include "core/devices.h" +#include -static struct hw_board *board_dev; +static bool board_dev_available = false; static GVariant *dbus_revision_handler(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, @@ -32,13 +33,13 @@ static GVariant *dbus_revision_handler(GDBusConnection *conn, int ret; int revision; - if (!board_dev || !board_dev->get_device_revision) { + ret = hal_device_board_get_device_revision(&revision); + if (!board_dev_available || (ret == -ENODEV)) { _E("GetHWRev not supported."); ret = -ENOTSUP; goto revision_fail; } - ret = board_dev->get_device_revision(&revision); if (ret < 0) { _E("Fail to get revision."); goto revision_fail; @@ -60,13 +61,13 @@ static GVariant *dbus_num_handler(GDBusConnection *conn, GVariant *result; char *serial = NULL; - if (!board_dev || !board_dev->get_device_serial) { + ret = hal_device_board_get_device_serial(&serial); + if (!board_dev_available || (ret == -ENODEV)) { _E("GetSerial not supported."); ret = -ENOTSUP; goto num_out; } - ret = board_dev->get_device_serial(&serial); if (ret < 0) { _E("Failed to get serial."); goto num_out; @@ -95,13 +96,13 @@ static GVariant *dbus_serial_handler(GDBusConnection *conn, GVariant *result; char *num = NULL; - if (!board_dev || !board_dev->get_device_serial) { + ret = hal_device_board_get_device_serial(&num); + if (!board_dev_available || (ret == -ENODEV)) { _E("GetNum not supported."); ret = -ENOTSUP; goto seiral_out; } - ret = board_dev->get_device_serial(&num); if (ret < 0) { _E("Failed to get num."); goto seiral_out; @@ -140,31 +141,21 @@ static const dbus_interface_u dbus_interface = { static int board_probe(void *data) { - struct hw_info *info; int ret; - if (board_dev) + if (board_dev_available) return 0; - ret = hw_get_info(BOARD_HARDWARE_DEVICE_ID, - (const struct hw_info**)&info); + ret = hal_device_board_get_backend(); if (ret < 0) { - _E("Failed to load board shared library: %d", ret); - return -ENODEV; - } - - if (!info->open) { - _E("Failed to open board device: open(NULL)"); - return -ENODEV; - } + _E("There is no HAL for board."); + board_dev_available = false; - ret = info->open(info, NULL, (struct hw_common**)&board_dev); - if (ret < 0) { - _E("Failed to get board device structure: %d", ret); return -ENODEV; } _I("Board device structure load success."); + board_dev_available = true; return 0; } diff --git a/src/display/device-interface.h b/src/display/device-interface.h index 161c528..f9d8b69 100644 --- a/src/display/device-interface.h +++ b/src/display/device-interface.h @@ -25,7 +25,7 @@ #define __DEVICE_INTERFACE_H__ #include -#include +#include #include "core/devices.h" #define FLAG_X_DPMS 0x2 @@ -103,7 +103,7 @@ enum dpms_state { DPMS_DETACH, /* Display detached */ }; -struct display_device *display_dev_get(void); +bool display_dev_ready(void); bool display_dimstay_check(void); void dpms_set_running_state(int val); diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c index 0d6cd00..a2e3b3d 100644 --- a/src/extcon/extcon.c +++ b/src/extcon/extcon.c @@ -18,7 +18,7 @@ #include -#include +#include #include #include "core/log.h" @@ -38,7 +38,7 @@ #define BUF_MAX 512 static GList *extcon_list; -static struct external_connection_device *extcon_dev; +static bool extcon_dev_available = false; void add_extcon(struct extcon_ops *dev) { @@ -381,30 +381,22 @@ static void extcon_changed(struct connection_info *info, void *data) static int extcon_probe(void *data) { - struct hw_info *info; int ret; - if (extcon_dev) + if (extcon_dev_available) return 0; - ret = hw_get_info(EXTERNAL_CONNECTION_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + ret = hal_device_external_connection_get_backend(); if (ret == 0) { - if (!info->open) { - _E("Failed to open extcon device: open(NULL)"); - return -ENODEV; - } - - ret = info->open(info, NULL, (struct hw_common **)&extcon_dev); - if (ret < 0) { - _E("Failed to get extcon device structure: %d", ret); - return ret; - } - + extcon_dev_available = true; _I("Extcon device structure load success."); + return 0; } + _E("There is no HAL for extcon."); + extcon_dev_available = false; + /** * find extcon class. * if there is no extcon class, @@ -412,7 +404,7 @@ static int extcon_probe(void *data) */ if (access(EXTCON_PATH, R_OK) != 0) { _E("There is no extcon class."); - return -ENODEV; + return ret; } return 0; @@ -422,13 +414,9 @@ static void add_extcon_event_handler(void) { int ret; - if (extcon_dev) { /* HAL is used */ - if (extcon_dev->register_changed_event) - extcon_dev->register_changed_event(extcon_changed, NULL); - - if (extcon_dev->get_current_state) - extcon_dev->get_current_state(extcon_changed, NULL); - + if (extcon_dev_available) { /* HAL is used */ + hal_device_external_connection_register_changed_event(extcon_changed, NULL); + hal_device_external_connection_get_current_state(extcon_changed, NULL); } else { /* register extcon uevent */ ret = register_kernel_uevent_control(&uh); @@ -446,10 +434,9 @@ static void remove_extcon_event_handler(void) { int ret; - if (extcon_dev) { - if (extcon_dev->unregister_changed_event) - extcon_dev->unregister_changed_event(extcon_changed); - } else { + if (extcon_dev_available) + hal_device_external_connection_unregister_changed_event(extcon_changed); + else { /* unreigster extcon uevent */ ret = unregister_kernel_uevent_control(&uh); if (ret < 0) @@ -520,6 +507,7 @@ static void extcon_exit(void *data) dev->exit(data); dev->enabled = false; } + extcon_dev_available = false; } static const struct device_ops extcon_device_ops = { diff --git a/src/extcon/extcon.h b/src/extcon/extcon.h index e35bf3b..bc16a75 100644 --- a/src/extcon/extcon.h +++ b/src/extcon/extcon.h @@ -22,7 +22,7 @@ #include "core/common.h" #include -#include +#include #include "extcon-count.h" /** diff --git a/src/led/rgb.c b/src/led/rgb.c index 0e39ae2..ec4d96f 100644 --- a/src/led/rgb.c +++ b/src/led/rgb.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -43,7 +43,7 @@ typedef enum { LED_CUSTOM_DEFAULT = (LED_CUSTOM_DUTY_ON), /**< Default flag */ } led_custom_flags; -static struct led_device *rgb_dev; +static bool rgb_dev_available = false; static GList *rgb_list; static struct rgb_request *top; static guint timer; @@ -114,20 +114,15 @@ static int rgb_play(struct led_state *state) { struct led_state off = { 0, }; - if (!rgb_dev) { - _E("There is NO HAL."); + if (!rgb_dev_available) { + _E("There is no HAL for rgb."); return -ENODEV; } - if (!rgb_dev->set_state) { - _E("LED HAL does not support set_state()."); - return -ENOTSUP; - } - if (state) - return rgb_dev->set_state(state); + return hal_device_led_set_state(NOTIFICATION, state); - return rgb_dev->set_state(&off); + return hal_device_led_set_state(NOTIFICATION, &off); } static gboolean remove_not_handled_req(gpointer data) @@ -177,23 +172,23 @@ static int get_led_num(void) if (initialized) return num_of_leds; - if (!rgb_dev) { - _E("There is NO HAL."); + if (!rgb_dev_available) { + _E("There is no HAL for rgb."); ret = -ENODEV; goto out; } - // Read led num via get_max_num for multi led - // Otherwise, read led num via get_number - if (!rgb_dev->get_max_num) { - if (!rgb_dev->get_number) { + /* Read led num via get_max_num for multi led + Otherwise, read led num via get_number */ + ret = hal_device_led_get_max_num(); + if (ret == -ENODEV) { + ret = hal_device_led_get_number(); + if (ret == -ENODEV) { _E("LED HAL does not support get LED number."); ret = -ENOTSUP; goto out; - } else - ret = rgb_dev->get_number(); - } else - ret = rgb_dev->get_max_num(); + } + } if (ret < 0) { _E("Failed to get LED number: %d", ret); @@ -355,8 +350,8 @@ static GVariant *dbus_multi_led_control(GDBusConnection *conn, state.type = LED_TYPE_MANUAL; while (g_variant_iter_next(iter, "u", &color[i])) { - if (rgb_dev && rgb_dev->set_num) - rgb_dev->set_num(i); + if (rgb_dev_available) + hal_device_led_set_number(i); state.color = color[i]; ret = rgb_play(&state); if (ret < 0) @@ -405,37 +400,31 @@ static void rgb_init(void *data) static void rgb_exit(void *data) { int ret = rgb_play(NULL); + if (ret < 0) _E("Failed to turn off rgb play during exit."); + + rgb_dev_available = false; } static int rgb_probe(void *data) { - struct hw_info *info; int ret; - if (rgb_dev) + if (rgb_dev_available) return 0; - ret = hw_get_info(LED_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + ret = hal_device_led_get_backend(); if (ret < 0) { - _E("There is no LED HAL."); - return -ENOTSUP; - } - - if (!info->open) { - _E("Failed to open led device: open(NULL)"); - return -ENODEV; - } + _E("There is no HAL for rgb."); + rgb_dev_available = false; - ret = info->open(info, LED_ID_NOTIFICATION, (struct hw_common **)&rgb_dev); - if (ret < 0) { - _E("Failed to get LED NOTIFICATION device structure: %d", ret); - return ret; + return -ENOTSUP; } _I("LED NOTIFICATION device structure load success."); + rgb_dev_available = true; + return 0; } diff --git a/src/led/torch.c b/src/led/torch.c index 95d4e09..b4db8bf 100644 --- a/src/led/torch.c +++ b/src/led/torch.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "core/log.h" @@ -33,7 +33,7 @@ #define SIGNAL_FLASH_STATE "ChangeFlashState" -static struct led_device *led_dev; +static bool torch_dev_available = false; static struct led_state led_state = { .type = LED_TYPE_MANUAL, .color = 0x0, @@ -60,8 +60,8 @@ static GVariant *dbus_get_brightness(GDBusConnection *conn, { int ret, alpha; - if (!led_dev) { - _E("There is no led device."); + if (!torch_dev_available) { + _E("There is no HAL for camera led."); ret = -ENOENT; goto error; } @@ -96,8 +96,8 @@ static GVariant *dbus_set_brightness(GDBusConnection *conn, g_variant_get(param, "(ii)", &val, &enable); - if (!led_dev || !led_dev->set_state) { - _E("There is no led device."); + if (!torch_dev_available) { + _E("There is no HAL for camera led."); ret = -ENOENT; goto error; } @@ -105,7 +105,7 @@ static GVariant *dbus_set_brightness(GDBusConnection *conn, tmp.color = (((int)(val * 255.f) / LED_MAX_BRIGHTNESS) & 0xFF) << 24; _D("Set brightness. val=%d color=%#x", val, tmp.color); - ret = led_dev->set_state(&tmp); + ret = hal_device_led_set_state(CAMERA_BACK, &tmp); if (ret < 0) goto error; @@ -150,46 +150,25 @@ static const dbus_interface_u dbus_interface = { static int led_service_load(void) { - struct hw_info *info; int r; - r = hw_get_info(LED_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + r = hal_device_led_get_backend(); if (r < 0) { - _E("Failed to load led shared library: %d", r); + _E("There is no HAL for camera led."); + torch_dev_available = false; return -ENOENT; } - if (!info->open) { - _E("Fail to open camera led device: open(NULL)"); - return -EPERM; - } - - r = info->open(info, LED_ID_CAMERA_BACK, - (struct hw_common **)&led_dev); - if (r < 0) { - _E("Failed to get camera led device: %d", r); - return -EPERM; - } - _D("Camera led device structure load success."); + torch_dev_available = true; + return 0; } static int led_service_free(void) { - struct hw_info *info; - - if (!led_dev) - return -ENOENT; - - info = led_dev->common.info; - - assert(info); - - info->close((struct hw_common *)led_dev); - - return 0; + torch_dev_available = false; + return hal_device_led_put_backend(); } static int torch_probe(void *data) diff --git a/src/led/touch-key.c b/src/led/touch-key.c index b5a4484..a24cc6a 100644 --- a/src/led/touch-key.c +++ b/src/led/touch-key.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "core/log.h" @@ -46,7 +46,7 @@ #define SET_BRIGHTNESS(val) (((val) & 0xFF) << 24) static struct display_plugin *disp_plgn; -static struct led_device *touchled_dev; +static bool touchkey_dev_available = false; static guint hardkey_timeout_id; static int hardkey_duration; @@ -55,8 +55,8 @@ static int touchled_set_state(bool on) struct led_state tmp = {0,}; int r; - if (!touchled_dev || !touchled_dev->set_state) { - _E("There is no led device."); + if (!touchkey_dev_available) { + _E("There is no HAL for touch key led."); return -ENOENT; } @@ -65,7 +65,7 @@ static int touchled_set_state(bool on) else tmp.color = SET_BRIGHTNESS(0); - r = touchled_dev->set_state(&tmp); + r = hal_device_led_set_state(TOUCH_KEY, &tmp); if (r < 0) { _E("Failed to set touch led state: %d", r); return r; @@ -212,56 +212,41 @@ static int hardkey_lcd_changed_cb(void *data) static int touchled_service_load(void) { - struct hw_info *info; int r; - r = hw_get_info(LED_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + r = hal_device_led_get_backend(); if (r < 0) { - _E("Failed to load led shared library: %d", r); + _E("Failed to load touch key led shared library: %d", r); return -ENOENT; } - if (!info->open) { - _E("Failed to open touch led device: open(NULL)"); - return -EPERM; - } - - r = info->open(info, LED_ID_TOUCH_KEY, - (struct hw_common **)&touchled_dev); - if (r < 0) { - _E("Failed to get touch led device: %d", r); - return -EPERM; - } - _D("Touch led device structure load success."); return 0; } static int touchled_service_free(void) { - struct hw_info *info; + return hal_device_led_put_backend(); +} - if (!touchled_dev) - return -ENOENT; +static int touchled_probe(void *data) +{ + int ret; - info = touchled_dev->common.info; - if (!info) { - free(touchled_dev); - touchled_dev = NULL; - return -EPERM; - } + if (touchkey_dev_available) + return 0; - info->close((struct hw_common *)touchled_dev); - touchled_dev = NULL; + /* Load touch led device */ + ret = touchled_service_load(); + if (ret < 0) { + _E("There is no HAL for touch led."); + touchkey_dev_available = false; - return 0; -} + return -ENODEV; + } -static int touchled_probe(void *data) -{ - /* load led device */ - return touchled_service_load(); + touchkey_dev_available = true; + return ret; } static void touchled_init(void *data) @@ -293,6 +278,7 @@ static void touchled_exit(void *data) vconf_ignore_key_changed(VCONFKEY_SETAPPL_TOUCHKEY_LIGHT_DURATION, hardkey_duration_cb); /* free led device */ + touchkey_dev_available = false; touchled_service_free(); } diff --git a/src/power/power-control.c b/src/power/power-control.c index fbb6b9f..2019b69 100644 --- a/src/power/power-control.c +++ b/src/power/power-control.c @@ -37,7 +37,6 @@ #include "core/common.h" #include "core/device-notifier.h" #include "vconf.h" -#include "device-node.h" #include "display/display-dpms.h" #include "display/display.h" #include "power/boot.h" diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c index 8b5bdea..e3ca4f8 100644 --- a/src/thermal/thermal.c +++ b/src/thermal/thermal.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "apps/apps.h" @@ -30,7 +30,7 @@ #include "core/devices.h" #include "thermal.h" -static struct thermal_device *thermal_dev; +static bool thermal_dev_available = false; static int booting_done(void *data) { @@ -56,12 +56,12 @@ static GVariant *dbus_get_temperature(GDBusConnection *conn, g_variant_get(param, "(i)", &index); - if (!thermal_dev || !thermal_dev->get_info) { + ret = hal_device_thermal_get_info((device_thermal_e)index, &info); + if (!thermal_dev_available || (ret == -ENODEV)) { ret = -ENODEV; goto exit; } - ret = thermal_dev->get_info((device_thermal_e)index, &info); if (!ret) ret = info.temp; @@ -101,43 +101,28 @@ static void thermal_exit(void *data) ret = unregister_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); if (ret < 0) _E("Failed to unregister booting done notifier."); + + thermal_dev_available = false; + hal_device_thermal_put_backend(); } static int thermal_probe(void *data) { - struct hw_info *info; int ret; - if (thermal_dev) + if (thermal_dev_available) return 0; - ret = hw_get_info(THERMAL_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); - if (ret < 0) { - _E("There is no HAL for Thermal."); - return ret; - } - - if (!info->open) { - _E("Failed to open thermal device: open(NULL)"); - return -ENODEV; - } - - ret = info->open(info, NULL, (struct hw_common**)&thermal_dev); + ret = hal_device_thermal_get_backend(); if (ret < 0) { - _E("Failed to get thermal device structure: %d", ret); - return ret; - } - - if (!thermal_dev || - !thermal_dev->get_info || - !thermal_dev->register_changed_event || - !thermal_dev->unregister_changed_event) { - _E("Thermal HAL does not support event handler."); + _E("There is no HAL for thermal."); + thermal_dev_available = false; return -ENODEV; } _I("Thermal device structure load success."); + thermal_dev_available = true; + return 0; } diff --git a/src/touchscreen/sensitivity.c b/src/touchscreen/sensitivity.c index 85359ea..65d3746 100644 --- a/src/touchscreen/sensitivity.c +++ b/src/touchscreen/sensitivity.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "core/devices.h" @@ -43,24 +43,14 @@ #endif static guint disable_timer; - -static struct touchsensitivity_device *touchsensitivity_dev; - -static int check_dev(void) -{ - if (!touchsensitivity_dev || - !touchsensitivity_dev->glove_mode_set_state || - !touchsensitivity_dev->glove_mode_get_state) - return -ENODEV; - return 0; -} +static bool sensitivity_dev_available = false; static gboolean disable_sensitivity(void *data) { int ret; int status; - if (check_dev() < 0) { + if (!sensitivity_dev_available) { _E("Touch sensitivity HAL does not exist."); return G_SOURCE_REMOVE; } @@ -72,7 +62,7 @@ static gboolean disable_sensitivity(void *data) return G_SOURCE_REMOVE; } - ret = touchsensitivity_dev->glove_mode_set_state(TOUCHSENSITIVITY_GLOVE_MODE_OFF); + ret = hal_device_touchscreen_glove_mode_set_state(TOUCHSENSITIVITY_GLOVE_MODE_OFF); _I("Change auto touch sensitivity disable: %s", ret ? "fail" : "set"); return G_SOURCE_REMOVE; } @@ -96,11 +86,11 @@ static GVariant *get_touch_sensitivity(GDBusConnection *conn, { int val = -1, ret; - if (check_dev() < 0) { + if (!sensitivity_dev_available) { _E("Touch sensitivity HAL does not exist."); goto out; } - ret = touchsensitivity_dev->glove_mode_get_state(&val); + ret = hal_device_touchscreen_glove_mode_get_state(&val); _I("Touch sensitivity(%d): %s", val, ret ? "fail" : "get"); out: return g_variant_new("(i)", val); @@ -118,12 +108,12 @@ static GVariant *set_touch_sensitivity(GDBusConnection *conn, g_source_remove(disable_timer); disable_timer = 0; } - if (check_dev() < 0) { + if (!sensitivity_dev_available) { _E("Touch sensitivity HAL does not exist."); ret = -EINVAL; goto error; } - ret = touchsensitivity_dev->glove_mode_set_state(val); + ret = hal_device_touchscreen_glove_mode_set_state(val); error: _I("Touch sensitivity(%d): %s", val, ret ? "fail" : "set"); @@ -162,11 +152,11 @@ static int booting_done(void *data) goto out; } - if (check_dev() < 0) { + if (!sensitivity_dev_available) { _E("Touch sensitivity HAL does not exist."); goto out; } - ret = touchsensitivity_dev->glove_mode_set_state(TOUCHSENSITIVITY_GLOVE_MODE_ON); + ret = hal_device_touchscreen_glove_mode_set_state(TOUCHSENSITIVITY_GLOVE_MODE_ON); _I("Change auto touch sensitivity enable: %s", ret ? "fail" : "set"); unregister_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); out: @@ -176,29 +166,19 @@ out: static void sensitivity_init(void *data) { int ret; - struct hw_info *info; - if (touchsensitivity_dev) + if (sensitivity_dev_available) return; - ret = hw_get_info(TOUCHSENSITIVITY_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + ret = hal_device_touchscreen_get_backend(); if (ret < 0) { - _E("Failed to load touch sensitivity shared library: %d", ret); - return; - } + _E("There is no HAL for touch sensitivity."); + sensitivity_dev_available = false; - if (!info->open) { - _E("Failed to open touch sensitivity device: open(NULL)"); - return; - } - - ret = info->open(info, NULL, (struct hw_common **)&touchsensitivity_dev); - if (ret < 0) { - _E("Failed to get touch sensitivity device structure: %d", ret); return; } + sensitivity_dev_available = true; _I("Touch sensitivity device structure load success."); /* init dbus interface */ diff --git a/src/touchscreen/touchscreen.c b/src/touchscreen/touchscreen.c index 5ec95d1..aefb70a 100644 --- a/src/touchscreen/touchscreen.c +++ b/src/touchscreen/touchscreen.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ enum ps_mode { static struct display_plugin *disp_plgn; static struct battery_plugin *battery_plgn; -static struct touchscreen_device *touchscreen_dev; +static bool touchscreen_dev_available = false; static int touchscreen_enable = DEVICE_OPS_STATUS_START; static int powersaving_support = true; @@ -92,8 +92,8 @@ static int touchscreen_powersaving(enum ps_mode mode) else return -EINVAL; - if (touchscreen_dev && touchscreen_dev->set_powersaving) { - ret = touchscreen_dev->set_powersaving(state); + ret = hal_device_touchscreen_set_powersaving(state); + if (touchscreen_dev_available && (ret != -ENODEV)) { if (ret < 0) { _E("Failed to set touch powersaving node."); return -EIO; @@ -108,45 +108,28 @@ static int touchscreen_powersaving(enum ps_mode mode) static int touchscreen_probe(void *data) { int ret; - struct hw_info *info; - if (touchscreen_dev) + if (touchscreen_dev_available) return 0; - ret = hw_get_info(TOUCHSCREEN_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); + ret = hal_device_touchscreen_get_backend(); if (ret < 0) { - _E("Failed to load touchscreen shared library: %d", ret); - return -ENODEV; - } - - if (!info->open) { - _E("Failed to open touchscreen device: open(NULL)"); - return -EPERM; - } + _E("There is no HAL for touchscreen."); + touchscreen_dev_available = false; - ret = info->open(info, NULL, (struct hw_common **)&touchscreen_dev); - if (ret < 0) { - _E("Failed to get touchscreen device structure: %d", ret); - return -EPERM; + return -ENODEV; } _I("Touchscreen device structure load success."); + touchscreen_dev_available = true; + return 0; } static void touchscreen_exit(void *data) { - struct hw_info *info; - - if (!touchscreen_dev) - return; - - info = touchscreen_dev->common.info; - assert(info); - - info->close((struct hw_common *)touchscreen_dev); - touchscreen_dev = NULL; + touchscreen_dev_available = false; + hal_device_touchscreen_put_backend(); } static int touchscreen_set_state(enum touchscreen_state state) @@ -154,7 +137,7 @@ static int touchscreen_set_state(enum touchscreen_state state) int ret; char *act; - if (!touchscreen_dev) { + if (!touchscreen_dev_available) { _E("Touchscreen device structure is not loaded."); return -ENOENT; } @@ -164,18 +147,17 @@ static int touchscreen_set_state(enum touchscreen_state state) return -EINVAL; } - if (!touchscreen_dev->set_state) { - _E("Touchscreen state change is not supported."); - return -ENOTSUP; - } - act = (state == TOUCHSCREEN_ON) ? "enable" : "disable"; - ret = touchscreen_dev->set_state(state); + ret = hal_device_touchscreen_set_state(state); if (ret == 0) _I("Success to %s touchscreen.", act); - else - _E("Failed to %s touchscreen: %d", act, ret); + else { + if (ret == -ENODEV) + _E("Touchscreen set state is not supported."); + else + _E("Failed to %s touchscreen: %d", act, ret); + } return ret; } @@ -253,13 +235,13 @@ exit: static int touchscreen_dump(FILE *fp, int mode, void *dump_data) { - int ret; enum touchscreen_state state; + int ret; - if (!touchscreen_dev || !touchscreen_dev->get_state) + ret = hal_device_touchscreen_get_state(&state); + if (!touchscreen_dev_available || (ret == -ENODEV)) return 0; - ret = touchscreen_dev->get_state(&state); if (ret < 0) _E("Failed to get touchscreen state: %d", ret); @@ -351,15 +333,14 @@ static void touchscreen_init(void *data) } else _I("There is no battery module."); - if (touchscreen_dev && touchscreen_dev->set_powersaving) { - ret = touchscreen_dev->set_powersaving(0); + ret = hal_device_touchscreen_set_powersaving(0); + if (touchscreen_dev_available && (ret != -ENODEV)) { if (ret < 0) powersaving_support = false; else powersaving_support = true; - } else { + } else powersaving_support = false; - } vconf_notify_key_changed(VCONFKEY_SETAPPL_TOUCH_WAKEUP_ENABLE, touchscreen_wakeup_status, NULL); diff --git a/src/usb/usb-dbus.c b/src/usb/usb-dbus.c index db428aa..c6ddfd3 100644 --- a/src/usb/usb-dbus.c +++ b/src/usb/usb-dbus.c @@ -20,8 +20,8 @@ #include #include -#include #include +#include #include "core/log.h" diff --git a/src/usb/usb-debug.c b/src/usb/usb-debug.c index a269af5..74398eb 100644 --- a/src/usb/usb-debug.c +++ b/src/usb/usb-debug.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include "core/log.h" #include "core/device-notifier.h" diff --git a/src/usb/usb-state.c b/src/usb/usb-state.c index a88b5df..1c6ea74 100644 --- a/src/usb/usb-state.c +++ b/src/usb/usb-state.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "core/log.h" #include "apps/apps.h" diff --git a/src/usb/usb-tethering.c b/src/usb/usb-tethering.c index 98c06be..c788586 100644 --- a/src/usb/usb-tethering.c +++ b/src/usb/usb-tethering.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include "core/log.h" #include "core/device-notifier.h" diff --git a/src/usb/usb.c b/src/usb/usb.c index f85bba3..7ddf8cf 100644 --- a/src/usb/usb.c +++ b/src/usb/usb.c @@ -18,9 +18,9 @@ #include -#include -#include #include +#include +#include #include "core/log.h" #include "core/udev.h" @@ -35,126 +35,6 @@ static int usb_change_gadget(unsigned mode); static struct display_plugin *disp_plgn; -static struct usb_client *usb_client; -static struct usb_gadget_translator *gadget_translator; - -static struct usb_gadget_translator *gadget_translator_probe(void) -{ - struct hw_info *info; - struct hw_common *common; - struct usb_gadget_translator *gadget; - - if (hw_get_info(USB_GADGET_DEVICE_ID, (const struct hw_info **)&info)) { - _E("No USB gadget translator."); - return NULL; - } - - if (!info->open) { - _E("USB gadget does not have open() "); - return NULL; - } - - if (info->open(info, NULL, &common) < 0) { - _E("Failed to open USB gadget translator."); - return NULL; - } - - gadget = container_of(common, struct usb_gadget_translator, common); - if (!gadget->id_to_gadget || !gadget->cleanup_gadget) { - _E("Invalid USB gadget translator."); - - if (gadget->common.info) - gadget->common.info->close(&gadget->common); - - return NULL; - } - - return gadget; -} - -static struct usb_client *usb_client_probe(const char *id) -{ - struct hw_info *info; - struct hw_common *common; - struct usb_client *client; - - _I("Loading USB client. id=%s", id); - - if (hw_get_info(id, (const struct hw_info **)&info)) { - _I("No USB client. id=%s", id); - return NULL; - } - - if (!info->open) { - _E("USB client does not have open(). id=%s", id); - return NULL; - } - - if (info->open(info, NULL, &common) < 0) { - _E("Failed to open USB client. id=%s", id); - return NULL; - } - - client = container_of(common, struct usb_client, common); - if (!client->reconfigure_gadget || !client->enable || !client->disable) { - _E("Invalid USB client. id=%s", id); - - if (client->common.info->close) - client->common.info->close(&client->common); - - return NULL; - } - - _I("Success lodging USB client. id=%s", id); - return client; -} - -static int usb_probe(void) -{ - /* Both the gadget and client should be valid. */ - if (gadget_translator || usb_client) { - if (gadget_translator && usb_client) - return 0; - return -EINVAL; - } - - /* gadget_translator */ - gadget_translator = gadget_translator_probe(); - if (!gadget_translator) - return -ENODEV; - - /* usb_client */ - usb_client = usb_client_probe(USB_CLIENT_HARDWARE_DEVICE_ID); - - if (!usb_client) - usb_client = usb_client_probe(USB_CFS_CLIENT_HARDWARE_DEVICE_ID); - - if (!usb_client) { - if (gadget_translator->common.info) - gadget_translator->common.info->close(&gadget_translator->common); - gadget_translator = NULL; - - return -ENODEV; - } - - return 0; -} - -static void usb_release() -{ - if (usb_client) { - if (usb_client->common.info->close) - usb_client->common.info->close(&usb_client->common); - usb_client = NULL; - } - - if (gadget_translator) { - if (gadget_translator->common.info->close) - gadget_translator->common.info->close( - &gadget_translator->common); - gadget_translator = NULL; - } -} static int usb_config_init(void) { @@ -163,82 +43,21 @@ static int usb_config_init(void) return usb_change_gadget(mode); } -static void usb_config_deinit(void) -{ - if (!usb_client) - goto no_hal; - - usb_client->disable(usb_client); - - return; - -no_hal: - /* TODO. Maybe some default action here? */ - return; -} - -static int usb_config_enable(void) -{ - if (!usb_client) - goto no_hal; - - return usb_client->enable(usb_client); - -no_hal: - /* TODO. Maybe some default action here? */ - return -ENODEV; -} - -static int usb_config_disable(void) -{ - if (!usb_client) - goto no_hal; - - usb_client->disable(usb_client); - - return 0; - -no_hal: - /* TODO. Maybe some default action here? */ - return -ENODEV; -} - /* Precondition: USB_FUNCTION_NONE */ static int usb_change_gadget(unsigned mode) { int ret; - struct usb_gadget *gadget; - struct usb_gadget_id gadget_id; - - if (!gadget_translator || !usb_client) { - ret = -ENODEV; - goto out; - } - - memset(&gadget_id, 0, sizeof(gadget_id)); - gadget_id.function_mask = mode; - - ret = gadget_translator->id_to_gadget(&gadget_id, &gadget); - if (ret) { - _E("Unable to translate USB mode id into gadget: %d", ret); - goto out; - } - ret = usb_client->reconfigure_gadget(usb_client, gadget); - gadget_translator->cleanup_gadget(gadget); + ret = hal_device_usb_gadget_change_mode(mode); if (ret) { - _E("Unable to configure USB gadget: %d", ret); - goto out; + /* because usb does not work properly */ + (void)usb_state_set_current_mode(USB_FUNCTION_NONE); + return ret; } _I("USB gadget changed to (%#x)", mode); - return ret; - -out: - /* Although this function has a USB_FUNCTION_NONE precondition, it is to protect against coding mistakes. */ - (void)usb_state_set_current_mode(USB_FUNCTION_NONE); /* because usb does not work properly */ - return ret; + return 0; } /* Precondition: USB_CONNECTED, USB_FUNCTION_NONE */ @@ -246,7 +65,7 @@ static int usb_enable(unsigned int mode) { int ret; - ret = usb_config_enable(); + ret = hal_device_usb_gadget_enable(); if (ret < 0) { _E("Failed to enable USB config: %d", ret); goto out; @@ -272,7 +91,7 @@ static int usb_disable(void) (void)usb_state_set_current_mode(USB_FUNCTION_NONE); change_usb_state_notification_handler(USB_FUNCTION_NONE); - ret = usb_config_disable(); + ret = hal_device_usb_gadget_disable(); if (ret < 0) { _E("Failed to disable USB config: %d", ret); return ret; @@ -466,7 +285,7 @@ static void usb_init(void *data) usb_state_retrieve_selected_mode(); - ret = usb_probe(); + ret = hal_device_usb_gadget_get_backend(); if (ret < 0) { _E("USB client cannot be used: %d", ret); return; @@ -499,8 +318,8 @@ static void usb_exit(void *data) change_usb_state_notification_handler(USB_FUNCTION_NONE); unregister_udev_uevent_control(&uh); - usb_config_deinit(); - usb_release(); + (void)hal_device_usb_gadget_disable(); + hal_device_usb_gadget_put_backend(); } static struct extcon_ops extcon_usb_ops = { diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c index 4bb7e0b..e144ae9 100644 --- a/src/usbhost/usb-host.c +++ b/src/usbhost/usb-host.c @@ -18,6 +18,7 @@ #define _GNU_SOURCE #include +#include #include #include #include -- 2.7.4 From 473dedcec3e993eaec9c65679b9424edd6573328 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Mon, 1 Feb 2021 13:14:18 +0900 Subject: [PATCH 05/16] Ir : Apply next HAL architecture (hal api + backend) Change-Id: I92f488f273a1afdf8696c86c312c0a3a3edf6dcc Signed-off-by: lokilee73 --- src/ir/ir.c | 58 ++++++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/src/ir/ir.c b/src/ir/ir.c index 1346ac5..91b56d4 100644 --- a/src/ir/ir.c +++ b/src/ir/ir.c @@ -18,13 +18,13 @@ #include #include -#include +#include #include #include "core/devices.h" #include "core/common.h" #include "core/log.h" -static struct ir_device *ir_dev; +static bool ir_dev_available = false; static GVariant *dbus_ir_is_available(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, @@ -33,17 +33,12 @@ static GVariant *dbus_ir_is_available(GDBusConnection *conn, int ret = 0; bool val; - if (!ir_dev) { + if (!ir_dev_available) { ret = -ENODEV; goto exit; } - if (!ir_dev->is_available) { - ret = -ENODEV; - goto exit; - } - - ret = ir_dev->is_available(&val); + ret = hal_device_ir_is_available(&val); if (ret >= 0) ret = val; @@ -61,12 +56,7 @@ static GVariant *dbus_ir_transmit(GDBusConnection *conn, int *freq_pattern = NULL; GVariantIter *iter = NULL; - if (!ir_dev) { - ret = -ENODEV; - goto exit; - } - - if (!ir_dev->transmit) { + if (!ir_dev_available) { ret = -ENODEV; goto exit; } @@ -87,7 +77,7 @@ static GVariant *dbus_ir_transmit(GDBusConnection *conn, _I("frequency=%d pattern_size=%d", freq_pattern[0], size); - ret = ir_dev->transmit(freq_pattern, size); + ret = hal_device_ir_transmit(freq_pattern, size); exit: if (freq_pattern) @@ -134,32 +124,22 @@ static const dbus_interface_u dbus_interface_legacy = { static int ir_probe(void *data) { - struct hw_info *info; int ret; - if (ir_dev) + if (ir_dev_available) return 0; - ret = hw_get_info(IR_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); - + ret = hal_device_ir_get_backend(); if (ret < 0) { - _E("Failed to load ir: %d", ret); - return -ENODEV; - } + _E("There is no HAL for ir."); + ir_dev_available = false; - if (!info->open) { - _E("Failed to open ir device: open(NULL)"); return -ENODEV; } - ret = info->open(info, NULL, (struct hw_common**)&ir_dev); - if (ret < 0) { - _E("Failed to get ir device structure: %d", ret); - return ret; - } - _I("Ir device structure load success."); + ir_dev_available = true; + return 0; } @@ -179,18 +159,8 @@ static void ir_init(void *data) static void ir_exit(void *data) { - struct hw_info *info; - - if (!ir_dev) - return; - - info = ir_dev->common.info; - if (!info) - free(ir_dev); - else - info->close((struct hw_common *)ir_dev); - - ir_dev = NULL; + hal_device_ir_put_backend(); + ir_dev_available = false; } static const struct device_ops ir_device_ops = { -- 2.7.4 From e7bb8144a19dbfccf1045832d261648d250e4c68 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Wed, 3 Feb 2021 16:37:18 +0900 Subject: [PATCH 06/16] pmqos: apply next HAL architecture (hal api + backend) Change-Id: I67a2715d99493d40575d2e9b6428feabb9cc94e3 Signed-off-by: lokilee73 --- CMakeLists.txt | 1 - packaging/deviced.spec | 1 - src/board/board-info.c | 1 - src/cpu/pmqos.c | 182 ++++++------------------------------------------- 4 files changed, 22 insertions(+), 163 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad7c1a7..2361b8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,7 +174,6 @@ SET(PKG_MODULES gio-unix-2.0 eventsystem libtzplatform-config - hwcommon hal-api-common hal-api-device mount diff --git a/packaging/deviced.spec b/packaging/deviced.spec index e638868..8e4df19 100644 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -24,7 +24,6 @@ BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(eventsystem) BuildRequires: pkgconfig(libtzplatform-config) -BuildRequires: pkgconfig(hwcommon) BuildRequires: pkgconfig(hal-api-common) BuildRequires: pkgconfig(hal-api-device) BuildRequires: pkgconfig(capi-system-info) diff --git a/src/board/board-info.c b/src/board/board-info.c index 9bafc6f..e8d2218 100644 --- a/src/board/board-info.c +++ b/src/board/board-info.c @@ -17,7 +17,6 @@ */ -#include #include #include "core/log.h" diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c index eb87cab..c060dd8 100644 --- a/src/cpu/pmqos.c +++ b/src/cpu/pmqos.c @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -33,147 +32,51 @@ #define DEFAULT_PMQOS_TIMER 3000 -#define MILLISECONDS(tv) ((tv.tv_sec)*1000 + (tv.tv_nsec)/1000000) - -struct pmqos_cpu { - char* name; - long timeout; - guint timeout_id; -}; - -static GList *pmqos_head; -static struct cpu_device *cpu_dev; - -static long get_current_monotonic_ms(void) -{ - struct timespec current; - clock_gettime(CLOCK_MONOTONIC, ¤t); - - return MILLISECONDS(current); -} - -int set_cpu_pmqos(const char *name, int val) -{ - if (!cpu_dev || - !cpu_dev->start_boost || - !cpu_dev->stop_boost) { - _E("Cpu device HAL does not exist."); - return -ENODEV; - } - - if (!name) - return -EINVAL; - - if (val) { - _D("Set pm scenario. Lock %s.", name); - return cpu_dev->start_boost((void *)name); - } - - _D("Set pm scenario. Unlock %s.", name); - return cpu_dev->stop_boost((void *)name); -} - -static int pmqos_cpu_cancel(const char *name) +static int pmqos_cpu_request(const char *name, int val) { - GList *elem; - struct pmqos_cpu *cpu; - size_t len; + int ret = 0; + /* Check valid parameter */ if (!name) return -EINVAL; - /* Find previous request */ - len = strlen(name) + 1; - SYS_G_LIST_FOREACH(pmqos_head, elem, cpu) { - if (!strncmp(cpu->name, name, len)) - break; - } - /* no cpu */ - if (!cpu) - return 0; - - if (cpu->timeout_id) { - g_source_remove(cpu->timeout_id); - cpu->timeout_id = 0; - } - - /* unlock cpu */ - set_cpu_pmqos(cpu->name, false); - - return 0; -} - -static gboolean pmqos_cpu_timeout(void *data) -{ - struct pmqos_cpu *cpu = (struct pmqos_cpu *)data; - - cpu->timeout_id = 0; - set_cpu_pmqos(cpu->name, false); - - return G_SOURCE_REMOVE; -} - -static int pmqos_cpu_request(const char *name, int val) -{ - GList *elem; - struct pmqos_cpu *cpu; - size_t len; - long next_timeout; - - /* Check valid parameter */ if (val > DEFAULT_PMQOS_TIMER) { _I("The timer value cannot be higher than default time value(%dms).", DEFAULT_PMQOS_TIMER); val = DEFAULT_PMQOS_TIMER; } - /* find cpu */ - len = strlen(name) + 1; - SYS_G_LIST_FOREACH(pmqos_head, elem, cpu) { - if (!strncmp(cpu->name, name, len)) - break; - } - - /* add cpu */ - if (!cpu) { - cpu = calloc(1, sizeof(struct pmqos_cpu)); - if (!cpu) - return -ENOMEM; + if (val > 0) { + _D("Set pm scenario. Lock %s.", name); + ret = dbus_handle_method_async_var(PASS_BUS_NAME, + PASS_PATH_PMQOS, + PASS_INTERFACE_PMQOS, + PASS_METHOD_DOZE, + g_variant_new("(si)", name, val)); - cpu->name = strndup(name, NAME_MAX); - cpu->timeout_id = 0; - cpu->timeout = 0; - SYS_G_LIST_APPEND(pmqos_head, cpu); - } + if (ret < 0) + _E("Failed to request pmqos: %d", ret); - next_timeout = get_current_monotonic_ms() + val; - if (!cpu->timeout_id) { // start new one - cpu->timeout = next_timeout; - cpu->timeout_id = g_timeout_add(val, pmqos_cpu_timeout, cpu); - set_cpu_pmqos(cpu->name, true); - } else if (next_timeout > cpu->timeout) { // just extend timeout - g_source_remove(cpu->timeout_id); - cpu->timeout = next_timeout; - cpu->timeout_id = g_timeout_add(val, pmqos_cpu_timeout, cpu); + return ret; } - return 0; + return ret; } static int pmqos_lowbat(void *data) { - return set_cpu_pmqos("LowBattery", DATA_VALUE_INT(data)); + return pmqos_cpu_request("LowBattery", DATA_VALUE_INT(data)); } static int pmqos_poweroff(void *data) { - return set_cpu_pmqos("PowerOff", DATA_VALUE_INT(data)); + return pmqos_cpu_request("PowerOff", DATA_VALUE_INT(data)); } static GVariant * dbus_pmqos_handler(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { - int val, ret; + int val, ret = 0; g_variant_get(param, "(i)", &val); @@ -183,11 +86,7 @@ static GVariant * dbus_pmqos_handler(GDBusConnection *conn, } _I("Request pmqos name: %s, val %d", name, val); - - if (val) - ret = pmqos_cpu_request(name, val); - else - ret = pmqos_cpu_cancel(name); + ret = pmqos_cpu_request(name, val); error: return g_variant_new("(i)", ret); @@ -198,7 +97,7 @@ static GVariant * dbus_wifi_pmqos_handler(GDBusConnection *conn, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { char names[NAME_MAX]; - int bps, val, ret; + int bps, val, ret = 0; g_variant_get(param, "(ii)", &bps, &val); @@ -210,10 +109,7 @@ static GVariant * dbus_wifi_pmqos_handler(GDBusConnection *conn, /* combine bps and member */ snprintf(names, sizeof(names), "%s%d", name, bps); - if (val) - ret = pmqos_cpu_request(names, val); - else - ret = pmqos_cpu_cancel(names); + ret = pmqos_cpu_request(names, val); error: return g_variant_new("(i)", ret); @@ -234,11 +130,11 @@ static GVariant * dbus_psmode_pmqos_handler(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { - int ret, val; + int ret = 0, val; g_variant_get(param, "(i)", &val); - ret = set_cpu_pmqos("UltraPowerSaving", val); + ret = pmqos_cpu_request("UltraPowerSaving", val); return g_variant_new("(i)", ret); } @@ -335,31 +231,6 @@ out: static int pmqos_probe(void *data) { - struct hw_info *info; - int r; - - if (cpu_dev) - return 0; - - r = hw_get_info(CPU_HARDWARE_DEVICE_ID, - (const struct hw_info **)&info); - if (r < 0) { - _I("Cpu shared library is not supported: %d", r); - return -ENODEV; - } - - if (!info->open) { - _E("Failed to open cpu device: open(NULL)"); - return -EPERM; - } - - r = info->open(info, NULL, (struct hw_common **)&cpu_dev); - if (r < 0) { - _E("Failed to get cpu device structure: %d", r); - return -EPERM; - } - - _D("Cpu device structure load success."); return 0; } @@ -377,15 +248,6 @@ static void pmqos_init(void *data) static void pmqos_exit(void *data) { - GList *elem, *elem_next; - struct pmqos_cpu *cpu; - - SYS_G_LIST_FOREACH_SAFE(pmqos_head, elem, elem_next, cpu) { - SYS_G_LIST_REMOVE(pmqos_head, cpu); - free(cpu->name); - free(cpu); - } - /* unregister notifier for each event */ unregister_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); unregister_notifier(DEVICE_NOTIFIER_CPU_BOOST_LOWBAT, pmqos_lowbat); -- 2.7.4 From 3fb887857312f59df7f9c610accd85e28bdb8dc0 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Fri, 5 Feb 2021 10:05:05 +0900 Subject: [PATCH 07/16] Change dbus method name for pass SetScenario Change-Id: I68a8762f7ba9b947cd77b672c73d306233cfa8f1 Signed-off-by: lokilee73 --- src/cpu/pmqos.c | 2 +- src/power/doze.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c index c060dd8..b232288 100644 --- a/src/cpu/pmqos.c +++ b/src/cpu/pmqos.c @@ -50,7 +50,7 @@ static int pmqos_cpu_request(const char *name, int val) ret = dbus_handle_method_async_var(PASS_BUS_NAME, PASS_PATH_PMQOS, PASS_INTERFACE_PMQOS, - PASS_METHOD_DOZE, + PASS_METHOD_SET_SCENARIO, g_variant_new("(si)", name, val)); if (ret < 0) diff --git a/src/power/doze.c b/src/power/doze.c index a866c84..a8b090f 100644 --- a/src/power/doze.c +++ b/src/power/doze.c @@ -42,7 +42,7 @@ int doze_pmqos_request(int req) ret = dbus_handle_method_async_var(PASS_BUS_NAME, PASS_PATH_PMQOS, PASS_INTERFACE_PMQOS, - PASS_METHOD_DOZE, + PASS_METHOD_SET_SCENARIO, g_variant_new("(si)", "Doze", req)); if (ret < 0) _E("Failed to request pmqos: %d", ret); -- 2.7.4 From 8a9ab4707b26675c15c755bf05b708fd94adfec9 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Fri, 5 Feb 2021 18:56:21 +0900 Subject: [PATCH 08/16] Use libsyscommon for ini-parser Change-Id: I77f3d1f6cefda2f883e88adbe2895492b95a1fad Signed-off-by: lokilee73 --- CMakeLists.txt | 1 - plugins/wearable/display/hbm.c | 2 +- plugins/wearable/display/lbm.c | 2 +- src/auto-test/CMakeLists.txt | 1 - src/auto-test/config.c | 2 +- src/battery/config.c | 2 +- src/battery/power-supply.c | 2 +- src/core/config-parser.c | 130 -------------------------------------- src/core/config-parser.h | 43 ------------- src/display/auto-brightness.c | 2 +- src/display/display.c | 2 +- src/display/display.h | 2 +- src/extcon/extcon.c | 2 +- src/power/power-handler.c | 2 +- src/usb-host-test/usb-host-test.c | 2 +- 15 files changed, 11 insertions(+), 186 deletions(-) delete mode 100644 src/core/config-parser.c delete mode 100644 src/core/config-parser.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 2361b8a..5e678c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,6 @@ SET(SRCS src/apps/apps.c src/control/control.c src/core/common.c - src/core/config-parser.c src/core/device-idler.c src/core/device-notifier.c src/core/devices.c diff --git a/plugins/wearable/display/hbm.c b/plugins/wearable/display/hbm.c index 698b49e..376a662 100644 --- a/plugins/wearable/display/hbm.c +++ b/plugins/wearable/display/hbm.c @@ -18,6 +18,7 @@ #include #include +#include #include "auto-brightness-sensorhub.h" #include "weaks.h" @@ -28,7 +29,6 @@ #include "display/display-dpms.h" #include "core/common.h" #include "core/device-notifier.h" -#include "core/config-parser.h" #define BOARD_CONF_FILE "/etc/deviced/display.conf" diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c index 0635348..bb495a1 100644 --- a/plugins/wearable/display/lbm.c +++ b/plugins/wearable/display/lbm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "auto-brightness-sensorhub.h" #include "lbm.h" @@ -27,7 +28,6 @@ #include "display/core.h" #include "display/display-ops.h" #include "core/common.h" -#include "core/config-parser.h" #include "core/device-notifier.h" #define DISPLAY_CONF_FILE "/etc/deviced/display.conf" diff --git a/src/auto-test/CMakeLists.txt b/src/auto-test/CMakeLists.txt index 3631df5..5f20caf 100644 --- a/src/auto-test/CMakeLists.txt +++ b/src/auto-test/CMakeLists.txt @@ -11,7 +11,6 @@ SET(SRCS test.c main.c result.c - ../core/config-parser.c config.c battery.c display.c diff --git a/src/auto-test/config.c b/src/auto-test/config.c index b5c8b0f..3a49732 100644 --- a/src/auto-test/config.c +++ b/src/auto-test/config.c @@ -18,7 +18,7 @@ #include #include -#include "core/config-parser.h" +#include #include "test.h" #include "config.h" diff --git a/src/battery/config.c b/src/battery/config.c index 7c3376c..7858f5a 100644 --- a/src/battery/config.c +++ b/src/battery/config.c @@ -24,10 +24,10 @@ #include #include #include +#include #include "core/log.h" #include "core/common.h" -#include "core/config-parser.h" #include "core/udev.h" #include "battery.h" #include "config.h" diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index 41dad87..58f7478 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -24,12 +24,12 @@ #include #include #include +#include #include "core/devices.h" #include "core/device-notifier.h" #include "core/udev.h" #include "core/log.h" -#include "core/config-parser.h" #include "display/poll.h" #include "display/setting.h" #include "shared/eventsystem.h" diff --git a/src/core/config-parser.c b/src/core/config-parser.c deleted file mode 100644 index 68b9f76..0000000 --- a/src/core/config-parser.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * deviced - * - * Copyright (c) 2013 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include "log.h" -#include "config-parser.h" - -#define MAX_LINE 512 -#define MAX_SECTION 64 -#define WHITESPACE " \t" -#define NEWLINE "\n\r" -#define COMMENT '#' - -static inline char *trim_str(char *s) -{ - char *t; - /* left trim */ - s += strspn(s, WHITESPACE); - - /* right trim */ - for (t = strchr(s, 0); t > s; t--) - if (!strchr(WHITESPACE, t[-1])) - break; - *t = 0; - return s; -} - -int config_parse(const char *file_name, int cb(struct parse_result *result, - void *user_data), void *user_data) -{ - FILE *f = NULL; - struct parse_result result; - /* use stack for parsing */ - char line[MAX_LINE]; - char section[MAX_SECTION]; - char *start, *end, *name, *value; - int lineno = 0, ret = 0; - - if (!file_name || !cb) { - ret = -EINVAL; - goto error; - } - - /* open conf file */ - f = fopen(file_name, "r"); - if (!f) { - ret = -errno; - _E("Failed to open file '%s'.", file_name); - goto error; - } - - /* parsing line by line */ - while (fgets(line, MAX_LINE, f) != NULL) { - lineno++; - - start = line; - start[strcspn(start, NEWLINE)] = '\0'; - start = trim_str(start); - - if (*start == COMMENT) { - continue; - } else if (*start == '[') { - /* parse section */ - end = strchr(start, ']'); - if (!end || *end != ']') { - ret = -EBADMSG; - goto error; - } - - *end = '\0'; - strncpy(section, start + 1, sizeof(section)); - section[MAX_SECTION-1] = '\0'; - } else if (*start) { - /* parse name & value */ - end = strchr(start, '='); - if (!end || *end != '=') { - end = strchr(start, ':'); - if (!end || *end != ':') { - ret = -EBADMSG; - goto error; - } - } - *end = '\0'; - name = trim_str(start); - value = trim_str(end + 1); - end = strchr(value, COMMENT); - if (end && *end == COMMENT) { - *end = '\0'; - value = trim_str(value); - } - - result.section = section; - result.name = name; - result.value = value; - /* callback with parse result */ - ret = cb(&result, user_data); - if (ret < 0) { - ret = -EBADMSG; - goto error; - } - } - } - _D("Success to load '%s'.", file_name); - fclose(f); - return 0; - -error: - if (f) - fclose(f); - _E("Failed to read '%s'. line=%d", file_name, lineno); - return ret; -} - diff --git a/src/core/config-parser.h b/src/core/config-parser.h deleted file mode 100644 index 55a49fd..0000000 --- a/src/core/config-parser.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * deviced - * - * Copyright (c) 2013 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#ifndef __CONFIG_PARSER_H__ -#define __CONFIG_PARSER_H__ - -#define MATCH(a, b) (!strncmp(a, b, strlen(a))) -#define SET_CONF(a, b) (a = (b > 0.0 ? b : a)) - -struct parse_result { - char *section; - char *name; - char *value; -}; - -/** - * @brief Parse config file and call callback\n - * @param[in] file_name conf file. - * @param[in] cb cb is called when conf file is parsed line by line. - * @param[in] user_data user data is passed to cb. - * @return 0 on success, negative if failed - */ -int config_parse(const char *file_name, int cb(struct parse_result *result, - void *user_data), void *user_data); - -#endif - diff --git a/src/display/auto-brightness.c b/src/display/auto-brightness.c index ac72807..b13dafb 100644 --- a/src/display/auto-brightness.c +++ b/src/display/auto-brightness.c @@ -34,7 +34,7 @@ #include "display-ops.h" #include "setting.h" #include "core/device-notifier.h" -#include "core/config-parser.h" +#include #define METHOD_CHECK_SUPPORTED "CheckSupported" diff --git a/src/display/display.c b/src/display/display.c index 4430ae3..6820ec8 100644 --- a/src/display/display.c +++ b/src/display/display.c @@ -19,13 +19,13 @@ #include #include +#include #include "util.h" #include "core.h" #include "display-ops.h" #include "dd-display.h" #include "core/common.h" -#include "core/config-parser.h" static int pm_cur_state; static int pm_old_state; diff --git a/src/display/display.h b/src/display/display.h index c87c06e..fd577c9 100644 --- a/src/display/display.h +++ b/src/display/display.h @@ -20,8 +20,8 @@ #ifndef __DISPLAY_H__ #define __DISPLAY_H__ +#include #include "device-interface.h" -#include "core/config-parser.h" void lcd_direct_control(enum dpms_state state, int flags); int get_pm_cur_state(void); diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c index a2e3b3d..eb5ca06 100644 --- a/src/extcon/extcon.c +++ b/src/extcon/extcon.c @@ -20,11 +20,11 @@ #include #include #include +#include #include "core/log.h" #include "core/common.h" #include "core/devices.h" -#include "core/config-parser.h" #include "core/device-notifier.h" #include "core/udev.h" #include "extcon.h" diff --git a/src/power/power-handler.c b/src/power/power-handler.c index 1431086..bef828e 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -35,11 +35,11 @@ #include #include #include +#include #include "dd-deviced.h" #include "core/log.h" #include "core/launch.h" -#include "core/config-parser.h" #include "core/device-notifier.h" #include "core/device-idler.h" #include "core/common.h" diff --git a/src/usb-host-test/usb-host-test.c b/src/usb-host-test/usb-host-test.c index e87d40b..6cc1586 100644 --- a/src/usb-host-test/usb-host-test.c +++ b/src/usb-host-test/usb-host-test.c @@ -25,9 +25,9 @@ #include #include #include +#include #include "core/log.h" -#include "core/config-parser.h" #include "core/device-idler.h" #include "core/device-notifier.h" #include "core/devices.h" -- 2.7.4 From 7cb7b3307927e7fce441c5a86ac927ab8dafa4c7 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Tue, 9 Feb 2021 10:06:05 +0900 Subject: [PATCH 09/16] Fix svace Change-Id: I1dd3b6f4258a13a0bba0109cc018a7d8e5602965 Signed-off-by: lokilee73 --- plugins/iot/display/core.c | 2 +- plugins/iot/display/device-interface.c | 2 +- plugins/mobile/display/core.c | 2 +- plugins/mobile/display/device-interface.c | 2 +- plugins/tv/display/core.c | 2 +- plugins/tv/display/device-interface.c | 2 +- plugins/wearable/display/core.c | 2 +- plugins/wearable/display/device-interface.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 plugins/tv/display/core.c diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index ffaa749..20be9bb 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -1328,7 +1328,7 @@ static int default_trans(int evt) next_state = (enum state_t)trans_table[get_pm_cur_state()][evt]; /* check conditions */ - while (st->check && !st->check(get_pm_cur_state(), next_state)) { + if (st->check && !st->check(get_pm_cur_state(), next_state)) { /* There is a condition. */ _I("%s locked. Trans to %s failed.", states[get_pm_cur_state()].name, states[next_state].name); diff --git a/plugins/iot/display/device-interface.c b/plugins/iot/display/device-interface.c index ee04a1c..7b8d8d0 100644 --- a/plugins/iot/display/device-interface.c +++ b/plugins/iot/display/device-interface.c @@ -618,7 +618,7 @@ static int get_frame_rate(int *rate) static int set_frame_rate(int rate) { - int ret; + int ret = 0; static int fmin = -1, fmax = -1; if (!display_dev_available) diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index a8f516c..2818a4f 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -1339,7 +1339,7 @@ static int default_trans(int evt) next_state = (enum state_t)trans_table[get_pm_cur_state()][evt]; /* check conditions */ - while (st->check && !st->check(get_pm_cur_state(), next_state)) { + if (st->check && !st->check(get_pm_cur_state(), next_state)) { /* There is a condition. */ _I("%s locked. Trans to %s failed.", states[get_pm_cur_state()].name, states[next_state].name); diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c index 313ec9c..4a0ab80 100644 --- a/plugins/mobile/display/device-interface.c +++ b/plugins/mobile/display/device-interface.c @@ -617,7 +617,7 @@ static int get_frame_rate(int *rate) static int set_frame_rate(int rate) { - int ret; + int ret = 0; static int fmin = -1, fmax = -1; if (!display_dev_available) diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c old mode 100755 new mode 100644 index 98a999a..806237a --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -1329,7 +1329,7 @@ static int default_trans(int evt) next_state = (enum state_t)trans_table[get_pm_cur_state()][evt]; /* check conditions */ - while (st->check && !st->check(get_pm_cur_state(), next_state)) { + if (st->check && !st->check(get_pm_cur_state(), next_state)) { /* There is a condition. */ _I("%s locked. Trans to %s failed.", states[get_pm_cur_state()].name, states[next_state].name); diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c index d7a8221..2142e48 100644 --- a/plugins/tv/display/device-interface.c +++ b/plugins/tv/display/device-interface.c @@ -618,7 +618,7 @@ static int get_frame_rate(int *rate) static int set_frame_rate(int rate) { - int ret; + int ret = 0; static int fmin = -1, fmax = -1; if (!display_dev_available) diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index 6c12358..ebb2c6b 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -1585,7 +1585,7 @@ static int default_trans(int evt) next_state = (enum state_t)trans_table[get_pm_cur_state()][evt]; /* check conditions */ - while (st->check && !st->check(get_pm_cur_state(), next_state)) { + if (st->check && !st->check(get_pm_cur_state(), next_state)) { /* There is a condition. */ _I("%s locked. Trans to %s failed.", states[get_pm_cur_state()].name, states[next_state].name); diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c index d0bef60..d674764 100644 --- a/plugins/wearable/display/device-interface.c +++ b/plugins/wearable/display/device-interface.c @@ -630,7 +630,7 @@ static int get_frame_rate(int *rate) static int set_frame_rate(int rate) { - int ret; + int ret = 0; static int fmin = -1, fmax = -1; if (!display_dev_available) -- 2.7.4 From cd98901f99410404467cb0dd01de7ffca334a8c8 Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Wed, 17 Feb 2021 13:36:40 +0900 Subject: [PATCH 10/16] Use mtp-responder-dummy.socket when there is no mtp-responser.socket The mtp-responder.socket is special in the configfs environment. If mtp-responder.socket is missing, gadget configuration will fail. As a result, all usb operations do not work properly. So in environments that mtp doesn't support, use dummy mtp. Applied target : RPI TV, RPI headless(32/64) Change-Id: Ie945b8ecc40ea669c8d2ca7a703e52721775a5a6 --- CMakeLists.txt | 4 ++++ packaging/deviced.spec | 5 +++++ systemd/descs | Bin 0 -> 80 bytes systemd/mtp-responder-dummy.service | 12 ++++++++++++ systemd/mtp-responder-dummy.socket | 6 ++++++ systemd/strs | Bin 0 -> 30 bytes 6 files changed, 27 insertions(+) create mode 100644 systemd/descs create mode 100644 systemd/mtp-responder-dummy.service create mode 100644 systemd/mtp-responder-dummy.socket create mode 100644 systemd/strs diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e678c9..4a7515c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,6 +292,10 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/org.tizen.system.deviced.servi INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/deviced.service DESTINATION /usr/lib/systemd/system) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/usb-host-ffs-test-daemon.service DESTINATION /usr/lib/systemd/system) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/usb-host-test.socket DESTINATION /usr/lib/systemd/system) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/strs DESTINATION /etc/mtp-responder-dummy) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/descs DESTINATION /etc/mtp-responder-dummy) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/mtp-responder-dummy.service DESTINATION /usr/lib/systemd/system) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/mtp-responder-dummy.socket DESTINATION /usr/lib/systemd/system) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/rndis.service DESTINATION /usr/lib/systemd/system) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/rndis.sh DESTINATION /usr/bin) diff --git a/packaging/deviced.spec b/packaging/deviced.spec index 8e4df19..89ce53e 100644 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -275,6 +275,11 @@ mv %{_libdir}/iot-display.so %{_libdir}/deviced/display.so %{_unitdir}/usb-host-test.socket %{_sysconfdir}/deviced/usb-host-test/descs %{_sysconfdir}/deviced/usb-host-test/strs +# dummy mtp-responder +%{_sysconfdir}/mtp-responder-dummy/strs +%{_sysconfdir}/mtp-responder-dummy/descs +%{_unitdir}/mtp-responder-dummy.socket +%{_unitdir}/mtp-responder-dummy.service # Assume power module is on (-DPOWER_MODULE=on) %{_prefix}/lib/systemd/deviced-shutdown diff --git a/systemd/descs b/systemd/descs new file mode 100644 index 0000000000000000000000000000000000000000..0bffd510200d70837af85cee78b0767780ab3636 GIT binary patch literal 80 zcmZQ(U|GBAN2pEiTPVSMUu9U;qFiAOs%( literal 0 HcmV?d00001 -- 2.7.4 From 19c9ca4460feb0436d3573a332d39b7a859a4b82 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Wed, 17 Feb 2021 16:28:21 +0900 Subject: [PATCH 11/16] Check display feature for iot headless Change-Id: Ib63e628eaf1df39d2bd1a44f36385f22e1a30ff1 Signed-off-by: lokilee73 --- plugins/iot/display/core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index 20be9bb..f2a9588 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "ambient-mode.h" #include "util.h" @@ -2011,6 +2012,10 @@ static int display_probe(void *data) { int ret; + /* check display feature */ + if (!is_feature_display_supported()) + return -ENODEV; + /** * load display service * if there is no display shared library, -- 2.7.4 From fb285c4a76af114ad398cac8043d73a689a7dc31 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Thu, 25 Feb 2021 12:53:32 +0900 Subject: [PATCH 12/16] Do not call hal_device_led_put_backend() Deviced does not repeat loading/unloading plugin modules during runtime. So, dlopen() is not required, and rather it will cause race condition during exit. Change-Id: Ice5a4bbdda8afb38e7631d025f682fbc2f85d8fb Signed-off-by: Hyotaek Shim --- src/led/torch.c | 9 +-------- src/led/touch-key.c | 6 ------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/led/torch.c b/src/led/torch.c index b4db8bf..752174c 100644 --- a/src/led/torch.c +++ b/src/led/torch.c @@ -165,12 +165,6 @@ static int led_service_load(void) return 0; } -static int led_service_free(void) -{ - torch_dev_available = false; - return hal_device_led_put_backend(); -} - static int torch_probe(void *data) { /* load led device */ @@ -189,8 +183,7 @@ static void torch_init(void *data) static void torch_exit(void *data) { - /* free led device */ - led_service_free(); + torch_dev_available = false; } static const struct device_ops torchled_device_ops = { diff --git a/src/led/touch-key.c b/src/led/touch-key.c index a24cc6a..dfd865b 100644 --- a/src/led/touch-key.c +++ b/src/led/touch-key.c @@ -224,11 +224,6 @@ static int touchled_service_load(void) return 0; } -static int touchled_service_free(void) -{ - return hal_device_led_put_backend(); -} - static int touchled_probe(void *data) { int ret; @@ -279,7 +274,6 @@ static void touchled_exit(void *data) /* free led device */ touchkey_dev_available = false; - touchled_service_free(); } static int touchled_execute(void *data) -- 2.7.4 From 3f10ca7eaff80bc2cc843c9fc1e11bf655e7fb48 Mon Sep 17 00:00:00 2001 From: "taemin.yeom" Date: Fri, 5 Mar 2021 18:31:25 +0900 Subject: [PATCH 13/16] Apply libsyscommon gdbus api improvement on error handling Change-Id: I2d6eb4e2ada9b15aa058c8691ff4cc576cd19738 Signed-off-by: taemin.yeom --- src/apps/apps.c | 22 +- src/apps/apps.h | 2 +- src/auto-test/battery.c | 47 +- src/auto-test/brightness.c | 21 +- src/auto-test/display.c | 41 +- src/auto-test/extcon.c | 26 +- src/auto-test/ir.c | 18 +- src/auto-test/led.c | 16 +- src/auto-test/power.c | 9 +- src/auto-test/proc.c | 8 +- src/auto-test/test_dbus_interface.c | 1216 ++++++++++++++++++++++------------- src/auto-test/time.c | 9 +- src/auto-test/udev.c | 9 +- src/battery/power-supply.c | 8 +- src/devicectl/devicectl.c | 80 ++- src/display/display-lock.c | 16 +- src/extcon/extcon.c | 12 +- src/led/noti.c | 25 +- src/libdeviced/deviced-noti.c | 45 +- src/libdeviced/display.c | 8 +- src/libdeviced/led.c | 26 +- src/libdeviced/usbhost.c | 44 +- src/power-command/command.c | 12 +- src/power/power-control.c | 22 +- src/power/power-handler.c | 4 +- src/usb/usb-state.c | 2 +- 26 files changed, 1077 insertions(+), 671 deletions(-) diff --git a/src/apps/apps.c b/src/apps/apps.c index 8e1923b..49ee2f5 100644 --- a/src/apps/apps.c +++ b/src/apps/apps.c @@ -127,35 +127,17 @@ int launch_message_post(char *type) return ret; } -int add_async_notification(char *type, dbus_pending_cb func, char *sig, ...) +int add_async_notification(char *type, dbus_pending_cb func, GVariant *param) { int ret; - int count; - int len; - char *data = NULL; - const char *param[BUFF_MAX] = {NULL}; - va_list args; if (!type) return -EINVAL; - if (sig) { - len = strlen(sig); - va_start(args, sig); - - for (count = 0; count < len; count++) { - data = va_arg(args, char *); - param[count] = data; - } - - va_end(args); - } - - ret = dbus_handle_method_async_with_reply(POPUP_BUS_NAME, + ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, type, - sig, param, func, -1, diff --git a/src/apps/apps.h b/src/apps/apps.h index 80daf7d..c6d7070 100644 --- a/src/apps/apps.h +++ b/src/apps/apps.h @@ -40,7 +40,7 @@ enum application_state { int launch_system_app(char *type, int num, ...); int launch_message_post(char *type); -int add_async_notification(char *type, dbus_pending_cb func, char *sig, ...); +int add_async_notification(char *type, dbus_pending_cb func, GVariant *param); int remove_notification(char *type, int id); void set_app_state(pid_t pid, enum application_state as); bool is_app_background (pid_t pid); diff --git a/src/auto-test/battery.c b/src/auto-test/battery.c index 93a69c4..dca16ed 100644 --- a/src/auto-test/battery.c +++ b/src/auto-test/battery.c @@ -222,15 +222,15 @@ static struct power_supply_type { static bool get_battery_method(const char *method, int *value) { GVariant *msg = NULL; - int val = 0; + int val = 0, err; char* health = NULL; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - method, NULL); - if (!msg) { + method, NULL, &msg); + if (err < 0) { _E("Failed to call dbus method(%s): No reply.", method); return ret; } @@ -265,14 +265,14 @@ static bool get_battery_method(const char *method, int *value) static bool get_battery_method_vconf(const char *method) { GVariant *msg = NULL; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - method, NULL); - if (!msg) { + method, NULL, &msg); + if (err < 0) { _E("Failed to call dbus method(%s): No reply.", method); return ret; } @@ -312,14 +312,16 @@ static bool set_battery_low_level(int newlevel) GVariant *msg; int getlevel = -1; int val = -1; + int err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - METHOD_BATTERY_SETLOWBATLEVEL, g_variant_new("(i)", newlevel)); + METHOD_BATTERY_SETLOWBATLEVEL, g_variant_new("(i)", newlevel), + &msg); - if (!msg) { + if (err < 0) { _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_SETLOWBATLEVEL); return ret; } @@ -398,14 +400,15 @@ static bool get_battery_info() { GVariant *msg; int val[9]; + int err; bool ret = FALSE; char *argv[3]; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - METHOD_BATTERY_GETINFO, NULL); - if (!msg) { + METHOD_BATTERY_GETINFO, NULL, &msg); + if (err < 0) { _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_GETINFO); return ret; } @@ -667,7 +670,7 @@ static bool compare_power_supply(struct power_supply_type list, int value[], con static bool set_battery_power_supply(int index) { GVariant *msg, *var; - int val; + int val, err; bool ret = FALSE; var = g_variant_new("(sisssssssssssss)", POWER_SUBSYSTEM, @@ -700,11 +703,11 @@ static bool set_battery_power_supply(int index) power_supply_types[index].current_avg, power_supply_types[index].temperature); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - POWER_SUBSYSTEM, var); - if (!msg) { + POWER_SUBSYSTEM, var, &msg); + if (err < 0) { _E("Failed to call dbus method(%s): No reply", POWER_SUBSYSTEM); return ret; } @@ -730,14 +733,14 @@ static bool set_battery_power_supply(int index) static bool get_battery_power_supply(int rsp[], char **power_source) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - METHOD_BATTERY_GET_POWERSUPPLY, NULL); - if (!msg) { + METHOD_BATTERY_GET_POWERSUPPLY, NULL, &msg); + if (err < 0) { _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_GET_POWERSUPPLY); return ret; } diff --git a/src/auto-test/brightness.c b/src/auto-test/brightness.c index 424adb6..5ed65a1 100644 --- a/src/auto-test/brightness.c +++ b/src/auto-test/brightness.c @@ -28,7 +28,8 @@ static void start_udev(void) DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", - g_variant_new("(sis)", "udev", 1, "start")); + g_variant_new("(sis)", "udev", 1, "start"), + NULL); } static void stop_udev(void) @@ -37,17 +38,18 @@ static void stop_udev(void) DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", - g_variant_new("(sis)", "udev", 1, "stop")); + g_variant_new("(sis)", "udev", 1, "stop"), + NULL); } static int call_display_method_sync(const char *method, GVariant *param) { - GVariant *msg; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + int err; + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, param); - if (!msg) { + method, param, NULL); + if (err < 0) { _E("Failed to %s.", method); return -1; } @@ -57,17 +59,18 @@ static int call_display_method_sync(const char *method, GVariant *param) static void check_result(int expect_default, int expect_current) { + int err; int result_default; int result_current; bool match_default; bool match_current; GVariant *msg; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - "GetBrightnessInfo", NULL); - if (!msg) { + "GetBrightnessInfo", NULL, &msg); + if (err < 0) { _E("Failed to GetBrightnessInfo."); return; } diff --git a/src/auto-test/display.c b/src/auto-test/display.c index df4631e..2995ce9 100644 --- a/src/auto-test/display.c +++ b/src/auto-test/display.c @@ -57,14 +57,14 @@ static bool get_display_method(const char *method, GVariant *param, int *value) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, param); - if (!msg) { + method, param, &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } @@ -84,14 +84,14 @@ static bool get_display_method(const char *method, GVariant *param, int *value) static bool set_display_method(const char *method, GVariant *param) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, param); - if (!msg) { + method, param, &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } @@ -117,12 +117,13 @@ static bool set_display_method(const char *method, GVariant *param) static bool set_display_method_noreply(const char *method, GVariant *var) { GVariant *msg; + int err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, var); - if (!msg) { + method, var, &msg); + if (err < 0) { _E("fail (%s): no reply", method); return FALSE; } @@ -154,15 +155,16 @@ static bool get_display_custombrightness() static bool set_display_autobrightness_min(int min) { GVariant *msg; - int val = 0; + int val = 0, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_DISPLAY_SETAUTOBRIGHTNESSMIN, - g_variant_new("(i)", min)); - if (!msg) { + g_variant_new("(i)", min), + &msg); + if (err < 0) { _E("fail : no reply"); return ret; } @@ -303,15 +305,16 @@ static bool set_display_powerkey_lcdoff() static bool set_display_locktimeout_expired(char *req_id) { DBusMessage *msg; - int val; + int val, err; char *ret_req_id; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - METHOD_DISPLAY_LOCKTIMEOUT_EXPIRED, g_variant_new("(s)", req_id)); - if (!msg) { + METHOD_DISPLAY_LOCKTIMEOUT_EXPIRED, g_variant_new("(s)", req_id), + &msg); + if (err < 0) { _E("fail: no reply"); return ret; } diff --git a/src/auto-test/extcon.c b/src/auto-test/extcon.c index 645eda6..f4b2f0f 100644 --- a/src/auto-test/extcon.c +++ b/src/auto-test/extcon.c @@ -27,15 +27,16 @@ static bool request_extcon_method(const char *method, GVariant *param) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_EXTCON, DEVICED_INTERFACE_EXTCON, method, - param); - if (!msg) { + param, + &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } @@ -61,14 +62,14 @@ static bool request_extcon_method(const char *method, GVariant *param) static bool get_sysnoti_method(const char *method) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, - method, NULL); - if (!msg) { + method, NULL, &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } @@ -94,15 +95,16 @@ static bool get_sysnoti_method(const char *method) static bool get_extcon_status(char *device_name) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_EXTCON, DEVICED_INTERFACE_EXTCON, METHOD_EXTCON_GETSTATUS, - g_variant_new("(s)", device_name)); - if (!msg) { + g_variant_new("(s)", device_name), + &msg); + if (err < 0) { _E("fail : no reply"); return ret; } diff --git a/src/auto-test/ir.c b/src/auto-test/ir.c index 48ad1c0..06565f6 100644 --- a/src/auto-test/ir.c +++ b/src/auto-test/ir.c @@ -29,7 +29,7 @@ struct dbus_int { static bool request_ir_method(const char *method, const char *sig, int *param) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; GVariant *var = NULL; @@ -42,12 +42,13 @@ static bool request_ir_method(const char *method, const char *sig, int *param) return FALSE; } - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_IR, DEVICED_INTERFACE_IR, method, - var); - if (!msg) { + var, + &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } @@ -93,15 +94,16 @@ static bool set_ir_transmit(int carrier_frequency, int *pattern, int size) static bool set_ir_command(char *command) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_IR_SETIRCOMMAND, - g_variant_new("(s)", command)); - if (!msg) { + g_variant_new("(s)", command), + &msg); + if (err < 0) { _E("fail : no reply"); return ret; } diff --git a/src/auto-test/led.c b/src/auto-test/led.c index 9d3ffe8..807364a 100755 --- a/src/auto-test/led.c +++ b/src/auto-test/led.c @@ -40,14 +40,14 @@ static unsigned int color[] = {BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE static bool get_led_method(const char *method) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, - method, NULL); - if (!msg) { + method, NULL, &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } @@ -66,14 +66,14 @@ static bool get_led_method(const char *method) static bool set_led_method(const char *method, GVariant *param) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, - method, param); - if (!msg) { + method, param, &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } diff --git a/src/auto-test/power.c b/src/auto-test/power.c index 29b6a3c..49ebc75 100644 --- a/src/auto-test/power.c +++ b/src/auto-test/power.c @@ -23,15 +23,16 @@ static bool set_reboot_method(const char *method, GVariant *param) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, method, - param); - if (!msg) { + param, + &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } diff --git a/src/auto-test/proc.c b/src/auto-test/proc.c index 914d922..28dfa4c 100644 --- a/src/auto-test/proc.c +++ b/src/auto-test/proc.c @@ -23,14 +23,14 @@ static bool get_sysnoti_revision() { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, - METHOD_SYSNOTI_GETREVISION, NULL); - if (!msg) { + METHOD_SYSNOTI_GETREVISION, NULL, &msg); + if (err < 0) { _E("fail : no reply"); return ret; } diff --git a/src/auto-test/test_dbus_interface.c b/src/auto-test/test_dbus_interface.c index 4257244..62b158f 100644 --- a/src/auto-test/test_dbus_interface.c +++ b/src/auto-test/test_dbus_interface.c @@ -38,13 +38,15 @@ gint test_deviced_Tzip_IsMounted(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "IsMounted", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed IsMounted"); return 0; } @@ -61,13 +63,15 @@ gint test_deviced_Tzip_UnmountSync(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "UnmountSync", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed UnmountSync"); return 0; } @@ -84,13 +88,15 @@ gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "MountSync", - g_variant_new("(sss)", param1, param2, param3));; - if (!ret) { + g_variant_new("(sss)", param1, param2, param3), + &ret);; + if (err < 0) { _E("failed MountSync"); return 0; } @@ -107,13 +113,15 @@ gint test_deviced_Tzip_Unmount(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "Unmount", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed Unmount"); return 0; } @@ -130,13 +138,15 @@ gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gch { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "Mount", - g_variant_new("(sss)", param1, param2, param3));; - if (!ret) { + g_variant_new("(sss)", param1, param2, param3), + &ret);; + if (err < 0) { _E("failed Mount"); return 0; } @@ -156,13 +166,15 @@ gint test_deviced_ExtCon_disable(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "disable", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed disable"); return 0; } @@ -179,13 +191,15 @@ gint test_deviced_ExtCon_enable(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "enable", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed enable"); return 0; } @@ -202,13 +216,15 @@ gint test_deviced_ExtCon_GetStatus(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "GetStatus", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed GetStatus"); return 0; } @@ -226,11 +242,16 @@ gint test_deviced_ExtCon_GetStatus(const gchar *param1) void test_deviced_UsbHostTest_stop(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + int err; + GVariant *ret; + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/UsbHostTest", "org.tizen.system.deviced.UsbHostTest", "stop", - NULL);; + NULL, + &ret);; + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -240,11 +261,16 @@ void test_deviced_UsbHostTest_stop(void) void test_deviced_UsbHostTest_start(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + int err; + GVariant *ret; + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/UsbHostTest", "org.tizen.system.deviced.UsbHostTest", "start", - NULL);; + NULL, + &ret);; + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -259,13 +285,15 @@ gint test_deviced_lowpower_GetState(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "GetState", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetState"); return 0; } @@ -282,13 +310,15 @@ gint test_deviced_lowpower_Stop(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "Stop", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed Stop"); return 0; } @@ -305,13 +335,15 @@ gint test_deviced_lowpower_Start(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "Start", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed Start"); return 0; } @@ -331,13 +363,15 @@ gint test_deviced_ir_TransmitIR(gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Ir", "org.tizen.system.deviced.ir", "TransmitIR", - g_variant_new("(ai)", param2));; - if (!ret) { + g_variant_new("(ai)", param2), + &ret);; + if (err < 0) { _E("failed TransmitIR"); return 0; } @@ -354,13 +388,15 @@ gint test_deviced_ir_IRIsAvailable(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Ir", "org.tizen.system.deviced.ir", "IRIsAvailable", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed IRIsAvailable"); return 0; } @@ -380,13 +416,15 @@ gint test_deviced_PowerOff_RemovePowerOffWait(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "RemovePowerOffWait", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed RemovePowerOffWait"); return 0; } @@ -403,13 +441,15 @@ gint test_deviced_PowerOff_AddPowerOffWait(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "AddPowerOffWait", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed AddPowerOffWait"); return 0; } @@ -426,13 +466,15 @@ gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar * { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "PowerOffWithOption", - g_variant_new("(ss)", param1, param2));; - if (!ret) { + g_variant_new("(ss)", param1, param2), + &ret);; + if (err < 0) { _E("failed PowerOffWithOption"); return 0; } @@ -449,13 +491,15 @@ gint test_deviced_PowerOff_PowerOff(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "PowerOff", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed PowerOff"); return 0; } @@ -475,13 +519,15 @@ gint test_deviced_Battery_MiscEvent(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "MiscEvent", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed MiscEvent"); return 0; } @@ -496,11 +542,16 @@ gint test_deviced_Battery_MiscEvent(void) GVariant * test_deviced_Battery_BatteryProperties(void) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "BatteryProperties", - NULL); + NULL, &ret); + if (err < 0) + return NULL; + return ret; } // ChargerCharging : in i, out i @@ -509,13 +560,15 @@ gint test_deviced_Battery_ChargerCharging(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerCharging", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ChargerCharging"); return 0; } @@ -532,13 +585,15 @@ gint test_deviced_Battery_ChargerType(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerType", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed ChargerType"); return 0; } @@ -553,11 +608,18 @@ gint test_deviced_Battery_ChargerType(void) GVariant * test_deviced_Battery_GetBatteryInfo(void) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetBatteryInfo", - NULL); + NULL, + &ret); + if (err < 0) + return NULL; + return ret; } // power_supply : in sissssss, out i @@ -566,13 +628,15 @@ gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const g { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "power_supply", - g_variant_new("(sissssss)", param1, param2, param3, param4, param5, param6, param7, param8));; - if (!ret) { + g_variant_new("(sissssss)", param1, param2, param3, param4, param5, param6, param7, param8), + &ret);; + if (err < 0) { _E("failed power_supply"); return 0; } @@ -589,13 +653,15 @@ gchar * test_deviced_Battery_GetHealth(void) { gchar *val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetHealth", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetHealth"); return 0; } @@ -612,13 +678,15 @@ gint test_deviced_Battery_IsFull(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "IsFull", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed IsFull"); return 0; } @@ -635,13 +703,15 @@ gint test_deviced_Battery_GetPercentRaw(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetPercentRaw", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetPercentRaw"); return 0; } @@ -658,13 +728,15 @@ gint test_deviced_Battery_GetPercent(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetPercent", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetPercent"); return 0; } @@ -681,13 +753,15 @@ gint test_deviced_Battery_BatteryStatusLow(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "BatteryStatusLow", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed BatteryStatusLow"); return 0; } @@ -704,13 +778,15 @@ gint test_deviced_Battery_ChargeNow(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargeNow", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed ChargeNow"); return 0; } @@ -727,13 +803,15 @@ gint test_deviced_Battery_ChargerStatus(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerStatus", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed ChargerStatus"); return 0; } @@ -750,13 +828,15 @@ gint test_deviced_Battery_GetLowbatLevel(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetLowbatLevel", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetLowbatLevel"); return 0; } @@ -773,13 +853,15 @@ gint test_deviced_Battery_SetLowbatLevel(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "SetLowbatLevel", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed SetLowbatLevel"); return 0; } @@ -796,13 +878,15 @@ gint test_deviced_Battery_TimeToEmpty(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "TimeToEmpty", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed TimeToEmpty"); return 0; } @@ -819,13 +903,15 @@ gint test_deviced_Battery_TimeToFull(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "TimeToFull", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed TimeToFull"); return 0; } @@ -845,13 +931,15 @@ gint test_deviced_temperature_GetTemperature(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Temperature", "org.tizen.system.deviced.temperature", "GetTemperature", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GetTemperature"); return 0; } @@ -869,11 +957,18 @@ gint test_deviced_temperature_GetTemperature(gint param1) GVariant * test_deviced_BatteryMonitor_GetBMData(void) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/BatteryMonitor", "org.tizen.system.deviced.BatteryMonitor", "GetBMData", - NULL); + NULL, + &ret); + if (err < 0) + return NULL; + return ret; } // /Org/Tizen/System/DeviceD/Core @@ -883,14 +978,19 @@ GVariant * test_deviced_BatteryMonitor_GetBMData(void) void test_deviced_core_DeviceList(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Core", "org.tizen.system.deviced.core", "DeviceList", - NULL);; + NULL, + &ret);; + if (err < 0) + return; if (ret) g_variant_unref(ret); - } // /Org/Tizen/System/DeviceD/Usbhost @@ -900,11 +1000,18 @@ void test_deviced_core_DeviceList(void) GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "OpenDevice", - g_variant_new("(s)", param1)); + g_variant_new("(s)", param1), + &ret); + if (err < 0) + return NULL; + return ret; } // GetDeviceListCount : in i, out i @@ -913,13 +1020,15 @@ gint test_deviced_Usbhost_GetDeviceListCount(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "GetDeviceListCount", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret); + if (err < 0) { _E("failed GetDeviceListCount"); return 0; } @@ -934,22 +1043,35 @@ gint test_deviced_Usbhost_GetDeviceListCount(gint param1) GVariant * test_deviced_Usbhost_GetDeviceList(gint param1) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "GetDeviceList", - g_variant_new("(i)", param1)); + g_variant_new("(i)", param1), + &ret); + if (err < 0) + return NULL; + return ret; } // PrintPolicy : in , out void test_deviced_Usbhost_PrintPolicy(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "PrintPolicy", - NULL);; + NULL, + &ret); + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -959,11 +1081,17 @@ void test_deviced_Usbhost_PrintPolicy(void) void test_deviced_Usbhost_PrintDeviceList(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "PrintDeviceList", - NULL);; + NULL, + &ret); + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -978,13 +1106,15 @@ guint test_deviced_Usb_GetMode(void) { guint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usb", "org.tizen.system.deviced.Usb", "GetMode", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetMode"); return 0; } @@ -1001,13 +1131,15 @@ guint test_deviced_Usb_GetState(void) { guint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usb", "org.tizen.system.deviced.Usb", "GetState", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetState"); return 0; } @@ -1027,13 +1159,15 @@ gint test_deviced_SysNoti_GetHDMI(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetHDMI", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetHDMI"); return 0; } @@ -1050,13 +1184,15 @@ gint test_deviced_SysNoti_GetCradle(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetCradle", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetCradle"); return 0; } @@ -1073,13 +1209,15 @@ gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const g { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "set_timezone", - g_variant_new("(sis)", param1, param2, param3));; - if (!ret) { + g_variant_new("(sis)", param1, param2, param3), + &ret); + if (err < 0) { _E("failed set_timezone"); return 0; } @@ -1096,13 +1234,15 @@ gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const g { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "set_datetime", - g_variant_new("(sis)", param1, param2, param3));; - if (!ret) { + g_variant_new("(sis)", param1, param2, param3), + &ret); + if (err < 0) { _E("failed set_datetime"); return 0; } @@ -1119,13 +1259,15 @@ gint test_deviced_SysNoti_GetRevision(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetRevision", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetRevision"); return 0; } @@ -1142,13 +1284,15 @@ gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *pa { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "udev", - g_variant_new("(sis)", param1, param2, param3));; - if (!ret) { + g_variant_new("(sis)", param1, param2, param3), + &ret); + if (err < 0) { _E("failed udev"); return 0; } @@ -1165,13 +1309,15 @@ gint test_deviced_SysNoti_EventStop(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "EventStop", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed EventStop"); return 0; } @@ -1188,13 +1334,15 @@ gint test_deviced_SysNoti_EventStart(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "EventStart", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed EventStart"); return 0; } @@ -1211,13 +1359,15 @@ gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gch { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "getcontrol", - g_variant_new("(siss)", param1, param2, param3, param4));; - if (!ret) { + g_variant_new("(siss)", param1, param2, param3, param4), + &ret); + if (err < 0) { _E("failed getcontrol"); return 0; } @@ -1234,13 +1384,15 @@ gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "control", - g_variant_new("(sisss)", param1, param2, param3, param4, param5));; - if (!ret) { + g_variant_new("(sisss)", param1, param2, param3, param4, param5), + &ret); + if (err < 0) { _E("failed control"); return 0; } @@ -1260,13 +1412,15 @@ gint test_deviced_Led_SetIrCommand(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "SetIrCommand", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret); + if (err < 0) { _E("failed SetIrCommand"); return 0; } @@ -1283,13 +1437,15 @@ gint test_deviced_Led_SetBrightness(gint param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "SetBrightness", - g_variant_new("(ii)", param1, param2));; - if (!ret) { + g_variant_new("(ii)", param1, param2), + &ret); + if (err < 0) { _E("failed SetBrightness"); return 0; } @@ -1306,13 +1462,15 @@ gint test_deviced_Led_GetMaxBrightness(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetMaxBrightness", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetMaxBrightness"); return 0; } @@ -1329,13 +1487,15 @@ gint test_deviced_Led_GetBrightness(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetBrightness", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetBrightness"); return 0; } @@ -1352,13 +1512,15 @@ gint test_deviced_Led_GetBrightnessForCamera(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetBrightnessForCamera", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed GetBrightnessForCamera"); return 0; } @@ -1378,13 +1540,15 @@ gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockTimeoutInput", - g_variant_new("(si)", param1, param2));; - if (!ret) { + g_variant_new("(si)", param1, param2), + &ret); + if (err < 0) { _E("failed LockTimeoutInput"); return 0; } @@ -1401,13 +1565,15 @@ gint test_deviced_display_LockTimeoutExpired(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockTimeoutExpired", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret); + if (err < 0) { _E("failed LockTimeoutExpired"); return 0; } @@ -1424,13 +1590,15 @@ gint test_deviced_display_CurrentBrightness(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CurrentBrightness", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret); + if (err < 0) { _E("failed CurrentBrightness"); return 0; } @@ -1447,13 +1615,15 @@ gint test_deviced_display_CustomBrightness(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomBrightness", - NULL);; - if (!ret) { + NULL, + &ret); + if (err < 0) { _E("failed CustomBrightness"); return 0; } @@ -1470,13 +1640,15 @@ gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint pa { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ActorControl", - g_variant_new("(sii)", param1, param2, param3));; - if (!ret) { + g_variant_new("(sii)", param1, param2, param3), + &ret); + if (err < 0) { _E("failed ActorControl"); return 0; } @@ -1493,13 +1665,15 @@ gint test_deviced_display_LCDPanelOffMode(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LCDPanelOffMode", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret); + if (err < 0) { _E("failed LCDPanelOffMode"); return 0; } @@ -1516,13 +1690,15 @@ gint test_deviced_display_StayTouchScreenOff(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "StayTouchScreenOff", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret); + if (err < 0) { _E("failed StayTouchScreenOff"); return 0; } @@ -1539,13 +1715,15 @@ gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, g { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PlatformLCDControl", - g_variant_new("(isi)", param1, param2, param3));; - if (!ret) { + g_variant_new("(isi)", param1, param2, param3), + &ret); + if (err < 0) { _E("failed PlatformLCDControl"); return 0; } @@ -1562,13 +1740,15 @@ gint test_deviced_display_CustomLCDOff(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomLCDOff", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret); + if (err < 0) { _E("failed CustomLCDOff"); return 0; } @@ -1585,13 +1765,15 @@ gint test_deviced_display_CustomLCDOn(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomLCDOn", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CustomLCDOn"); return 0; } @@ -1608,13 +1790,15 @@ gint test_deviced_display_PowerKeyLCDOff(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PowerKeyLCDOff", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed PowerKeyLCDOff"); return 0; } @@ -1631,13 +1815,15 @@ gint test_deviced_display_PowerKeyIgnore(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PowerKeyIgnore", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed PowerKeyIgnore"); return 0; } @@ -1652,11 +1838,17 @@ gint test_deviced_display_PowerKeyIgnore(gint param1) void test_deviced_display_SaveLog(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SaveLog", - NULL);; + NULL, + &ret);; + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -1668,13 +1860,15 @@ gint test_deviced_display_Dumpmode(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "Dumpmode", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed Dumpmode"); return 0; } @@ -1691,13 +1885,15 @@ gint test_deviced_display_SetRefreshRate(gint param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetRefreshRate", - g_variant_new("(ii)", param1, param2));; - if (!ret) { + g_variant_new("(ii)", param1, param2), + &ret);; + if (err < 0) { _E("failed SetRefreshRate"); return 0; } @@ -1714,13 +1910,15 @@ gint test_deviced_display_ReleaseBrightness(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ReleaseBrightness", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed ReleaseBrightness"); return 0; } @@ -1737,13 +1935,15 @@ gint test_deviced_display_HoldBrightness(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "HoldBrightness", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed HoldBrightness"); return 0; } @@ -1760,13 +1960,15 @@ gint test_deviced_display_SetBrightness(gint param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetBrightness", - g_variant_new("(ii)", param1, param2));; - if (!ret) { + g_variant_new("(ii)", param1, param2), + &ret);; + if (err < 0) { _E("failed SetBrightness"); return 0; } @@ -1783,13 +1985,15 @@ gint test_deviced_display_GetBrightness(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetBrightness", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GetBrightness"); return 0; } @@ -1806,13 +2010,15 @@ gint test_deviced_display_SetMaxBrightness(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetMaxBrightness", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed SetMaxBrightness"); return 0; } @@ -1829,13 +2035,15 @@ gint test_deviced_display_GetMaxBrightness(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetMaxBrightness", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GetMaxBrightness"); return 0; } @@ -1852,13 +2060,15 @@ gint test_deviced_display_GetDisplayCount(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetDisplayCount", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetDisplayCount"); return 0; } @@ -1875,13 +2085,15 @@ gint test_deviced_display_LockScreenBgOn(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockScreenBgOn", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed LockScreenBgOn"); return 0; } @@ -1898,13 +2110,15 @@ gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setlcdtimeout", - g_variant_new("(iii)", param1, param2, param3));; - if (!ret) { + g_variant_new("(iii)", param1, param2, param3), + &ret);; + if (err < 0) { _E("failed setlcdtimeout"); return 0; } @@ -1921,13 +2135,15 @@ gint test_deviced_display_setautobrightnessmin(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setautobrightnessmin", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed setautobrightnessmin"); return 0; } @@ -1944,13 +2160,15 @@ gint test_deviced_display_setframerate(gint param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setframerate", - g_variant_new("(ii)", param1, param2));; - if (!ret) { + g_variant_new("(ii)", param1, param2), + &ret);; + if (err < 0) { _E("failed setframerate"); return 0; } @@ -1967,13 +2185,15 @@ gint test_deviced_display_setbrightness(gint param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setbrightness", - g_variant_new("(ii)", param1, param2));; - if (!ret) { + g_variant_new("(ii)", param1, param2), + &ret);; + if (err < 0) { _E("failed setbrightness"); return 0; } @@ -1990,13 +2210,15 @@ gint test_deviced_display_getbrightness(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "getbrightness", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed getbrightness"); return 0; } @@ -2013,13 +2235,15 @@ gint test_deviced_display_ChangeState(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ChangeState", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed ChangeState"); return 0; } @@ -2036,13 +2260,15 @@ gint test_deviced_display_changestate(const gchar *param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "changestate", - g_variant_new("(s)", param1));; - if (!ret) { + g_variant_new("(s)", param1), + &ret);; + if (err < 0) { _E("failed changestate"); return 0; } @@ -2059,13 +2285,15 @@ gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "unlockstate", - g_variant_new("(ss)", param1, param2));; - if (!ret) { + g_variant_new("(ss)", param1, param2), + &ret);; + if (err < 0) { _E("failed unlockstate"); return 0; } @@ -2082,13 +2310,15 @@ gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, co { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "lockstate", - g_variant_new("(sssi)", param1, param2, param3, param4));; - if (!ret) { + g_variant_new("(sssi)", param1, param2, param3, param4), + &ret);; + if (err < 0) { _E("failed lockstate"); return 0; } @@ -2103,11 +2333,17 @@ gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, co void test_deviced_display_stop(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "stop", - NULL);; + NULL, + &ret);; + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -2117,11 +2353,17 @@ void test_deviced_display_stop(void) void test_deviced_display_start(void) { - GVariant *ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "start", - NULL);; + NULL, + &ret);; + if (err < 0) + return; if (ret) g_variant_unref(ret); @@ -2134,11 +2376,17 @@ void test_deviced_display_start(void) GVariant * test_deviced_Board_GetNum(void) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetNum", - NULL); + NULL, + &ret); + if (err < 0) + return NULL; + return ret; } // GetHWRev : in , out i @@ -2147,13 +2395,15 @@ gint test_deviced_Board_GetHWRev(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetHWRev", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetHWRev"); return 0; } @@ -2168,11 +2418,17 @@ gint test_deviced_Board_GetHWRev(void) GVariant * test_deviced_Board_GetSerial(void) { - return dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *ret; + int err; + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetSerial", - NULL); + NULL, + &ret); + if (err < 0) + return NULL; + return ret; } // /Org/Tizen/System/DeviceD/PmQos @@ -2184,13 +2440,15 @@ gint test_deviced_PmQos_MyfilesScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MyfilesScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed MyfilesScroll"); return 0; } @@ -2207,13 +2465,15 @@ gint test_deviced_PmQos_CallLogScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CallLogScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CallLogScroll"); return 0; } @@ -2230,13 +2490,15 @@ gint test_deviced_PmQos_TizenStoreScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "TizenStoreScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed TizenStoreScroll"); return 0; } @@ -2253,13 +2515,15 @@ gint test_deviced_PmQos_ContactScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ContactScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ContactScroll"); return 0; } @@ -2276,13 +2540,15 @@ gint test_deviced_PmQos_EmailScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "EmailScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed EmailScroll"); return 0; } @@ -2299,13 +2565,15 @@ gint test_deviced_PmQos_VideoScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "VideoScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed VideoScroll"); return 0; } @@ -2322,13 +2590,15 @@ gint test_deviced_PmQos_FileScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "FileScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed FileScroll"); return 0; } @@ -2345,13 +2615,15 @@ gint test_deviced_PmQos_MusicScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MusicScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed MusicScroll"); return 0; } @@ -2368,13 +2640,15 @@ gint test_deviced_PmQos_UgLaunch(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "UgLaunch", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed UgLaunch"); return 0; } @@ -2391,13 +2665,15 @@ gint test_deviced_PmQos_SensorWakeup(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SensorWakeup", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed SensorWakeup"); return 0; } @@ -2414,13 +2690,15 @@ gint test_deviced_PmQos_WebAppFlick(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebAppFlick", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed WebAppFlick"); return 0; } @@ -2437,13 +2715,15 @@ gint test_deviced_PmQos_WebAppDrag(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebAppDrag", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed WebAppDrag"); return 0; } @@ -2460,13 +2740,15 @@ gint test_deviced_PmQos_PowerOff(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "PowerOff", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed PowerOff"); return 0; } @@ -2483,13 +2765,15 @@ gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WifiThroughput", - g_variant_new("(ii)", param1, param2));; - if (!ret) { + g_variant_new("(ii)", param1, param2), + &ret);; + if (err < 0) { _E("failed WifiThroughput"); return 0; } @@ -2506,13 +2790,15 @@ gint test_deviced_PmQos_WebappLaunch(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebappLaunch", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed WebappLaunch"); return 0; } @@ -2529,13 +2815,15 @@ gint test_deviced_PmQos_SVoice(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SVoice", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed SVoice"); return 0; } @@ -2552,13 +2840,15 @@ gint test_deviced_PmQos_SmemoZoom(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SmemoZoom", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed SmemoZoom"); return 0; } @@ -2575,13 +2865,15 @@ gint test_deviced_PmQos_ScreenMirroring(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ScreenMirroring", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ScreenMirroring"); return 0; } @@ -2598,13 +2890,15 @@ gint test_deviced_PmQos_ReservedMode(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ReservedMode", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ReservedMode"); return 0; } @@ -2621,13 +2915,15 @@ gint test_deviced_PmQos_ProcessCrashed(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ProcessCrashed", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ProcessCrashed"); return 0; } @@ -2644,13 +2940,15 @@ gint test_deviced_PmQos_PowerSaving(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "PowerSaving", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed PowerSaving"); return 0; } @@ -2667,13 +2965,15 @@ gint test_deviced_PmQos_MusicPlayLcdOn(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MusicPlayLcdOn", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed MusicPlayLcdOn"); return 0; } @@ -2690,13 +2990,15 @@ gint test_deviced_PmQos_MtpSendFile(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MtpSendFile", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed MtpSendFile"); return 0; } @@ -2713,13 +3015,15 @@ gint test_deviced_PmQos_LowBattery(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "LowBattery", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed LowBattery"); return 0; } @@ -2736,13 +3040,15 @@ gint test_deviced_PmQos_LockScreen(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "LockScreen", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed LockScreen"); return 0; } @@ -2759,13 +3065,15 @@ gint test_deviced_PmQos_IMEInput(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "IMEInput", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed IMEInput"); return 0; } @@ -2782,13 +3090,15 @@ gint test_deviced_PmQos_ImageViewer(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ImageViewer", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ImageViewer"); return 0; } @@ -2805,13 +3115,15 @@ gint test_deviced_PmQos_HomeScreen(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "HomeScreen", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed HomeScreen"); return 0; } @@ -2828,13 +3140,15 @@ gint test_deviced_PmQos_GpuWakeup(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpuWakeup", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GpuWakeup"); return 0; } @@ -2851,13 +3165,15 @@ gint test_deviced_PmQos_GpuBoost(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpuBoost", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GpuBoost"); return 0; } @@ -2874,13 +3190,15 @@ gint test_deviced_PmQos_GpsSerialCno(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpsSerialCno", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GpsSerialCno"); return 0; } @@ -2897,13 +3215,15 @@ gint test_deviced_PmQos_GetDefaultLockTime(void) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GetDefaultLockTime", - NULL);; - if (!ret) { + NULL, + &ret);; + if (err < 0) { _E("failed GetDefaultLockTime"); return 0; } @@ -2920,13 +3240,15 @@ gint test_deviced_PmQos_GalleryRotation(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GalleryRotation", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GalleryRotation"); return 0; } @@ -2943,13 +3265,15 @@ gint test_deviced_PmQos_GalleryScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GalleryScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed GalleryScroll"); return 0; } @@ -2966,13 +3290,15 @@ gint test_deviced_PmQos_Emergency(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "Emergency", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed Emergency"); return 0; } @@ -2989,13 +3315,15 @@ gint test_deviced_PmQos_ContactSearch(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ContactSearch", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed ContactSearch"); return 0; } @@ -3012,13 +3340,15 @@ gint test_deviced_PmQos_CameraSoundAndShot(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraSoundAndShot", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CameraSoundAndShot"); return 0; } @@ -3035,13 +3365,15 @@ gint test_deviced_PmQos_CameraRecording(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraRecording", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CameraRecording"); return 0; } @@ -3058,13 +3390,15 @@ gint test_deviced_PmQos_CameraPreview(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraPreview", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CameraPreview"); return 0; } @@ -3081,13 +3415,15 @@ gint test_deviced_PmQos_CameraCaptureAtRec(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraCaptureAtRec", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CameraCaptureAtRec"); return 0; } @@ -3104,13 +3440,15 @@ gint test_deviced_PmQos_CameraBurstShot(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraBurstShot", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CameraBurstShot"); return 0; } @@ -3127,13 +3465,15 @@ gint test_deviced_PmQos_CallSound(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CallSound", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed CallSound"); return 0; } @@ -3150,13 +3490,15 @@ gint test_deviced_PmQos_BrowserScroll(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserScroll", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed BrowserScroll"); return 0; } @@ -3173,13 +3515,15 @@ gint test_deviced_PmQos_BrowserLoading(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserLoading", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed BrowserLoading"); return 0; } @@ -3196,13 +3540,15 @@ gint test_deviced_PmQos_BrowserJavaScript(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserJavaScript", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed BrowserJavaScript"); return 0; } @@ -3219,13 +3565,15 @@ gint test_deviced_PmQos_BrowserDash(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserDash", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed BrowserDash"); return 0; } @@ -3242,13 +3590,15 @@ gint test_deviced_PmQos_Browser(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "Browser", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed Browser"); return 0; } @@ -3265,13 +3615,15 @@ gint test_deviced_PmQos_BeautyShot(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BeautyShot", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed BeautyShot"); return 0; } @@ -3288,13 +3640,15 @@ gint test_deviced_PmQos_AppLaunchHome(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "AppLaunchHome", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed AppLaunchHome"); return 0; } @@ -3311,13 +3665,15 @@ gint test_deviced_PmQos_AppLaunch(gint param1) { gint val1; GVariant *ret; + int err; - ret = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "AppLaunch", - g_variant_new("(i)", param1));; - if (!ret) { + g_variant_new("(i)", param1), + &ret);; + if (err < 0) { _E("failed AppLaunch"); return 0; } diff --git a/src/auto-test/time.c b/src/auto-test/time.c index 5b9daae..04cba10 100755 --- a/src/auto-test/time.c +++ b/src/auto-test/time.c @@ -23,15 +23,16 @@ static bool request_sysnoti_method(const char *method, GVariant *param) { GVariant *msg; - int val; + int val, err; bool ret = FALSE; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, method, - param); - if (!msg) { + param, + &msg); + if (err < 0) { _E("fail (%s): no reply", method); return ret; } diff --git a/src/auto-test/udev.c b/src/auto-test/udev.c index cc48c43..8b52c19 100644 --- a/src/auto-test/udev.c +++ b/src/auto-test/udev.c @@ -28,14 +28,15 @@ static const struct device_change_type { static int udev(int index) { GVariant *msg; - int ret = 0, val = 0; + int ret = 0, val = 0, err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", - g_variant_new("(sis)", "udev", 1, device_change_types[index].status)); - if (!msg) { + g_variant_new("(sis)", "udev", 1, device_change_types[index].status), + &msg); + if (err < 0) { _E("fail : %s %s %s %s", DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev"); diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index 58f7478..8b1545b 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -224,11 +224,11 @@ static int send_full_noti(enum charge_full_type state) switch (state) { case CHARGING_FULL: for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_with_reply(POPUP_BUS_NAME, + ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_FULL_NOTI_ON, - NULL, NULL, full_noti_cb, -1, NULL); + NULL, full_noti_cb, -1, NULL); if (ret == 0) { _D("Created battery full noti."); return ret; @@ -282,11 +282,11 @@ static int send_charge_noti(void) int retry; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_with_reply(POPUP_BUS_NAME, + ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_CHARGE_NOTI_ON, - NULL, NULL, charge_noti_on, -1, NULL); + NULL, charge_noti_on, -1, NULL); if (ret == 0) { _I("Created battery charge noti."); return ret; diff --git a/src/devicectl/devicectl.c b/src/devicectl/devicectl.c index 8358377..52a99ea 100644 --- a/src/devicectl/devicectl.c +++ b/src/devicectl/devicectl.c @@ -64,18 +64,20 @@ static const struct device { static int start_device(char **args) { GVariant *msg; + int err; if (!args[1]) return -EINVAL; printf("Start %s device.\n", args[1]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "start", - NULL); - if (!msg) + NULL, + &msg); + if (err < 0) return -EBADMSG; g_variant_unref(msg); @@ -86,18 +88,20 @@ static int start_device(char **args) static int stop_device(char **args) { GVariant *msg; + int err; if (!args[1]) return -EINVAL; printf("Stop %s device.\n", args[1]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "stop", - NULL); - if (!msg) + NULL, + &msg); + if (err < 0) return -EBADMSG; g_variant_unref(msg); @@ -109,6 +113,7 @@ static int dump_mode(char **args) { GVariant *msg; int ret = -EBADMSG; + int err; if (!args[1] || !args[2] || !args[3]) { ret = -EINVAL; @@ -117,12 +122,13 @@ static int dump_mode(char **args) printf("%s (%s %s).\n", args[1], args[2], args[3]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "Dumpmode", - g_variant_new("(s)", args[3])); - if (!msg) { + g_variant_new("(s)", args[3]), + &msg); + if (err < 0) { printf("Failed to set dump mode"); ret = -EBADMSG; goto out; @@ -143,6 +149,7 @@ static int display_state(char **args) { GVariant *msg; int ret = -EBADMSG; + int err; if (!args[1] || !args[2] || !args[3]) { ret = -EINVAL; @@ -151,13 +158,14 @@ static int display_state(char **args) printf("%s (%s %s)!\n", args[1], args[2], args[3]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "changestate", - g_variant_new("(s)", args[3])); + g_variant_new("(s)", args[3]), + &msg); - if (!msg) { + if (err < 0) { printf("Failed to set display state"); ret = -EBADMSG; goto out; @@ -177,18 +185,20 @@ out: static int save_log(char **args) { GVariant *msg; + int err; if (!args[1]) return -EINVAL; printf("Save log %s device.\n", args[1]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "SaveLog", - NULL); - if (!msg) { + NULL, + &msg); + if (err < 0) { printf("Failed to save log"); return -EBADMSG; } @@ -226,18 +236,20 @@ static int save_dbus_name(char **args) char *str; pid_t pid; char pname[PATH_MAX]; + int err; if (!args[1]) return -EINVAL; printf("Save dbus name.\n"); - msg = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME, DBUS_OBJECT_PATH, DBUS_INTERFACE_NAME, "ListNames", - NULL); - if (!msg) { + NULL, + &msg); + if (err < 0) { printf("Failed to get list names."); return -EBADMSG; } @@ -265,18 +277,20 @@ static int save_dbus_name(char **args) static int device_list(char **args) { GVariant *msg; + int err; if (!args[1]) return -EINVAL; printf("Print %s to dlog.\n", args[1]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "DeviceList", - NULL); - if (!msg) + NULL, + &msg); + if (err < 0) return -EBADMSG; g_variant_unref(msg); @@ -298,6 +312,7 @@ static int enable_device(char **args) { GVariant *msg; int ret = -EBADMSG; + int err; if (!args[3]) { ret = -EINVAL; @@ -306,12 +321,13 @@ static int enable_device(char **args) printf("Enable %s device.\n", args[3]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "enable", - g_variant_new("(s)", args[3])); - if (!msg) { + g_variant_new("(s)", args[3]), + &msg); + if (err < 0) { ret = -EBADMSG; goto out; } @@ -331,6 +347,7 @@ static int disable_device(char **args) { GVariant *msg; int ret = -EBADMSG; + int err; if (!args[3]) { ret = -EINVAL; @@ -339,12 +356,13 @@ static int disable_device(char **args) printf("Disable %s device.\n", args[3]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "disable", - g_variant_new("(s)", args[3])); - if (!msg) { + g_variant_new("(s)", args[3]), + &msg); + if (err < 0) { ret = -EBADMSG; goto out; } @@ -364,6 +382,7 @@ static int power_operation(char **args, char *type) { GVariant *msg; int ret = -EBADMSG; + int err; if (!args[1] || !type) { ret = -EINVAL; @@ -372,12 +391,13 @@ static int power_operation(char **args, char *type) printf("Power %s device.\n", args[2]); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "PowerOff", - g_variant_new("(s)", type)); - if (!msg) { + g_variant_new("(s)", type), + &msg); + if (err < 0) { ret = -EBADMSG; goto out; } diff --git a/src/display/display-lock.c b/src/display/display-lock.c index 2771fb5..60b093a 100644 --- a/src/display/display-lock.c +++ b/src/display/display-lock.c @@ -123,8 +123,7 @@ out: static gboolean default_pmlock_check(void *data) { - const char *arr[2]; - char chr_pid[PID_MAX]; + char *str; PmLockNode *node; enum state_t state; pid_t pid; @@ -159,28 +158,27 @@ static gboolean default_pmlock_check(void *data) return G_SOURCE_CONTINUE; } - snprintf(chr_pid, sizeof(chr_pid), "%d", pid); - arr[0] = chr_pid; switch (state) { case S_NORMAL: - arr[1] = "normal"; + str = "normal"; break; case S_LCDDIM: - arr[1] = "lcddim"; + str = "lcddim"; break; case S_LCDOFF: - arr[1] = "lcdoff"; + str = "lcdoff"; break; default: _E("Invalid state."); return G_SOURCE_REMOVE; } - ret = dbus_handle_method_async_with_reply(RESOURCED_BUS_NAME, + ret = dbus_handle_method_async_with_reply_var(RESOURCED_BUS_NAME, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, METHOD_APP_STATUS, - "is", arr, default_pmlock_check_cb, -1, (void *)(intptr_t)state); + g_variant_new("(is)", pid, str), + default_pmlock_check_cb, -1, (void *)(intptr_t)state); if (ret < 0) _E("Failed to call dbus method"); diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c index eb5ca06..27db29a 100644 --- a/src/extcon/extcon.c +++ b/src/extcon/extcon.c @@ -98,6 +98,7 @@ static int extcon_update(const char *name, const char *index, const char *value) char buf[BUF_MAX]; int status; int ret = 0; + int val; if (!name || !value) return -EINVAL; @@ -123,10 +124,13 @@ static int extcon_update(const char *name, const char *index, const char *value) DEVICEMANAGER_PATH_POPUP, DEVICEMANAGER_INTERFACE_POPUP, METHOD_SYSPOPUP_SHOW, - g_variant_new("(s)", buf)); - if (ret < 0) + g_variant_new("(s)", buf), + &val); + if (ret < 0){ _E("Failed to launch USB restricted popup: %d", ret); - return ret; + return ret; + } + return val; } else return 0; } @@ -183,7 +187,7 @@ int extcon_disable_device(const char *name) DEVICEMANAGER_PATH_POPUP, DEVICEMANAGER_INTERFACE_POPUP, METHOD_SYSPOPUP_SHOW, - g_variant_new("(s)", buf)); + g_variant_new("(s)", buf), NULL); if (ret < 0) _E("Failed to launch USB restricted popup: %d", ret); diff --git a/src/led/noti.c b/src/led/noti.c index faa5b04..796c9a0 100644 --- a/src/led/noti.c +++ b/src/led/noti.c @@ -30,40 +30,47 @@ static int noti_h; int ongoing_show(void) { - int ret_val; - + int ret_val, result; if (noti_h > 0) { _D("Already ongoing noti show handle(%d).", noti_h); return 0; } - ret_val = dbus_handle_method_sync(POPUP_BUS_NAME, + result = dbus_handle_method_sync_var(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_TORCH_NOTI_ON, - NULL, NULL); + NULL, + &ret_val); + + if (result < 0) + return result; noti_h = ret_val; _D("Insert noti handle(%d).", noti_h); - return (ret_val < 0) ? ret_val : 0; + return 0; } int ongoing_clear(void) { - int ret_val; - + int ret_val, result; if (noti_h <= 0) { _D("Already ongoing noti clear."); return 0; } - ret_val = dbus_handle_method_sync_var(POPUP_BUS_NAME, + result = dbus_handle_method_sync_var(POPUP_BUS_NAME, POPUP_PATH_LED, POPUP_INTERFACE_LED, METHOD_TORCH_NOTI_OFF, - g_variant_new("(i)", noti_h)); + g_variant_new("(i)", noti_h), + &ret_val); + + if (result < 0) + return result; _D("Delete noti handle(%d).", noti_h); noti_h = 0; + return ret_val; } diff --git a/src/libdeviced/deviced-noti.c b/src/libdeviced/deviced-noti.c index 7fbbd7e..c5e0aa0 100644 --- a/src/libdeviced/deviced-noti.c +++ b/src/libdeviced/deviced-noti.c @@ -57,14 +57,15 @@ static int dbus_proc_handler(char* type, char *buf) { GVariant *msg; - int val; + int val, err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_PROCESS, DEVICED_INTERFACE_PROCESS, type, - g_variant_new("(sis)", type, 1, buf)); - if (!msg) + g_variant_new("(sis)", type, 1, buf), + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &val)) { @@ -111,14 +112,15 @@ API int deviced_inform_inactive(pid_t pid) static int dbus_power_handler(char* type) { GVariant *msg; - int val; + int val, err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", - g_variant_new("(s)", type)); - if (!msg) + g_variant_new("(s)", type), + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &val)) { @@ -150,19 +152,20 @@ static int dbus_time_handler(char* type, char* buf) GVariant *msg; pid_t pid; char name[PATH_MAX]; - int ret, val; + int ret, val, err; pid = getpid(); ret = deviced_get_cmdline_name(pid, name, sizeof(name)); if (ret != 0) snprintf(name, sizeof(name), "%d", pid); - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, type, - g_variant_new("(sis)", type, 1, buf)); - if (!msg) + g_variant_new("(sis)", type, 1, buf), + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &val)) { @@ -183,7 +186,7 @@ static int alarm_set_time(time_t timet) GVariant *msg; pid_t pid; char name[PATH_MAX]; - int ret, val; + int ret, val, err; pid = getpid(); ret = deviced_get_cmdline_name(pid, name, sizeof(name)); @@ -191,12 +194,13 @@ static int alarm_set_time(time_t timet) snprintf(name, sizeof(name), "%d", pid); _SI("[%s]start %s %ld.", name, ALARM_INTERFACE_NAME, timet); - msg = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME, ALARM_PATH_NAME, ALARM_INTERFACE_NAME, ALARM_SET_TIME_METHOD, - g_variant_new("(i)", timet)); - if (!msg) { + g_variant_new("(i)", timet), + &msg); + if (err < 0) { _E("Failed to call dbus_message_new_method_call(%s:%s-%s).", ALARM_PATH_NAME, ALARM_INTERFACE_NAME, ALARM_SET_TIME_METHOD); return -EBADMSG; @@ -233,14 +237,15 @@ API int deviced_set_timezone(char *tzpath_str) static int dbus_cpu_handler(char* type, char* buf_pid, char* buf_freq) { GVariant *msg; - int val; + int val, err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, type, - g_variant_new("(siss)", type, 2, buf_pid, buf_freq)); - if (!msg) + g_variant_new("(siss)", type, 2, buf_pid, buf_freq), + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &val)) { diff --git a/src/libdeviced/display.c b/src/libdeviced/display.c index 3247822..6cb37d6 100644 --- a/src/libdeviced/display.c +++ b/src/libdeviced/display.c @@ -61,18 +61,18 @@ API int display_get_max_brightness(void) { - int ret; + int ret, val; ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_GET_MAX_BRIGHTNESS, - g_variant_new("(i)", DISPLAY_STATE_NORMAL)); + g_variant_new("(i)", DISPLAY_STATE_NORMAL), &val); if (ret < 0) return DISPLAY_MAX_BRIGHTNESS; - _D("Get max brightness: %d", ret); - return ret; + _D("Get max brightness: %d", val); + return val; } API int display_set_brightness_with_setting(int val) diff --git a/src/libdeviced/led.c b/src/libdeviced/led.c index af43c64..7a0d24c 100644 --- a/src/libdeviced/led.c +++ b/src/libdeviced/led.c @@ -34,13 +34,15 @@ API int led_get_brightness(void) { GVariant *msg = NULL; int ret_val = 0; + int err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_GET_BRIGHTNESS, - NULL); - if (!msg) + NULL, + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &ret_val)) { @@ -56,14 +58,15 @@ API int led_get_brightness(void) API int led_get_max_brightness(void) { GVariant *msg = NULL; - int ret_val; + int ret_val, err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_GET_MAX_BRIGHTNESS, - NULL); - if (!msg) + NULL, + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &ret_val)) { @@ -79,14 +82,15 @@ API int led_get_max_brightness(void) API int led_set_brightness_with_noti(int val, bool enable) { GVariant *msg = NULL; - int ret_val; + int ret_val, err; - msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_SET_BRIGHTNESS, - g_variant_new("(ii)", val, enable)); - if (!msg) + g_variant_new("(ii)", val, enable), + &msg); + if (err < 0) return -EBADMSG; if (!g_variant_get_safe(msg, "(i)", &ret_val)) { diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c index 5696e8f..8a6d5a2 100644 --- a/src/libdeviced/usbhost.c +++ b/src/libdeviced/usbhost.c @@ -204,11 +204,16 @@ API void deinit_usbhost_signal(void) API int request_usb_storage_info(void) { - return dbus_handle_method_sync(DEVICED_BUS_NAME, + int ret, err; + err = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_INFO_ALL, - NULL, NULL); + NULL, + &ret); + if(err < 0) + return err; + return ret; } API int register_usb_storage_change_handler( @@ -301,38 +306,56 @@ API int unregister_usb_device_change_handler( API int mount_usb_storage(char *path) { + int ret, val; + if (!path) return -1; - return dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_MOUNT, - g_variant_new("(s)", path)); + g_variant_new("(s)", path), &val); + + if (ret < 0) + return ret; + return val; } API int unmount_usb_storage(char *path) { + int ret, val; + if (!path) return -1; - return dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_UNMOUNT, - g_variant_new("(s)", path)); + g_variant_new("(s)", path), &val); + + if (ret < 0) + return ret; + return val; } API int format_usb_storage(char *path) { + int ret, val; + if (!path) return -1; - return dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_FORMAT, - g_variant_new("(s)", path)); + g_variant_new("(s)", path), &val); + + if (ret < 0) + return ret; + return val; } API int open_usb_device(char *path, int *out_fd) @@ -345,16 +368,17 @@ API int open_usb_device(char *path, int *out_fd) if (!out_fd || !path) return -EINVAL; - reply = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME, + ret = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_OPEN_DEVICE, g_variant_new("(s)", path), + &reply, NULL, 0, &fdlist, &size); - if (!reply) { + if (ret < 0) { _E("Unable to open USB device."); return -1; } diff --git a/src/power-command/command.c b/src/power-command/command.c index 629a1fc..443756d 100644 --- a/src/power-command/command.c +++ b/src/power-command/command.c @@ -285,14 +285,12 @@ struct parse_result parse_reboot_et_al(enum application application, int argc, c int call_deviced_poweroff(const char *type, const char *extra_option, const char *message) { - const char *command[2] = { type, extra_option }; - int ret = extra_option - ? dbus_handle_method_sync(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", "ss", command) - : dbus_handle_method_sync(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", "s", command) + int result = extra_option + ? dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL) + : dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL) ; - if (ret != 0) { - errno = -ret; - fprintf(stderr, "Error: %m"); + if (result < 0) { + fprintf(stderr, "Error: %d", result); return EXIT_FAILURE; } diff --git a/src/power/power-control.c b/src/power/power-control.c index 2019b69..c5abfd1 100644 --- a/src/power/power-control.c +++ b/src/power/power-control.c @@ -146,8 +146,6 @@ static int vital_mode_support(void) int suspend_other_process(int type) { int ret = 0; - char buf[8]; - const char *command[1]; if (vital_service == type) return ret; @@ -161,32 +159,26 @@ int suspend_other_process(int type) return ret; if (type == VITAL_SLEEP) { - snprintf(buf, sizeof(buf), "%s", "sleep"); - command[0] = buf; - dbus_handle_method_sync_timeout(RESOURCED_BUS_NAME, + dbus_handle_method_sync_with_reply_var_timeout(RESOURCED_BUS_NAME, RESOURCED_PATH_FREEZER, RESOURCED_INTERFACE_FREEZER, "SetSuspend", - "s", - command, + g_variant_new("(s)", "sleep"), + NULL, SET_SUSPEND_TIME*1000); vital_sleep = true; } else if (type == VITAL_WAKEUP) { - snprintf(buf, sizeof(buf), "%s", "wakeup"); - command[0] = buf; - ret = dbus_handle_method_async(RESOURCED_BUS_NAME, + ret = dbus_handle_method_async_var(RESOURCED_BUS_NAME, RESOURCED_PATH_FREEZER, RESOURCED_INTERFACE_FREEZER, "SetSuspend", - "s", command); + g_variant_new("(s)", "wakeup")); } else if (type == VITAL_EXIT) { - snprintf(buf, sizeof(buf), "%s", "exit"); - command[0] = buf; - ret = dbus_handle_method_async(RESOURCED_BUS_NAME, + ret = dbus_handle_method_async_var(RESOURCED_BUS_NAME, RESOURCED_PATH_FREEZER, RESOURCED_INTERFACE_FREEZER, "SetSuspend", - "s", command); + g_variant_new("(s)", "exit")); vital_sleep = false; } return ret; diff --git a/src/power/power-handler.c b/src/power/power-handler.c index bef828e..58a8807 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -123,7 +123,7 @@ static void poweroff_start_animation(void) static void poweroff_notify_resourced(void) { _I("Request to stop systemd service to resourced."); - dbus_handle_method_sync_timeout(RESOURCED_BUS_NAME, + dbus_handle_method_sync_with_reply_var_timeout(RESOURCED_BUS_NAME, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, "PrePoweroff", @@ -194,7 +194,7 @@ void poweroff_request_shutdown(void) } CRITICAL_LOG("Requested %s via systemd.", method); - dbus_handle_method_sync_timeout(SYSTEMD_DBUS_DEST, + dbus_handle_method_sync_with_reply_var_timeout(SYSTEMD_DBUS_DEST, SYSTEMD_DBUS_PATH, SYSTEMD_DBUS_IFACE_MANAGER, method, diff --git a/src/usb/usb-state.c b/src/usb/usb-state.c index 1c6ea74..df86bb3 100644 --- a/src/usb/usb-state.c +++ b/src/usb/usb-state.c @@ -276,7 +276,7 @@ static void add_notification_handler(void) int ret; if (noti_id < 0) { - ret = add_async_notification("MediaDeviceNotiOn", media_noti_cb, NULL, NULL); + ret = add_async_notification("MediaDeviceNotiOn", media_noti_cb, NULL); if (ret < 0) _E("Failed to add USB notification for usb connection: %d", ret); } -- 2.7.4 From e31e56d116c2eb295f7e61cebb281e3a3a712d9b Mon Sep 17 00:00:00 2001 From: "taemin.yeom" Date: Mon, 15 Mar 2021 14:09:50 +0900 Subject: [PATCH 14/16] Improve variable naming style Change-Id: I9453e7a28fb47e08bc6795c4a99cc2adfc7fc5c0 Signed-off-by: taemin.yeom --- src/auto-test/battery.c | 182 ++-- src/auto-test/brightness.c | 38 +- src/auto-test/display.c | 86 +- src/auto-test/extcon.c | 72 +- src/auto-test/ir.c | 52 +- src/auto-test/led.c | 12 +- src/auto-test/power.c | 24 +- src/auto-test/proc.c | 24 +- src/auto-test/test_dbus_interface.c | 2058 +++++++++++++++++------------------ src/auto-test/time.c | 24 +- src/auto-test/udev.c | 26 +- src/battery/power-supply.c | 92 +- src/devicectl/devicectl.c | 144 +-- src/extcon/extcon.c | 70 +- src/led/noti.c | 24 +- src/libdeviced/deviced-noti.c | 118 +- src/libdeviced/display.c | 12 +- src/libdeviced/led.c | 62 +- src/libdeviced/usbhost.c | 62 +- src/power-command/command.c | 6 +- src/power/power-control.c | 34 +- src/power/power-handler.c | 60 +- src/usb/usb-state.c | 16 +- 23 files changed, 1649 insertions(+), 1649 deletions(-) diff --git a/src/auto-test/battery.c b/src/auto-test/battery.c index dca16ed..cf8c138 100644 --- a/src/auto-test/battery.c +++ b/src/auto-test/battery.c @@ -221,22 +221,22 @@ static struct power_supply_type { static bool get_battery_method(const char *method, int *value) { - GVariant *msg = NULL; - int val = 0, err; + GVariant *reply = NULL; + int reply_val = 0, ret_dbus; char* health = NULL; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - method, NULL, &msg); - if (err < 0) { + method, NULL, &reply); + if (ret_dbus < 0) { _E("Failed to call dbus method(%s): No reply.", method); return ret; } if (!strncmp(method, METHOD_BATTERY_HEALTH, strlen(METHOD_BATTERY_HEALTH))) { - if (!g_variant_get_safe(msg, "(s)", &health)) { + if (!g_variant_get_safe(reply, "(s)", &health)) { _E("Failed to call dbus method(%s): No message.", METHOD_BATTERY_HEALTH); } else { _I("Success. %s=%s", METHOD_BATTERY_HEALTH, health); @@ -245,50 +245,50 @@ static bool get_battery_method(const char *method, int *value) } else { - if (!g_variant_get_safe(msg, "(i)", &val)) { + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { _E("Failed to call dbus method(%s): No message.", method); } else { - _I("Success. %s=%d", method, val); + _I("Success. %s=%d", method, reply_val); ret = TRUE; if (NULL != value) - *value = val; + *value = reply_val; } } if (health) g_free(health); - g_variant_unref(msg); + g_variant_unref(reply); return ret; } static bool get_battery_method_vconf(const char *method) { - GVariant *msg = NULL; - int val, err; + GVariant *reply = NULL; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - method, NULL, &msg); - if (err < 0) { + method, NULL, &reply); + if (ret_dbus < 0) { _E("Failed to call dbus method(%s): No reply.", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("Failed to call dbus method(%s): No message.", method); else { - if (val == -EIO) { + if (reply_val == -EIO) { _E("Failed to call dbus method(%s): Return fail.", method); } else { - _I("Success. %s=%d", method, val); + _I("Success. %s=%d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } @@ -309,29 +309,29 @@ static bool get_battery_low_level(int *value) static bool set_battery_low_level(int newlevel) { - GVariant *msg; + GVariant *reply; int getlevel = -1; - int val = -1; - int err; + int reply_val = -1; + int ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, METHOD_BATTERY_SETLOWBATLEVEL, g_variant_new("(i)", newlevel), - &msg); + &reply); - if (err < 0) { + if (ret_dbus < 0) { _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_SETLOWBATLEVEL); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) { + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_SETLOWBATLEVEL); goto out; } else { if (newlevel <= DEFAULT_WARNING) { - if (0 != val) { + if (0 != reply_val) { _I("Success. Can't set low level(%d) smaller than default(%d).", newlevel, DEFAULT_WARNING); ret = TRUE; } else { @@ -339,7 +339,7 @@ static bool set_battery_low_level(int newlevel) } goto out; } else { - if (0 != val) { + if (0 != reply_val) { _E("Failed to call dbus method(%s): Return fail.", METHOD_BATTERY_SETLOWBATLEVEL); goto out; } @@ -357,7 +357,7 @@ static bool set_battery_low_level(int newlevel) } } out: - g_variant_unref(msg); + g_variant_unref(reply); return ret; } @@ -398,50 +398,50 @@ static bool get_battery_health() static bool get_battery_info() { - GVariant *msg; - int val[9]; - int err; + GVariant *reply; + int reply_val[9]; + int ret_dbus; bool ret = FALSE; - char *argv[3]; + char *reply_argv[3]; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - METHOD_BATTERY_GETINFO, NULL, &msg); - if (err < 0) { + METHOD_BATTERY_GETINFO, NULL, &reply); + if (ret_dbus < 0) { _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_GETINFO); return ret; } - if (!g_variant_get_safe(msg, "(isssiiiiiiii)", &val[0], //return value - &argv[0],//status - &argv[1],//health - &argv[2],//power source - &val[1], //online - &val[2], //present - &val[3], //capacity - &val[4], //current_now - &val[5], //current_average - &val[6], //voltage_now - &val[7], //voltage_average - &val[8])) //temperature + if (!g_variant_get_safe(reply, "(isssiiiiiiii)", &reply_val[0], //return value + &reply_argv[0],//status + &reply_argv[1],//health + &reply_argv[2],//power source + &reply_val[1], //online + &reply_val[2], //present + &reply_val[3], //capacity + &reply_val[4], //current_now + &reply_val[5], //current_average + &reply_val[6], //voltage_now + &reply_val[7], //voltage_average + &reply_val[8])) //temperature _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_GETINFO); else { - if (val[0] < 0) { + if (reply_val[0] < 0) { _E("Failed to call dbus method(%s): Return fail", METHOD_BATTERY_GETINFO); } else { _I("Success: %s %s %s %d %d %d %d %d %d %d %d", - argv[0], argv[1], argv[2], val[1], val[2], - val[3], val[4], val[5], val[6], val[7], - val[8]); + reply_argv[0], reply_argv[1], reply_argv[2], reply_val[1], reply_val[2], + reply_val[3], reply_val[4], reply_val[5], reply_val[6], reply_val[7], + reply_val[8]); ret = TRUE; } - g_free(argv[0]); - g_free(argv[1]); - g_free(argv[2]); + g_free(reply_argv[0]); + g_free(reply_argv[1]); + g_free(reply_argv[2]); } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } @@ -669,8 +669,8 @@ static bool compare_power_supply(struct power_supply_type list, int value[], con static bool set_battery_power_supply(int index) { - GVariant *msg, *var; - int val, err; + GVariant *reply, *var; + int reply_val, ret_dbus; bool ret = FALSE; var = g_variant_new("(sisssssssssssss)", POWER_SUBSYSTEM, @@ -703,74 +703,74 @@ static bool set_battery_power_supply(int index) power_supply_types[index].current_avg, power_supply_types[index].temperature); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - POWER_SUBSYSTEM, var, &msg); - if (err < 0) { + POWER_SUBSYSTEM, var, &reply); + if (ret_dbus < 0) { _E("Failed to call dbus method(%s): No reply", POWER_SUBSYSTEM); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) { + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { _E("Failed to call dbus method(%s): No message", POWER_SUBSYSTEM); - val = -EBADMSG; + reply_val = -EBADMSG; } else { - if (val < 0) { - _E("Failed to call dbus method(%s): Return fail(%d)", POWER_SUBSYSTEM, val); + if (reply_val < 0) { + _E("Failed to call dbus method(%s): Return fail(%d)", POWER_SUBSYSTEM, reply_val); } else { - _I("Success. val=%d", val); + _I("Success. val=%d", reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); sleep(TEST_WAIT_TIME_INTERVAL); return ret; } -static bool get_battery_power_supply(int rsp[], char **power_source) +static bool get_battery_power_supply(int out_rsp[], char **out_power_source) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, - METHOD_BATTERY_GET_POWERSUPPLY, NULL, &msg); - if (err < 0) { + METHOD_BATTERY_GET_POWERSUPPLY, NULL, &reply); + if (ret_dbus < 0) { _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_GET_POWERSUPPLY); return ret; } - if (!g_variant_get_safe(msg, "(iiiiiiiisiiiii)", &val, //return value - &rsp[0], //capacity - &rsp[1], //charge_status - &rsp[2], //health - &rsp[3], //online - &rsp[4], //present - &rsp[5], //misc - &rsp[6], //freq_strength - power_source, //power_source - &rsp[7], //voltage_now - &rsp[8], //voltagge_avg - &rsp[9], //current_now - &rsp[10], //current_avg - &rsp[11])) { //temperature + if (!g_variant_get_safe(reply, "(iiiiiiiisiiiii)", &reply_val, //return value + &out_rsp[0], //capacity + &out_rsp[1], //charge_status + &out_rsp[2], //health + &out_rsp[3], //online + &out_rsp[4], //present + &out_rsp[5], //misc + &out_rsp[6], //freq_strength + out_power_source, //power_source + &out_rsp[7], //voltage_now + &out_rsp[8], //voltagge_avg + &out_rsp[9], //current_now + &out_rsp[10], //current_avg + &out_rsp[11])) { //temperature _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_GET_POWERSUPPLY); } else { - if (val < 0) { - _E("Failed to call dbus method(%s): Return fail(%d)", METHOD_BATTERY_GET_POWERSUPPLY, val); + if (reply_val < 0) { + _E("Failed to call dbus method(%s): Return fail(%d)", METHOD_BATTERY_GET_POWERSUPPLY, reply_val); } else { _I("Success : C(%d) S(%d) H(%d) O(%d) P(%d) M(%d) F(%d) SRC(%s) Vol(%d %d) Cur(%d %d) Temp(%d)", - rsp[0], rsp[1], rsp[2], rsp[3], rsp[4], rsp[5], rsp[6], *power_source, rsp[7], rsp[8], rsp[9], rsp[10], rsp[11]); + out_rsp[0], out_rsp[1], out_rsp[2], out_rsp[3], out_rsp[4], out_rsp[5], out_rsp[6], *out_power_source, out_rsp[7], out_rsp[8], out_rsp[9], out_rsp[10], out_rsp[11]); ret = true; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } diff --git a/src/auto-test/brightness.c b/src/auto-test/brightness.c index 5ed65a1..28e559d 100644 --- a/src/auto-test/brightness.c +++ b/src/auto-test/brightness.c @@ -44,12 +44,12 @@ static void stop_udev(void) static int call_display_method_sync(const char *method, GVariant *param) { - int err; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + int ret_dbus; + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, method, param, NULL); - if (err < 0) { + if (ret_dbus < 0) { _E("Failed to %s.", method); return -1; } @@ -59,33 +59,33 @@ static int call_display_method_sync(const char *method, GVariant *param) static void check_result(int expect_default, int expect_current) { - int err; - int result_default; - int result_current; + int ret_dbus; + int reply_default; + int reply_current; bool match_default; bool match_current; - GVariant *msg; + GVariant *reply; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - "GetBrightnessInfo", NULL, &msg); - if (err < 0) { + "GetBrightnessInfo", NULL, &reply); + if (ret_dbus < 0) { _E("Failed to GetBrightnessInfo."); return; } - if (!g_variant_get_safe(msg, "(ii)", &result_default, &result_current)) { + if (!g_variant_get_safe(reply, "(ii)", &reply_default, &reply_current)) { _D("Return type mismatching from GetBrightnessInfo."); return; } - match_default = expect_default == result_default; - match_current = expect_current == result_current; + match_default = expect_default == reply_default; + match_current = expect_current == reply_current; printf("%6d %6d %c | %6d %6d %c\n", - expect_default, result_default, match_default ? ' ' : 'X', - expect_current, result_current, match_current ? ' ' : 'X'); + expect_default, reply_default, match_default ? ' ' : 'X', + expect_current, reply_current, match_current ? ' ' : 'X'); tc_success &= (match_default && match_current); } @@ -316,10 +316,10 @@ static void do_test(const char *tcname) { int i; int timeout; - int ret = -1; + int ret_val = -1; - ret = vconf_get_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, &timeout); - if (ret == 0) { + ret_val = vconf_get_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, &timeout); + if (ret_val == 0) { if (vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 300) < 0) printf("Failed to set LCDNORMAL timeout, %d.\n", vconf_get_ext_errno()); } @@ -350,7 +350,7 @@ static void do_test(const char *tcname) printf("Success: %d, Fail: %d\n", success, fail); start_udev(); - if (ret == 0) { + if (ret_val == 0) { if (vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, timeout) < 0) printf("Failed to restore LCDNORMAL timeout, %d.\n", vconf_get_ext_errno()); } diff --git a/src/auto-test/display.c b/src/auto-test/display.c index 2995ce9..9a9c5d4 100644 --- a/src/auto-test/display.c +++ b/src/auto-test/display.c @@ -54,81 +54,81 @@ #define PM_STATE_LOG_FILE "/var/log/pm_state.log" #define PALM_STR "palm" -static bool get_display_method(const char *method, GVariant *param, int *value) +static bool get_display_method(const char *method, GVariant *param, int *out_value) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, param, &msg); - if (err < 0) { + method, param, &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; - if (NULL != value) - *value = val; + if (NULL != out_value) + *out_value = reply_val; } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } static bool set_display_method(const char *method, GVariant *param) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, param, &msg); - if (err < 0) { + method, param, &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! (%s): %d", method, val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! (%s): %d", method, reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail (%s): returned fail (%d)", method, val); + } else if (reply_val < 0) { + _E("fail (%s): returned fail (%d)", method, reply_val); } else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } static bool set_display_method_noreply(const char *method, GVariant *var) { - GVariant *msg; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, - method, var, &msg); - if (err < 0) { + method, var, &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return FALSE; } - g_variant_unref(msg); + g_variant_unref(reply); return TRUE; } @@ -154,41 +154,41 @@ static bool get_display_custombrightness() static bool set_display_autobrightness_min(int min) { - GVariant *msg; - int val = 0, err; + GVariant *reply; + int reply_val = 0, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_DISPLAY_SETAUTOBRIGHTNESSMIN, g_variant_new("(i)", min), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail : no reply"); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) { + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { _E("fail : no message"); } else { if ((min < 1) || (min > 100)) { - if (val < 0) { + if (reply_val < 0) { _I("success : autobrightness min value should be 1~100. can't set (%d).", min); ret = TRUE; } else { _I("fail : can't set (%d). but returned success", min); } } else { - if (val < 0) { - _E("fail : return fail (%d)", val); + if (reply_val < 0) { + _E("fail : return fail (%d)", reply_val); } else { - _I("success : %d", val); + _I("success : %d", reply_val); ret = TRUE; } } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } @@ -305,16 +305,16 @@ static bool set_display_powerkey_lcdoff() static bool set_display_locktimeout_expired(char *req_id) { DBusMessage *msg; - int val, err; + int val, ret_dbus; char *ret_req_id; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_DISPLAY_LOCKTIMEOUT_EXPIRED, g_variant_new("(s)", req_id), &msg); - if (err < 0) { + if (ret_dbus < 0) { _E("fail: no reply"); return ret; } diff --git a/src/auto-test/extcon.c b/src/auto-test/extcon.c index f4b2f0f..bf8efa9 100644 --- a/src/auto-test/extcon.c +++ b/src/auto-test/extcon.c @@ -26,104 +26,104 @@ static bool request_extcon_method(const char *method, GVariant *param) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_EXTCON, DEVICED_INTERFACE_EXTCON, method, param, - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! (%s): %d", method, val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! (%s): %d", method, reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail (%s): returned fail (%d)", method, val); + } else if (reply_val < 0) { + _E("fail (%s): returned fail (%d)", method, reply_val); } else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } static bool get_sysnoti_method(const char *method) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, - method, NULL, &msg); - if (err < 0) { + method, NULL, &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! (%s): %d", method, val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! (%s): %d", method, reply_val); ret = TRUE; - } else if ((val == -EINVAL) || (val == -ENOENT)) { - _E("fail : returned fail (%d)", val); + } else if ((reply_val == -EINVAL) || (reply_val == -ENOENT)) { + _E("fail : returned fail (%d)", reply_val); } else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } static bool get_extcon_status(char *device_name) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_EXTCON, DEVICED_INTERFACE_EXTCON, METHOD_EXTCON_GETSTATUS, g_variant_new("(s)", device_name), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail : no reply"); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail : no message"); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! : %d", val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! : %d", reply_val); ret = TRUE; - } else if ((val == -EINVAL) || (val == -ENOENT)) { - _E("fail : returned fail (%d)", val); + } else if ((reply_val == -EINVAL) || (reply_val == -ENOENT)) { + _E("fail : returned fail (%d)", reply_val); } else { - _I("success : %d", val); + _I("success : %d", reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } diff --git a/src/auto-test/ir.c b/src/auto-test/ir.c index 06565f6..87d11e0 100644 --- a/src/auto-test/ir.c +++ b/src/auto-test/ir.c @@ -28,8 +28,8 @@ struct dbus_int { static bool request_ir_method(const char *method, const char *sig, int *param) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; GVariant *var = NULL; @@ -42,34 +42,34 @@ static bool request_ir_method(const char *method, const char *sig, int *param) return FALSE; } - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_IR, DEVICED_INTERFACE_IR, method, var, - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! (%s): %d", method, val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! (%s): %d", method, reply_val); ret = TRUE; - } else if (val == -ENODEV) { - _E("fail (%s): device open fail (%d)", method, val); - } else if (val < 0) { - _E("fail (%s): returned fail (%d)", method, val); + } else if (reply_val == -ENODEV) { + _E("fail (%s): device open fail (%d)", method, reply_val); + } else if (reply_val < 0) { + _E("fail (%s): returned fail (%d)", method, reply_val); } else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } @@ -93,36 +93,36 @@ static bool set_ir_transmit(int carrier_frequency, int *pattern, int size) /*legacy command*/ static bool set_ir_command(char *command) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_IR_SETIRCOMMAND, g_variant_new("(s)", command), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail : no reply"); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail : no message"); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! : %d", val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! : %d", reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail : returned fail (%d)", val); + } else if (reply_val < 0) { + _E("fail : returned fail (%d)", reply_val); } else { - _I("success : %d", val); + _I("success : %d", reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } diff --git a/src/auto-test/led.c b/src/auto-test/led.c index 807364a..8a4deae 100755 --- a/src/auto-test/led.c +++ b/src/auto-test/led.c @@ -40,14 +40,14 @@ static unsigned int color[] = {BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE static bool get_led_method(const char *method) { GVariant *msg; - int val, err; + int val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, method, NULL, &msg); - if (err < 0) { + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } @@ -66,14 +66,14 @@ static bool get_led_method(const char *method) static bool set_led_method(const char *method, GVariant *param) { GVariant *msg; - int val, err; + int val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, method, param, &msg); - if (err < 0) { + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } diff --git a/src/auto-test/power.c b/src/auto-test/power.c index 49ebc75..ae4d96a 100644 --- a/src/auto-test/power.c +++ b/src/auto-test/power.c @@ -22,36 +22,36 @@ static bool set_reboot_method(const char *method, GVariant *param) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, method, param, - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! (%s): %d", method, val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! (%s): %d", method, reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail (%s): returned fail (%d)", method, val); + } else if (reply_val < 0) { + _E("fail (%s): returned fail (%d)", method, reply_val); } else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } diff --git a/src/auto-test/proc.c b/src/auto-test/proc.c index 28dfa4c..39dad46 100644 --- a/src/auto-test/proc.c +++ b/src/auto-test/proc.c @@ -22,34 +22,34 @@ static bool get_sysnoti_revision() { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, - METHOD_SYSNOTI_GETREVISION, NULL, &msg); - if (err < 0) { + METHOD_SYSNOTI_GETREVISION, NULL, &reply); + if (ret_dbus < 0) { _E("fail : no reply"); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail : no message"); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! : %d", val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! : %d", reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail : returned fail (%d)", val); + } else if (reply_val < 0) { + _E("fail : returned fail (%d)", reply_val); } else { - _I("success : %d", val); + _I("success : %d", reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } diff --git a/src/auto-test/test_dbus_interface.c b/src/auto-test/test_dbus_interface.c index 62b158f..ffa4e34 100644 --- a/src/auto-test/test_dbus_interface.c +++ b/src/auto-test/test_dbus_interface.c @@ -37,22 +37,22 @@ gint test_deviced_Tzip_IsMounted(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "IsMounted", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed IsMounted"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -62,22 +62,22 @@ gint test_deviced_Tzip_IsMounted(const gchar *param1) gint test_deviced_Tzip_UnmountSync(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "UnmountSync", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed UnmountSync"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -87,22 +87,22 @@ gint test_deviced_Tzip_UnmountSync(const gchar *param1) gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const gchar *param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "MountSync", g_variant_new("(sss)", param1, param2, param3), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed MountSync"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -112,22 +112,22 @@ gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const gint test_deviced_Tzip_Unmount(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "Unmount", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Unmount"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -137,22 +137,22 @@ gint test_deviced_Tzip_Unmount(const gchar *param1) gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gchar *param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "Mount", g_variant_new("(sss)", param1, param2, param3), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Mount"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -165,22 +165,22 @@ gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gch gint test_deviced_ExtCon_disable(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "disable", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed disable"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -190,22 +190,22 @@ gint test_deviced_ExtCon_disable(const gchar *param1) gint test_deviced_ExtCon_enable(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "enable", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed enable"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -215,22 +215,22 @@ gint test_deviced_ExtCon_enable(const gchar *param1) gint test_deviced_ExtCon_GetStatus(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "GetStatus", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetStatus"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -242,18 +242,18 @@ gint test_deviced_ExtCon_GetStatus(const gchar *param1) void test_deviced_UsbHostTest_stop(void) { - int err; - GVariant *ret; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + int ret_dbus; + GVariant *reply; + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/UsbHostTest", "org.tizen.system.deviced.UsbHostTest", "stop", NULL, - &ret);; - if (err < 0) + &reply);; + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -261,18 +261,18 @@ void test_deviced_UsbHostTest_stop(void) void test_deviced_UsbHostTest_start(void) { - int err; - GVariant *ret; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + int ret_dbus; + GVariant *reply; + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/UsbHostTest", "org.tizen.system.deviced.UsbHostTest", "start", NULL, - &ret);; - if (err < 0) + &reply);; + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -284,22 +284,22 @@ void test_deviced_UsbHostTest_start(void) gint test_deviced_lowpower_GetState(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "GetState", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetState"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -309,22 +309,22 @@ gint test_deviced_lowpower_GetState(void) gint test_deviced_lowpower_Stop(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "Stop", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Stop"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -334,22 +334,22 @@ gint test_deviced_lowpower_Stop(void) gint test_deviced_lowpower_Start(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "Start", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Start"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -362,22 +362,22 @@ gint test_deviced_lowpower_Start(void) gint test_deviced_ir_TransmitIR(gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Ir", "org.tizen.system.deviced.ir", "TransmitIR", g_variant_new("(ai)", param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed TransmitIR"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -387,22 +387,22 @@ gint test_deviced_ir_TransmitIR(gint param2) gint test_deviced_ir_IRIsAvailable(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Ir", "org.tizen.system.deviced.ir", "IRIsAvailable", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed IRIsAvailable"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -415,22 +415,22 @@ gint test_deviced_ir_IRIsAvailable(void) gint test_deviced_PowerOff_RemovePowerOffWait(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "RemovePowerOffWait", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed RemovePowerOffWait"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -440,22 +440,22 @@ gint test_deviced_PowerOff_RemovePowerOffWait(void) gint test_deviced_PowerOff_AddPowerOffWait(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "AddPowerOffWait", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed AddPowerOffWait"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -465,22 +465,22 @@ gint test_deviced_PowerOff_AddPowerOffWait(void) gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar *param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "PowerOffWithOption", g_variant_new("(ss)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed PowerOffWithOption"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -490,22 +490,22 @@ gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar * gint test_deviced_PowerOff_PowerOff(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "PowerOff", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed PowerOff"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -518,22 +518,22 @@ gint test_deviced_PowerOff_PowerOff(const gchar *param1) gint test_deviced_Battery_MiscEvent(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "MiscEvent", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed MiscEvent"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -542,16 +542,16 @@ gint test_deviced_Battery_MiscEvent(void) GVariant * test_deviced_Battery_BatteryProperties(void) { - GVariant *ret; - int err; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *reply; + int ret_dbus; + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "BatteryProperties", - NULL, &ret); - if (err < 0) + NULL, &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // ChargerCharging : in i, out i @@ -559,22 +559,22 @@ GVariant * test_deviced_Battery_BatteryProperties(void) gint test_deviced_Battery_ChargerCharging(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerCharging", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ChargerCharging"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -584,22 +584,22 @@ gint test_deviced_Battery_ChargerCharging(gint param1) gint test_deviced_Battery_ChargerType(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerType", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ChargerType"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -608,18 +608,18 @@ gint test_deviced_Battery_ChargerType(void) GVariant * test_deviced_Battery_GetBatteryInfo(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetBatteryInfo", NULL, - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // power_supply : in sissssss, out i @@ -627,22 +627,22 @@ GVariant * test_deviced_Battery_GetBatteryInfo(void) gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const gchar *param3, const gchar *param4, const gchar *param5, const gchar *param6, const gchar *param7, const gchar *param8) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "power_supply", g_variant_new("(sissssss)", param1, param2, param3, param4, param5, param6, param7, param8), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed power_supply"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -652,22 +652,22 @@ gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const g gchar * test_deviced_Battery_GetHealth(void) { gchar *val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetHealth", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetHealth"); return 0; } - g_variant_get(ret, "(s)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(s)", &val1); + g_variant_unref(reply); return val1; } @@ -677,22 +677,22 @@ gchar * test_deviced_Battery_GetHealth(void) gint test_deviced_Battery_IsFull(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "IsFull", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed IsFull"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -702,22 +702,22 @@ gint test_deviced_Battery_IsFull(void) gint test_deviced_Battery_GetPercentRaw(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetPercentRaw", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetPercentRaw"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -727,22 +727,22 @@ gint test_deviced_Battery_GetPercentRaw(void) gint test_deviced_Battery_GetPercent(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetPercent", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetPercent"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -752,22 +752,22 @@ gint test_deviced_Battery_GetPercent(void) gint test_deviced_Battery_BatteryStatusLow(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "BatteryStatusLow", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed BatteryStatusLow"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -777,22 +777,22 @@ gint test_deviced_Battery_BatteryStatusLow(void) gint test_deviced_Battery_ChargeNow(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargeNow", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ChargeNow"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -802,22 +802,22 @@ gint test_deviced_Battery_ChargeNow(void) gint test_deviced_Battery_ChargerStatus(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerStatus", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ChargerStatus"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -827,22 +827,22 @@ gint test_deviced_Battery_ChargerStatus(void) gint test_deviced_Battery_GetLowbatLevel(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetLowbatLevel", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetLowbatLevel"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -852,22 +852,22 @@ gint test_deviced_Battery_GetLowbatLevel(void) gint test_deviced_Battery_SetLowbatLevel(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "SetLowbatLevel", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SetLowbatLevel"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -877,22 +877,22 @@ gint test_deviced_Battery_SetLowbatLevel(gint param1) gint test_deviced_Battery_TimeToEmpty(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "TimeToEmpty", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed TimeToEmpty"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -902,22 +902,22 @@ gint test_deviced_Battery_TimeToEmpty(void) gint test_deviced_Battery_TimeToFull(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "TimeToFull", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed TimeToFull"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -930,22 +930,22 @@ gint test_deviced_Battery_TimeToFull(void) gint test_deviced_temperature_GetTemperature(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Temperature", "org.tizen.system.deviced.temperature", "GetTemperature", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetTemperature"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -957,18 +957,18 @@ gint test_deviced_temperature_GetTemperature(gint param1) GVariant * test_deviced_BatteryMonitor_GetBMData(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/BatteryMonitor", "org.tizen.system.deviced.BatteryMonitor", "GetBMData", NULL, - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // /Org/Tizen/System/DeviceD/Core @@ -978,19 +978,19 @@ GVariant * test_deviced_BatteryMonitor_GetBMData(void) void test_deviced_core_DeviceList(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Core", "org.tizen.system.deviced.core", "DeviceList", NULL, - &ret);; - if (err < 0) + &reply);; + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } // /Org/Tizen/System/DeviceD/Usbhost @@ -1000,18 +1000,18 @@ void test_deviced_core_DeviceList(void) GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "OpenDevice", g_variant_new("(s)", param1), - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // GetDeviceListCount : in i, out i @@ -1019,22 +1019,22 @@ GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1) gint test_deviced_Usbhost_GetDeviceListCount(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "GetDeviceListCount", g_variant_new("(i)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetDeviceListCount"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1043,37 +1043,37 @@ gint test_deviced_Usbhost_GetDeviceListCount(gint param1) GVariant * test_deviced_Usbhost_GetDeviceList(gint param1) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "GetDeviceList", g_variant_new("(i)", param1), - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // PrintPolicy : in , out void test_deviced_Usbhost_PrintPolicy(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "PrintPolicy", NULL, - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -1081,19 +1081,19 @@ void test_deviced_Usbhost_PrintPolicy(void) void test_deviced_Usbhost_PrintDeviceList(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "PrintDeviceList", NULL, - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -1105,22 +1105,22 @@ void test_deviced_Usbhost_PrintDeviceList(void) guint test_deviced_Usb_GetMode(void) { guint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usb", "org.tizen.system.deviced.Usb", "GetMode", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetMode"); return 0; } - g_variant_get(ret, "(u)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(u)", &val1); + g_variant_unref(reply); return val1; } @@ -1130,22 +1130,22 @@ guint test_deviced_Usb_GetMode(void) guint test_deviced_Usb_GetState(void) { guint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usb", "org.tizen.system.deviced.Usb", "GetState", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetState"); return 0; } - g_variant_get(ret, "(u)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(u)", &val1); + g_variant_unref(reply); return val1; } @@ -1158,22 +1158,22 @@ guint test_deviced_Usb_GetState(void) gint test_deviced_SysNoti_GetHDMI(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetHDMI", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetHDMI"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1183,22 +1183,22 @@ gint test_deviced_SysNoti_GetHDMI(void) gint test_deviced_SysNoti_GetCradle(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetCradle", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetCradle"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1208,22 +1208,22 @@ gint test_deviced_SysNoti_GetCradle(void) gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const gchar *param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "set_timezone", g_variant_new("(sis)", param1, param2, param3), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed set_timezone"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1233,22 +1233,22 @@ gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const g gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const gchar *param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "set_datetime", g_variant_new("(sis)", param1, param2, param3), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed set_datetime"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1258,22 +1258,22 @@ gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const g gint test_deviced_SysNoti_GetRevision(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetRevision", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetRevision"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1283,22 +1283,22 @@ gint test_deviced_SysNoti_GetRevision(void) gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "udev", g_variant_new("(sis)", param1, param2, param3), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed udev"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1308,22 +1308,22 @@ gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *pa gint test_deviced_SysNoti_EventStop(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "EventStop", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed EventStop"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1333,22 +1333,22 @@ gint test_deviced_SysNoti_EventStop(void) gint test_deviced_SysNoti_EventStart(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "EventStart", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed EventStart"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1358,22 +1358,22 @@ gint test_deviced_SysNoti_EventStart(void) gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gchar *param3, const gchar *param4) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "getcontrol", g_variant_new("(siss)", param1, param2, param3, param4), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed getcontrol"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1383,22 +1383,22 @@ gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gch gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar *param3, const gchar *param4, const gchar *param5) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "control", g_variant_new("(sisss)", param1, param2, param3, param4, param5), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed control"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1411,22 +1411,22 @@ gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar gint test_deviced_Led_SetIrCommand(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "SetIrCommand", g_variant_new("(s)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed SetIrCommand"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1436,22 +1436,22 @@ gint test_deviced_Led_SetIrCommand(const gchar *param1) gint test_deviced_Led_SetBrightness(gint param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "SetBrightness", g_variant_new("(ii)", param1, param2), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed SetBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1461,22 +1461,22 @@ gint test_deviced_Led_SetBrightness(gint param1, gint param2) gint test_deviced_Led_GetMaxBrightness(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetMaxBrightness", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetMaxBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1486,22 +1486,22 @@ gint test_deviced_Led_GetMaxBrightness(void) gint test_deviced_Led_GetBrightness(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetBrightness", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1511,22 +1511,22 @@ gint test_deviced_Led_GetBrightness(void) gint test_deviced_Led_GetBrightnessForCamera(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetBrightnessForCamera", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed GetBrightnessForCamera"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1539,22 +1539,22 @@ gint test_deviced_Led_GetBrightnessForCamera(void) gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockTimeoutInput", g_variant_new("(si)", param1, param2), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed LockTimeoutInput"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1564,22 +1564,22 @@ gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2) gint test_deviced_display_LockTimeoutExpired(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockTimeoutExpired", g_variant_new("(s)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed LockTimeoutExpired"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1589,22 +1589,22 @@ gint test_deviced_display_LockTimeoutExpired(const gchar *param1) gint test_deviced_display_CurrentBrightness(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CurrentBrightness", g_variant_new("(i)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed CurrentBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1614,22 +1614,22 @@ gint test_deviced_display_CurrentBrightness(gint param1) gint test_deviced_display_CustomBrightness(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomBrightness", NULL, - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed CustomBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1639,22 +1639,22 @@ gint test_deviced_display_CustomBrightness(void) gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ActorControl", g_variant_new("(sii)", param1, param2, param3), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed ActorControl"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1664,22 +1664,22 @@ gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint pa gint test_deviced_display_LCDPanelOffMode(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LCDPanelOffMode", g_variant_new("(i)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed LCDPanelOffMode"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1689,22 +1689,22 @@ gint test_deviced_display_LCDPanelOffMode(gint param1) gint test_deviced_display_StayTouchScreenOff(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "StayTouchScreenOff", g_variant_new("(i)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed StayTouchScreenOff"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1714,22 +1714,22 @@ gint test_deviced_display_StayTouchScreenOff(gint param1) gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, gint param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PlatformLCDControl", g_variant_new("(isi)", param1, param2, param3), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed PlatformLCDControl"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1739,22 +1739,22 @@ gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, g gint test_deviced_display_CustomLCDOff(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomLCDOff", g_variant_new("(s)", param1), - &ret); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("failed CustomLCDOff"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1764,22 +1764,22 @@ gint test_deviced_display_CustomLCDOff(const gchar *param1) gint test_deviced_display_CustomLCDOn(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomLCDOn", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CustomLCDOn"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1789,22 +1789,22 @@ gint test_deviced_display_CustomLCDOn(gint param1) gint test_deviced_display_PowerKeyLCDOff(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PowerKeyLCDOff", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed PowerKeyLCDOff"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1814,22 +1814,22 @@ gint test_deviced_display_PowerKeyLCDOff(void) gint test_deviced_display_PowerKeyIgnore(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PowerKeyIgnore", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed PowerKeyIgnore"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1838,19 +1838,19 @@ gint test_deviced_display_PowerKeyIgnore(gint param1) void test_deviced_display_SaveLog(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SaveLog", NULL, - &ret);; - if (err < 0) + &reply);; + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -1859,22 +1859,22 @@ void test_deviced_display_SaveLog(void) gint test_deviced_display_Dumpmode(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "Dumpmode", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Dumpmode"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1884,22 +1884,22 @@ gint test_deviced_display_Dumpmode(const gchar *param1) gint test_deviced_display_SetRefreshRate(gint param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetRefreshRate", g_variant_new("(ii)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SetRefreshRate"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1909,22 +1909,22 @@ gint test_deviced_display_SetRefreshRate(gint param1, gint param2) gint test_deviced_display_ReleaseBrightness(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ReleaseBrightness", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ReleaseBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1934,22 +1934,22 @@ gint test_deviced_display_ReleaseBrightness(void) gint test_deviced_display_HoldBrightness(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "HoldBrightness", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed HoldBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1959,22 +1959,22 @@ gint test_deviced_display_HoldBrightness(gint param1) gint test_deviced_display_SetBrightness(gint param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetBrightness", g_variant_new("(ii)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SetBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -1984,22 +1984,22 @@ gint test_deviced_display_SetBrightness(gint param1, gint param2) gint test_deviced_display_GetBrightness(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetBrightness", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2009,22 +2009,22 @@ gint test_deviced_display_GetBrightness(gint param1) gint test_deviced_display_SetMaxBrightness(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetMaxBrightness", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SetMaxBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2034,22 +2034,22 @@ gint test_deviced_display_SetMaxBrightness(gint param1) gint test_deviced_display_GetMaxBrightness(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetMaxBrightness", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetMaxBrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2059,22 +2059,22 @@ gint test_deviced_display_GetMaxBrightness(gint param1) gint test_deviced_display_GetDisplayCount(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetDisplayCount", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetDisplayCount"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2084,22 +2084,22 @@ gint test_deviced_display_GetDisplayCount(void) gint test_deviced_display_LockScreenBgOn(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockScreenBgOn", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed LockScreenBgOn"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2109,22 +2109,22 @@ gint test_deviced_display_LockScreenBgOn(const gchar *param1) gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setlcdtimeout", g_variant_new("(iii)", param1, param2, param3), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed setlcdtimeout"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2134,22 +2134,22 @@ gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3) gint test_deviced_display_setautobrightnessmin(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setautobrightnessmin", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed setautobrightnessmin"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2159,22 +2159,22 @@ gint test_deviced_display_setautobrightnessmin(gint param1) gint test_deviced_display_setframerate(gint param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setframerate", g_variant_new("(ii)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed setframerate"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2184,22 +2184,22 @@ gint test_deviced_display_setframerate(gint param1, gint param2) gint test_deviced_display_setbrightness(gint param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setbrightness", g_variant_new("(ii)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed setbrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2209,22 +2209,22 @@ gint test_deviced_display_setbrightness(gint param1, gint param2) gint test_deviced_display_getbrightness(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "getbrightness", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed getbrightness"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2234,22 +2234,22 @@ gint test_deviced_display_getbrightness(gint param1) gint test_deviced_display_ChangeState(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ChangeState", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ChangeState"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2259,22 +2259,22 @@ gint test_deviced_display_ChangeState(const gchar *param1) gint test_deviced_display_changestate(const gchar *param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "changestate", g_variant_new("(s)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed changestate"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2284,22 +2284,22 @@ gint test_deviced_display_changestate(const gchar *param1) gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "unlockstate", g_variant_new("(ss)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed unlockstate"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2309,22 +2309,22 @@ gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2) gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, const gchar *param3, gint param4) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "lockstate", g_variant_new("(sssi)", param1, param2, param3, param4), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed lockstate"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2333,19 +2333,19 @@ gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, co void test_deviced_display_stop(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "stop", NULL, - &ret);; - if (err < 0) + &reply);; + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -2353,19 +2353,19 @@ void test_deviced_display_stop(void) void test_deviced_display_start(void) { - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "start", NULL, - &ret);; - if (err < 0) + &reply);; + if (ret_dbus < 0) return; - if (ret) - g_variant_unref(ret); + if (reply) + g_variant_unref(reply); } @@ -2376,17 +2376,17 @@ void test_deviced_display_start(void) GVariant * test_deviced_Board_GetNum(void) { - GVariant *ret; - int err; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *reply; + int ret_dbus; + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetNum", NULL, - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // GetHWRev : in , out i @@ -2394,22 +2394,22 @@ GVariant * test_deviced_Board_GetNum(void) gint test_deviced_Board_GetHWRev(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetHWRev", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetHWRev"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2418,17 +2418,17 @@ gint test_deviced_Board_GetHWRev(void) GVariant * test_deviced_Board_GetSerial(void) { - GVariant *ret; - int err; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + GVariant *reply; + int ret_dbus; + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetSerial", NULL, - &ret); - if (err < 0) + &reply); + if (ret_dbus < 0) return NULL; - return ret; + return reply; } // /Org/Tizen/System/DeviceD/PmQos @@ -2439,22 +2439,22 @@ GVariant * test_deviced_Board_GetSerial(void) gint test_deviced_PmQos_MyfilesScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MyfilesScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed MyfilesScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2464,22 +2464,22 @@ gint test_deviced_PmQos_MyfilesScroll(gint param1) gint test_deviced_PmQos_CallLogScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CallLogScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CallLogScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2489,22 +2489,22 @@ gint test_deviced_PmQos_CallLogScroll(gint param1) gint test_deviced_PmQos_TizenStoreScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "TizenStoreScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed TizenStoreScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2514,22 +2514,22 @@ gint test_deviced_PmQos_TizenStoreScroll(gint param1) gint test_deviced_PmQos_ContactScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ContactScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ContactScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2539,22 +2539,22 @@ gint test_deviced_PmQos_ContactScroll(gint param1) gint test_deviced_PmQos_EmailScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "EmailScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed EmailScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2564,22 +2564,22 @@ gint test_deviced_PmQos_EmailScroll(gint param1) gint test_deviced_PmQos_VideoScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "VideoScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed VideoScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2589,22 +2589,22 @@ gint test_deviced_PmQos_VideoScroll(gint param1) gint test_deviced_PmQos_FileScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "FileScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed FileScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2614,22 +2614,22 @@ gint test_deviced_PmQos_FileScroll(gint param1) gint test_deviced_PmQos_MusicScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MusicScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed MusicScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2639,22 +2639,22 @@ gint test_deviced_PmQos_MusicScroll(gint param1) gint test_deviced_PmQos_UgLaunch(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "UgLaunch", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed UgLaunch"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2664,22 +2664,22 @@ gint test_deviced_PmQos_UgLaunch(gint param1) gint test_deviced_PmQos_SensorWakeup(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SensorWakeup", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SensorWakeup"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2689,22 +2689,22 @@ gint test_deviced_PmQos_SensorWakeup(gint param1) gint test_deviced_PmQos_WebAppFlick(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebAppFlick", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed WebAppFlick"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2714,22 +2714,22 @@ gint test_deviced_PmQos_WebAppFlick(gint param1) gint test_deviced_PmQos_WebAppDrag(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebAppDrag", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed WebAppDrag"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2739,22 +2739,22 @@ gint test_deviced_PmQos_WebAppDrag(gint param1) gint test_deviced_PmQos_PowerOff(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "PowerOff", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed PowerOff"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2764,22 +2764,22 @@ gint test_deviced_PmQos_PowerOff(gint param1) gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WifiThroughput", g_variant_new("(ii)", param1, param2), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed WifiThroughput"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2789,22 +2789,22 @@ gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2) gint test_deviced_PmQos_WebappLaunch(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebappLaunch", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed WebappLaunch"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2814,22 +2814,22 @@ gint test_deviced_PmQos_WebappLaunch(gint param1) gint test_deviced_PmQos_SVoice(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SVoice", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SVoice"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2839,22 +2839,22 @@ gint test_deviced_PmQos_SVoice(gint param1) gint test_deviced_PmQos_SmemoZoom(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SmemoZoom", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed SmemoZoom"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2864,22 +2864,22 @@ gint test_deviced_PmQos_SmemoZoom(gint param1) gint test_deviced_PmQos_ScreenMirroring(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ScreenMirroring", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ScreenMirroring"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2889,22 +2889,22 @@ gint test_deviced_PmQos_ScreenMirroring(gint param1) gint test_deviced_PmQos_ReservedMode(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ReservedMode", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ReservedMode"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2914,22 +2914,22 @@ gint test_deviced_PmQos_ReservedMode(gint param1) gint test_deviced_PmQos_ProcessCrashed(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ProcessCrashed", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ProcessCrashed"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2939,22 +2939,22 @@ gint test_deviced_PmQos_ProcessCrashed(gint param1) gint test_deviced_PmQos_PowerSaving(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "PowerSaving", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed PowerSaving"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2964,22 +2964,22 @@ gint test_deviced_PmQos_PowerSaving(gint param1) gint test_deviced_PmQos_MusicPlayLcdOn(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MusicPlayLcdOn", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed MusicPlayLcdOn"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -2989,22 +2989,22 @@ gint test_deviced_PmQos_MusicPlayLcdOn(gint param1) gint test_deviced_PmQos_MtpSendFile(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MtpSendFile", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed MtpSendFile"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3014,22 +3014,22 @@ gint test_deviced_PmQos_MtpSendFile(gint param1) gint test_deviced_PmQos_LowBattery(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "LowBattery", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed LowBattery"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3039,22 +3039,22 @@ gint test_deviced_PmQos_LowBattery(gint param1) gint test_deviced_PmQos_LockScreen(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "LockScreen", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed LockScreen"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3064,22 +3064,22 @@ gint test_deviced_PmQos_LockScreen(gint param1) gint test_deviced_PmQos_IMEInput(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "IMEInput", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed IMEInput"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3089,22 +3089,22 @@ gint test_deviced_PmQos_IMEInput(gint param1) gint test_deviced_PmQos_ImageViewer(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ImageViewer", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ImageViewer"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3114,22 +3114,22 @@ gint test_deviced_PmQos_ImageViewer(gint param1) gint test_deviced_PmQos_HomeScreen(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "HomeScreen", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed HomeScreen"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3139,22 +3139,22 @@ gint test_deviced_PmQos_HomeScreen(gint param1) gint test_deviced_PmQos_GpuWakeup(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpuWakeup", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GpuWakeup"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3164,22 +3164,22 @@ gint test_deviced_PmQos_GpuWakeup(gint param1) gint test_deviced_PmQos_GpuBoost(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpuBoost", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GpuBoost"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3189,22 +3189,22 @@ gint test_deviced_PmQos_GpuBoost(gint param1) gint test_deviced_PmQos_GpsSerialCno(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpsSerialCno", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GpsSerialCno"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3214,22 +3214,22 @@ gint test_deviced_PmQos_GpsSerialCno(gint param1) gint test_deviced_PmQos_GetDefaultLockTime(void) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GetDefaultLockTime", NULL, - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GetDefaultLockTime"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3239,22 +3239,22 @@ gint test_deviced_PmQos_GetDefaultLockTime(void) gint test_deviced_PmQos_GalleryRotation(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GalleryRotation", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GalleryRotation"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3264,22 +3264,22 @@ gint test_deviced_PmQos_GalleryRotation(gint param1) gint test_deviced_PmQos_GalleryScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GalleryScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed GalleryScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3289,22 +3289,22 @@ gint test_deviced_PmQos_GalleryScroll(gint param1) gint test_deviced_PmQos_Emergency(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "Emergency", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Emergency"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3314,22 +3314,22 @@ gint test_deviced_PmQos_Emergency(gint param1) gint test_deviced_PmQos_ContactSearch(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ContactSearch", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed ContactSearch"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3339,22 +3339,22 @@ gint test_deviced_PmQos_ContactSearch(gint param1) gint test_deviced_PmQos_CameraSoundAndShot(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraSoundAndShot", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CameraSoundAndShot"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3364,22 +3364,22 @@ gint test_deviced_PmQos_CameraSoundAndShot(gint param1) gint test_deviced_PmQos_CameraRecording(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraRecording", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CameraRecording"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3389,22 +3389,22 @@ gint test_deviced_PmQos_CameraRecording(gint param1) gint test_deviced_PmQos_CameraPreview(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraPreview", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CameraPreview"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3414,22 +3414,22 @@ gint test_deviced_PmQos_CameraPreview(gint param1) gint test_deviced_PmQos_CameraCaptureAtRec(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraCaptureAtRec", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CameraCaptureAtRec"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3439,22 +3439,22 @@ gint test_deviced_PmQos_CameraCaptureAtRec(gint param1) gint test_deviced_PmQos_CameraBurstShot(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraBurstShot", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CameraBurstShot"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3464,22 +3464,22 @@ gint test_deviced_PmQos_CameraBurstShot(gint param1) gint test_deviced_PmQos_CallSound(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CallSound", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed CallSound"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3489,22 +3489,22 @@ gint test_deviced_PmQos_CallSound(gint param1) gint test_deviced_PmQos_BrowserScroll(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserScroll", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed BrowserScroll"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3514,22 +3514,22 @@ gint test_deviced_PmQos_BrowserScroll(gint param1) gint test_deviced_PmQos_BrowserLoading(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserLoading", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed BrowserLoading"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3539,22 +3539,22 @@ gint test_deviced_PmQos_BrowserLoading(gint param1) gint test_deviced_PmQos_BrowserJavaScript(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserJavaScript", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed BrowserJavaScript"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3564,22 +3564,22 @@ gint test_deviced_PmQos_BrowserJavaScript(gint param1) gint test_deviced_PmQos_BrowserDash(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserDash", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed BrowserDash"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3589,22 +3589,22 @@ gint test_deviced_PmQos_BrowserDash(gint param1) gint test_deviced_PmQos_Browser(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "Browser", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed Browser"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3614,22 +3614,22 @@ gint test_deviced_PmQos_Browser(gint param1) gint test_deviced_PmQos_BeautyShot(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BeautyShot", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed BeautyShot"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3639,22 +3639,22 @@ gint test_deviced_PmQos_BeautyShot(gint param1) gint test_deviced_PmQos_AppLaunchHome(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "AppLaunchHome", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed AppLaunchHome"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } @@ -3664,22 +3664,22 @@ gint test_deviced_PmQos_AppLaunchHome(gint param1) gint test_deviced_PmQos_AppLaunch(gint param1) { gint val1; - GVariant *ret; - int err; + GVariant *reply; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "AppLaunch", g_variant_new("(i)", param1), - &ret);; - if (err < 0) { + &reply);; + if (ret_dbus < 0) { _E("failed AppLaunch"); return 0; } - g_variant_get(ret, "(i)", &val1); - g_variant_unref(ret); + g_variant_get(reply, "(i)", &val1); + g_variant_unref(reply); return val1; } \ No newline at end of file diff --git a/src/auto-test/time.c b/src/auto-test/time.c index 04cba10..5313995 100755 --- a/src/auto-test/time.c +++ b/src/auto-test/time.c @@ -22,36 +22,36 @@ static bool request_sysnoti_method(const char *method, GVariant *param) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; bool ret = FALSE; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, method, param, - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail (%s): no reply", method); return ret; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail (%s): no message", method); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! (%s): %d", method, val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! (%s): %d", method, reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail (%s): returned fail (%d)", method, val); + } else if (reply_val < 0) { + _E("fail (%s): returned fail (%d)", method, reply_val); } else { - _I("success (%s): %d", method, val); + _I("success (%s): %d", method, reply_val); ret = TRUE; } } - g_variant_unref(msg); + g_variant_unref(reply); return ret; } diff --git a/src/auto-test/udev.c b/src/auto-test/udev.c index 8b52c19..06d047c 100644 --- a/src/auto-test/udev.c +++ b/src/auto-test/udev.c @@ -27,45 +27,45 @@ static const struct device_change_type { static int udev(int index) { - GVariant *msg; - int ret = 0, val = 0, err; + GVariant *reply; + int ret = 0, reply_val = 0, ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", g_variant_new("(sis)", "udev", 1, device_change_types[index].status), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { _E("fail : %s %s %s %s", DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev"); return -EBADMSG; } - if (!g_variant_get_safe(msg, "(i)", &val)) + if (!g_variant_get_safe(reply, "(i)", &reply_val)) _E("fail : no message"); else { - if ((val == -ENOTSUP) || (val == -ENOSYS)) { - _I("Not supported feature! : %d", val); + if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) { + _I("Not supported feature! : %d", reply_val); ret = TRUE; - } else if (val < 0) { - _E("fail : returned fail (%d)", val); + } else if (reply_val < 0) { + _E("fail : returned fail (%d)", reply_val); } else { - _I("success : %d", val); + _I("success : %d", reply_val); ret = TRUE; } } _I("%s", device_change_types[index].status); - if (val < 0) + if (reply_val < 0) _R("[NG] ---- %s : %s", __func__, device_change_types[index].status); else _R("[OK] ---- %s : %s", __func__, device_change_types[index].status); - g_variant_unref(msg); + g_variant_unref(reply); sleep(TEST_WAIT_TIME_INTERVAL); return ret; } diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index 8b1545b..edb8e7b 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -196,14 +196,14 @@ out: static void noti_off_cb(GVariant *var, void *user_data, GError *err) { - int ret = 0; + int val = 0; - if (!g_variant_get_safe(var, "(i)", &ret)) { + if (!g_variant_get_safe(var, "(i)", &val)) { _E("Failed to off notification: no message(%s)", g_variant_get_type_string(var)); goto out; } - _D("Noti off: %d", ret); + _D("Noti off: %d", val); out: g_variant_unref(var); @@ -300,7 +300,7 @@ static void power_supply_noti(enum battery_noti_type type, enum battery_noti_sta { static int charger = CHARGER_DISCHARGING; static int full = CHARGING_NOT_FULL; - int ret; + int ret_val; if (type == DEVICE_NOTI_BATT_CHARGE) { if (status == DEVICE_NOTI_ON && charger == CHARGER_DISCHARGING) { @@ -310,12 +310,12 @@ static void power_supply_noti(enum battery_noti_type type, enum battery_noti_sta charger = CHARGER_DISCHARGING; } else if (type == DEVICE_NOTI_BATT_FULL) { if (status == DEVICE_NOTI_ON && full == CHARGING_NOT_FULL) { - ret = send_full_noti(CHARGING_FULL); - if (ret == 0) + ret_val = send_full_noti(CHARGING_FULL); + if (ret_val == 0) full = CHARGING_FULL; } else if (status == DEVICE_NOTI_OFF && full == CHARGING_FULL) { - ret = send_full_noti(CHARGING_NOT_FULL); - if (ret == 0) + ret_val = send_full_noti(CHARGING_NOT_FULL); + if (ret_val == 0) full = CHARGING_NOT_FULL; } } @@ -558,16 +558,16 @@ static void check_abnormal_status(void) static bool update_online(void) { int chg_on; - int ret; + int ret_val; bool broadcast = false; if (battery.online <= POWER_SUPPLY_TYPE_BATTERY && battery.charger_charging == CHARGER_DISABLED) { battery.charger_charging = CHARGER_ENABLED; - ret = sys_get_int(CHARGER_CHARGE_ON_NODE, &chg_on); - if (ret == 0 && battery.charger_charging != chg_on) { - ret = sys_set_int(CHARGER_CHARGE_ON_NODE, battery.charger_charging); - _I("%s to change status with %d", ((ret == 0) ? "success" : "fail"), battery.charger_charging); + ret_val = sys_get_int(CHARGER_CHARGE_ON_NODE, &chg_on); + if (ret_val == 0 && battery.charger_charging != chg_on) { + ret_val = sys_set_int(CHARGER_CHARGE_ON_NODE, battery.charger_charging); + _I("%s to change status with %d", ((ret_val == 0) ? "success" : "fail"), battery.charger_charging); } } @@ -751,14 +751,14 @@ static void process_power_supply(void *data) { bool broadcasted = true; int lock = -1; - int ret; + int ret_val; _D("process_power_supply()"); if (disp_plgn->pm_lock_internal) { lock = disp_plgn->pm_lock_internal(INTERNAL_LOCK_BATTERY, LCD_OFF, STAY_CUR_STATE, 0); if (old_battery.charge_now != battery.charge_now || battery.charge_now == CHARGER_ABNORMAL) { - ret = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, battery.charge_now); - if (ret < 0) + ret_val = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, battery.charge_now); + if (ret_val < 0) _E("Failed to set vconf value for battery charge now: %d", vconf_get_ext_errno()); if (power_supply_broadcast(CHARGE_NOW_SIGNAL, battery.charge_now) < 0) @@ -782,8 +782,8 @@ static void process_power_supply(void *data) } if (old_battery.capacity != battery.capacity) { - ret = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, battery.capacity); - if (ret < 0) + ret_val = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, battery.capacity); + if (ret_val < 0) _E("Failed to set vconf value for battery capacity: %d", vconf_get_ext_errno()); if (power_supply_broadcast(CHARGE_CAPACITY_SIGNAL, battery.capacity) < 0) @@ -793,8 +793,8 @@ static void process_power_supply(void *data) (void)lowbat_execute(data); if (update_online()) { - ret = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_STATUS, online_status); - if (ret < 0) + ret_val = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_STATUS, online_status); + if (ret_val < 0) _E("Failed to set vconf value for charger status: %d", vconf_get_ext_errno()); if (power_supply_broadcast(CHARGER_STATUS_SIGNAL, online_status) < 0) @@ -802,8 +802,8 @@ static void process_power_supply(void *data) } if (old_battery.online_type != battery.online_type) { - ret = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_TYPE, battery.online_type); - if (ret < 0) + ret_val = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_TYPE, battery.online_type); + if (ret_val < 0) _E("Failed to set vconf value for charger type: %d", vconf_get_ext_errno()); if (power_supply_broadcast(CHARGER_TYPE_SIGNAL, battery.online_type) < 0) @@ -872,7 +872,7 @@ static void uevent_power_handler(struct udev_device *dev) const char *env_name; const char *env_value; bool matched = false; - int ret; + int ret_val; udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(dev)) { @@ -912,8 +912,8 @@ static void uevent_power_handler(struct udev_device *dev) battery_initialized = true; - ret = booting_done(NULL); - if (ret) { + ret_val = booting_done(NULL); + if (ret_val) { if (battery.online > POWER_SUPPLY_TYPE_BATTERY) power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_ON); else @@ -968,7 +968,7 @@ static int battery_state(struct battery_info *info) static void battery_changed(struct battery_info *info, void *data) { - int ret; + int ret_val; if (!info) { (void)battery_state(NULL); @@ -1007,12 +1007,12 @@ static void battery_changed(struct battery_info *info, void *data) battery_initialized = true; - ret = battery_state(info); - if (ret != 1) + ret_val = battery_state(info); + if (ret_val != 1) return; - ret = booting_done(NULL); - if (ret) { + ret_val = booting_done(NULL); + if (ret_val) { /* If the same notification is requested repeatedly, it is ignored by power_supply_noti(). * A notification will be triggered only when charge_status changes between * CHARGE_STATUS_CHARGING/FULL <-> CHARGE_STATUS_DISCHARGING. */ @@ -1022,7 +1022,7 @@ static void battery_changed(struct battery_info *info, void *data) power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_OFF); } - if (ret == 0) { + if (ret_val == 0) { battery.health = HEALTH_GOOD; battery.present = PRESENT_NORMAL; } @@ -1083,10 +1083,10 @@ static GVariant *dbus_get_charger_status(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { - int ret, status; + int ret_val, status; - ret = vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &status); - if (ret < 0) { + ret_val = vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &status); + if (ret_val < 0) { _E("Failed to get vconf value for charger status: %d", vconf_get_ext_errno()); status = -EIO; } @@ -1597,14 +1597,14 @@ static int load_uevent(struct parse_result *result, void *user_data) static int power_supply_probe(void *data) { - int ret, r; + int ret_val, r; if (battery_dev_available) return 0; - ret = hal_device_battery_get_backend(); - if (ret < 0) { + ret_val = hal_device_battery_get_backend(); + if (ret_val < 0) { _E("There is no HAL for battery."); battery_dev_available = false; if (access(POWER_PATH, R_OK) == 0) @@ -1631,21 +1631,21 @@ out: r = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_LEVEL_STATUS, -ENOTSUP); if (r < 0) _E("Failed to set vconf value for battery level status: %d", vconf_get_ext_errno()); - _I("There is no battery device: %d", ret); + _I("There is no battery device: %d", ret_val); return -ENODEV; } static void add_power_supply_handler(void) { - int ret; + int ret_val; if (battery_dev_available) { hal_device_battery_register_changed_event(battery_changed, NULL); hal_device_battery_get_current_state(battery_changed, NULL); } else { - ret = config_parse(POWER_SUPPLY_UEVENT, load_uevent, &battery); - if (ret < 0) - _E("Failed to load %s, %d Use default value!", POWER_SUPPLY_UEVENT, ret); + ret_val = config_parse(POWER_SUPPLY_UEVENT, load_uevent, &battery); + if (ret_val < 0) + _E("Failed to load %s, %d Use default value!", POWER_SUPPLY_UEVENT, ret_val); /* register power subsystem */ register_kernel_uevent_control(&uh); @@ -1679,7 +1679,7 @@ static int event_handler_state_changed(void *data) static void power_supply_init(void *data) { - int ret; + int ret_dbus; memset(&battery, 0, sizeof(struct battery_status)); memset(&old_battery, 0, sizeof(struct battery_status)); @@ -1696,9 +1696,9 @@ static void power_supply_init(void *data) register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); register_notifier(DEVICE_NOTIFIER_EVENT_HANDLER, event_handler_state_changed); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); - if (ret < 0) - _E("Failed to init dbus method: %d", ret); + ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); + if (ret_dbus < 0) + _E("Failed to init dbus method: %d", ret_dbus); battery_ops_init((void *)battery_plgn); } diff --git a/src/devicectl/devicectl.c b/src/devicectl/devicectl.c index 52a99ea..80cb678 100644 --- a/src/devicectl/devicectl.c +++ b/src/devicectl/devicectl.c @@ -63,57 +63,57 @@ static const struct device { static int start_device(char **args) { - GVariant *msg; - int err; + GVariant *reply; + int ret_dbus; if (!args[1]) return -EINVAL; printf("Start %s device.\n", args[1]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "start", NULL, - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - g_variant_unref(msg); + g_variant_unref(reply); return 0; } static int stop_device(char **args) { - GVariant *msg; - int err; + GVariant *reply; + int ret_dbus; if (!args[1]) return -EINVAL; printf("Stop %s device.\n", args[1]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "stop", NULL, - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - g_variant_unref(msg); + g_variant_unref(reply); return 0; } static int dump_mode(char **args) { - GVariant *msg; + GVariant *reply; int ret = -EBADMSG; - int err; + int ret_dbus; if (!args[1] || !args[2] || !args[3]) { ret = -EINVAL; @@ -122,24 +122,24 @@ static int dump_mode(char **args) printf("%s (%s %s).\n", args[1], args[2], args[3]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "Dumpmode", g_variant_new("(s)", args[3]), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { printf("Failed to set dump mode"); ret = -EBADMSG; goto out; } - if (!g_variant_get_safe(msg, "(i)", &ret)) { - printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); + if (!g_variant_get_safe(reply, "(i)", &ret)) { + printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); ret = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); out: return ret; @@ -147,9 +147,9 @@ out: static int display_state(char **args) { - GVariant *msg; + GVariant *reply; int ret = -EBADMSG; - int err; + int ret_dbus; if (!args[1] || !args[2] || !args[3]) { ret = -EINVAL; @@ -158,25 +158,25 @@ static int display_state(char **args) printf("%s (%s %s)!\n", args[1], args[2], args[3]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "changestate", g_variant_new("(s)", args[3]), - &msg); + &reply); - if (err < 0) { + if (ret_dbus < 0) { printf("Failed to set display state"); ret = -EBADMSG; goto out; } - if (!g_variant_get_safe(msg, "(i)", &ret)) { - printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); + if (!g_variant_get_safe(reply, "(i)", &ret)) { + printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); ret = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); out: return ret; @@ -184,26 +184,26 @@ out: static int save_log(char **args) { - GVariant *msg; - int err; + GVariant *reply; + int ret_dbus; if (!args[1]) return -EINVAL; printf("Save log %s device.\n", args[1]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "SaveLog", NULL, - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { printf("Failed to save log"); return -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); return 0; } @@ -231,32 +231,32 @@ static void get_pname(pid_t pid, char *pname) static int save_dbus_name(char **args) { - GVariant *msg; + GVariant *reply; GVariantIter *iter; char *str; pid_t pid; char pname[PATH_MAX]; - int err; + int ret_dbus; if (!args[1]) return -EINVAL; printf("Save dbus name.\n"); - err = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME, DBUS_OBJECT_PATH, DBUS_INTERFACE_NAME, "ListNames", NULL, - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { printf("Failed to get list names."); return -EBADMSG; } - if (!g_variant_get_safe(msg, "(as)", &iter)) { + if (!g_variant_get_safe(reply, "(as)", &iter)) { printf("Invalid list name arguments."); - g_variant_unref(msg); + g_variant_unref(reply); return -EINVAL; } @@ -269,31 +269,31 @@ static int save_dbus_name(char **args) } g_variant_iter_free(iter); - g_variant_unref(msg); + g_variant_unref(reply); return 0; } static int device_list(char **args) { - GVariant *msg; - int err; + GVariant *reply; + int ret_dbus; if (!args[1]) return -EINVAL; printf("Print %s to dlog.\n", args[1]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "DeviceList", NULL, - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - g_variant_unref(msg); + g_variant_unref(reply); return 0; } @@ -310,9 +310,9 @@ static int unset_usb_mode(char **args) static int enable_device(char **args) { - GVariant *msg; + GVariant *reply; int ret = -EBADMSG; - int err; + int ret_dbus; if (!args[3]) { ret = -EINVAL; @@ -321,23 +321,23 @@ static int enable_device(char **args) printf("Enable %s device.\n", args[3]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "enable", g_variant_new("(s)", args[3]), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { ret = -EBADMSG; goto out; } - if (!g_variant_get_safe(msg, "(i)", &ret)) { - printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); + if (!g_variant_get_safe(reply, "(i)", &ret)) { + printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); ret = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); out: return ret; @@ -345,9 +345,9 @@ out: static int disable_device(char **args) { - GVariant *msg; + GVariant *reply; int ret = -EBADMSG; - int err; + int ret_dbus; if (!args[3]) { ret = -EINVAL; @@ -356,23 +356,23 @@ static int disable_device(char **args) printf("Disable %s device.\n", args[3]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "disable", g_variant_new("(s)", args[3]), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { ret = -EBADMSG; goto out; } - if (!g_variant_get_safe(msg, "(i)", &ret)) { - printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); + if (!g_variant_get_safe(reply, "(i)", &ret)) { + printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); ret = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); out: return ret; @@ -380,9 +380,9 @@ out: static int power_operation(char **args, char *type) { - GVariant *msg; + GVariant *reply; int ret = -EBADMSG; - int err; + int ret_dbus; if (!args[1] || !type) { ret = -EINVAL; @@ -391,23 +391,23 @@ static int power_operation(char **args, char *type) printf("Power %s device.\n", args[2]); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "PowerOff", g_variant_new("(s)", type), - &msg); - if (err < 0) { + &reply); + if (ret_dbus < 0) { ret = -EBADMSG; goto out; } - if (!g_variant_get_safe(msg, "(i)", &ret)) { - printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); + if (!g_variant_get_safe(reply, "(i)", &ret)) { + printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); ret = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); out: return ret; diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c index 27db29a..8f698c6 100644 --- a/src/extcon/extcon.c +++ b/src/extcon/extcon.c @@ -97,8 +97,8 @@ static int extcon_update(const char *name, const char *index, const char *value) struct extcon_ops *dev; char buf[BUF_MAX]; int status; - int ret = 0; - int val; + int ret_dbus = 0; + int reply; if (!name || !value) return -EINVAL; @@ -120,17 +120,17 @@ static int extcon_update(const char *name, const char *index, const char *value) if (dev->enabled == false && strncmp(name, "USB", strlen("USB")) == 0) { if (status > 0) { snprintf(buf, BUF_MAX, "usb-client"); - ret = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME, DEVICEMANAGER_PATH_POPUP, DEVICEMANAGER_INTERFACE_POPUP, METHOD_SYSPOPUP_SHOW, g_variant_new("(s)", buf), - &val); - if (ret < 0){ - _E("Failed to launch USB restricted popup: %d", ret); - return ret; + &reply); + if (ret_dbus < 0){ + _E("Failed to launch USB restricted popup: %d", ret_dbus); + return ret_dbus; } - return val; + return reply; } else return 0; } @@ -176,20 +176,20 @@ int extcon_disable_device(const char *name) { struct extcon_ops *dev; char buf[BUF_MAX]; - int ret; + int ret_dbus; dev = find_extcon(name); if (!dev) return -ENODEV; snprintf(buf, BUF_MAX, "usb-client"); - ret = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME, DEVICEMANAGER_PATH_POPUP, DEVICEMANAGER_INTERFACE_POPUP, METHOD_SYSPOPUP_SHOW, g_variant_new("(s)", buf), NULL); - if (ret < 0) - _E("Failed to launch USB restricted popup: %d", ret); + if (ret_dbus < 0) + _E("Failed to launch USB restricted popup: %d", ret_dbus); if (!dev->enabled) { _I("Extcon(%s) already disabled.", name); @@ -235,14 +235,14 @@ static void uevent_extcon_handler(struct udev_device *dev) { const char *env_value; const char *dev_index; - int ret; + int ret_val; env_value = udev_device_get_property_value(dev, STATE_NAME); dev_index = udev_device_get_property_value(dev, DEVICE_TYPE); - ret = extcon_parsing_value(dev_index, env_value); - if (ret < 0) - _E("Failed to parse extcon value: %d", ret); + ret_val = extcon_parsing_value(dev_index, env_value); + if (ret_val < 0) + _E("Failed to parse extcon value: %d", ret_val); } static int extcon_load_uevent(struct parse_result *result, void *user_data) @@ -385,13 +385,13 @@ static void extcon_changed(struct connection_info *info, void *data) static int extcon_probe(void *data) { - int ret; + int ret_val; if (extcon_dev_available) return 0; - ret = hal_device_external_connection_get_backend(); - if (ret == 0) { + ret_val = hal_device_external_connection_get_backend(); + if (ret_val == 0) { extcon_dev_available = true; _I("Extcon device structure load success."); @@ -408,7 +408,7 @@ static int extcon_probe(void *data) */ if (access(EXTCON_PATH, R_OK) != 0) { _E("There is no extcon class."); - return ret; + return ret_val; } return 0; @@ -416,35 +416,35 @@ static int extcon_probe(void *data) static void add_extcon_event_handler(void) { - int ret; + int ret_val; if (extcon_dev_available) { /* HAL is used */ hal_device_external_connection_register_changed_event(extcon_changed, NULL); hal_device_external_connection_get_current_state(extcon_changed, NULL); } else { /* register extcon uevent */ - ret = register_kernel_uevent_control(&uh); - if (ret < 0) - _E("Failed to register extcon uevent: %d", ret); + ret_val = register_kernel_uevent_control(&uh); + if (ret_val < 0) + _E("Failed to register extcon uevent: %d", ret_val); /* load the initialize value by accessing the node directly */ - ret = get_extcon_init_state(); - if (ret < 0) - _E("Failed to init extcon nodes: %d", ret); + ret_val = get_extcon_init_state(); + if (ret_val < 0) + _E("Failed to init extcon nodes: %d", ret_val); } } static void remove_extcon_event_handler(void) { - int ret; + int ret_val; if (extcon_dev_available) hal_device_external_connection_unregister_changed_event(extcon_changed); else { /* unreigster extcon uevent */ - ret = unregister_kernel_uevent_control(&uh); - if (ret < 0) - _E("Failed to unregister extcon uevent: %d", ret); + ret_val = unregister_kernel_uevent_control(&uh); + if (ret_val < 0) + _E("Failed to unregister extcon uevent: %d", ret_val); } } @@ -468,7 +468,7 @@ static int event_handler_state_changed(void *data) static void extcon_init(void *data) { - int ret; + int ret_dbus; GList *l; struct extcon_ops *dev; device_notifier_state_e state = DEVICE_NOTIFIER_STATE_START; @@ -486,9 +486,9 @@ static void extcon_init(void *data) event_handler_state_changed((void *)&state); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface); - if (ret < 0) - _E("Failed to init dbus method: %d", ret); + ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface); + if (ret_dbus < 0) + _E("Failed to init dbus method: %d", ret_dbus); register_notifier(DEVICE_NOTIFIER_EVENT_HANDLER, event_handler_state_changed); diff --git a/src/led/noti.c b/src/led/noti.c index 796c9a0..bac00b6 100644 --- a/src/led/noti.c +++ b/src/led/noti.c @@ -30,47 +30,47 @@ static int noti_h; int ongoing_show(void) { - int ret_val, result; + int reply, ret_dbus; if (noti_h > 0) { _D("Already ongoing noti show handle(%d).", noti_h); return 0; } - result = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_TORCH_NOTI_ON, NULL, - &ret_val); + &reply); - if (result < 0) - return result; + if (ret_dbus < 0) + return ret_dbus; - noti_h = ret_val; + noti_h = reply; _D("Insert noti handle(%d).", noti_h); return 0; } int ongoing_clear(void) { - int ret_val, result; + int reply, ret_dbus; if (noti_h <= 0) { _D("Already ongoing noti clear."); return 0; } - result = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME, POPUP_PATH_LED, POPUP_INTERFACE_LED, METHOD_TORCH_NOTI_OFF, g_variant_new("(i)", noti_h), - &ret_val); + &reply); - if (result < 0) - return result; + if (ret_dbus < 0) + return ret_dbus; _D("Delete noti handle(%d).", noti_h); noti_h = 0; - return ret_val; + return reply; } diff --git a/src/libdeviced/deviced-noti.c b/src/libdeviced/deviced-noti.c index c5e0aa0..5496e66 100644 --- a/src/libdeviced/deviced-noti.c +++ b/src/libdeviced/deviced-noti.c @@ -56,29 +56,29 @@ static int dbus_proc_handler(char* type, char *buf) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_PROCESS, DEVICED_INTERFACE_PROCESS, type, g_variant_new("(sis)", type, 1, buf), - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; goto out; } - _D("%s-%s: %d", DEVICED_INTERFACE_PROCESS, type, val); + _D("%s-%s: %d", DEVICED_INTERFACE_PROCESS, type, reply_val); out: - g_variant_unref(msg); - return val; + g_variant_unref(reply); + return reply_val; } API int deviced_inform_foregrd(void) @@ -111,30 +111,30 @@ API int deviced_inform_inactive(pid_t pid) static int dbus_power_handler(char* type) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; goto out; } - _D("%s-%s: %d", DEVICED_INTERFACE_POWER, type, val); + _D("%s-%s: %d", DEVICED_INTERFACE_POWER, type, reply_val); out: - g_variant_unref(msg); + g_variant_unref(reply); - return val; + return reply_val; } API int deviced_request_poweroff(void) @@ -149,73 +149,73 @@ API int deviced_request_reboot(void) static int dbus_time_handler(char* type, char* buf) { - GVariant *msg; + GVariant *reply; pid_t pid; char name[PATH_MAX]; - int ret, val, err; + int ret_val, reply_val; pid = getpid(); - ret = deviced_get_cmdline_name(pid, name, sizeof(name)); - if (ret != 0) + ret_val = deviced_get_cmdline_name(pid, name, sizeof(name)); + if (ret_val != 0) snprintf(name, sizeof(name), "%d", pid); - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_val = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, type, g_variant_new("(sis)", type, 1, buf), - &msg); - if (err < 0) + &reply); + if (ret_val < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; goto out; } - _SI("[%s] %s-%s(%s): %d", name, DEVICED_INTERFACE_SYSNOTI, type, buf, val); + _SI("[%s] %s-%s(%s): %d", name, DEVICED_INTERFACE_SYSNOTI, type, buf, reply_val); out: - g_variant_unref(msg); + g_variant_unref(reply); - return val; + return reply_val; } static int alarm_set_time(time_t timet) { - GVariant *msg; + GVariant *reply; pid_t pid; char name[PATH_MAX]; - int ret, val, err; + int ret_val, reply_val; pid = getpid(); - ret = deviced_get_cmdline_name(pid, name, sizeof(name)); - if (ret != 0) + ret_val = deviced_get_cmdline_name(pid, name, sizeof(name)); + if (ret_val != 0) snprintf(name, sizeof(name), "%d", pid); _SI("[%s]start %s %ld.", name, ALARM_INTERFACE_NAME, timet); - err = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME, + ret_val = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME, ALARM_PATH_NAME, ALARM_INTERFACE_NAME, ALARM_SET_TIME_METHOD, g_variant_new("(i)", timet), - &msg); - if (err < 0) { + &reply); + if (ret_val < 0) { _E("Failed to call dbus_message_new_method_call(%s:%s-%s).", ALARM_PATH_NAME, ALARM_INTERFACE_NAME, ALARM_SET_TIME_METHOD); return -EBADMSG; } - if (!g_variant_get_safe(msg, "(i)", &val)) { - _E("Failed to get type(%s): no message", g_variant_get_type_string(msg)); - val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get type(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; } - _SI("[%s]End %s %ld: %d", name, ALARM_INTERFACE_NAME, timet, val); + _SI("[%s]End %s %ld: %d", name, ALARM_INTERFACE_NAME, timet, reply_val); - g_variant_unref(msg); + g_variant_unref(reply); - return val; + return reply_val; } API int deviced_set_datetime(time_t timet) @@ -236,28 +236,28 @@ API int deviced_set_timezone(char *tzpath_str) static int dbus_cpu_handler(char* type, char* buf_pid, char* buf_freq) { - GVariant *msg; - int val, err; + GVariant *reply; + int reply_val, ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, type, g_variant_new("(siss)", type, 2, buf_pid, buf_freq), - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; goto out; } - _D("%s-%s: %d", DEVICED_INTERFACE_SYSNOTI, type, val); + _D("%s-%s: %d", DEVICED_INTERFACE_SYSNOTI, type, reply_val); out: - g_variant_unref(msg); - return val; + g_variant_unref(reply); + return reply_val; } API int deviced_request_set_cpu_max_frequency(int val) diff --git a/src/libdeviced/display.c b/src/libdeviced/display.c index 6cb37d6..06f276b 100644 --- a/src/libdeviced/display.c +++ b/src/libdeviced/display.c @@ -61,18 +61,18 @@ API int display_get_max_brightness(void) { - int ret, val; + int reply, ret_dbus; - ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_GET_MAX_BRIGHTNESS, - g_variant_new("(i)", DISPLAY_STATE_NORMAL), &val); - if (ret < 0) + g_variant_new("(i)", DISPLAY_STATE_NORMAL), &reply); + if (ret_dbus < 0) return DISPLAY_MAX_BRIGHTNESS; - _D("Get max brightness: %d", val); - return val; + _D("Get max brightness: %d", reply); + return reply; } API int display_set_brightness_with_setting(int val) diff --git a/src/libdeviced/led.c b/src/libdeviced/led.c index 7a0d24c..8d09a25 100644 --- a/src/libdeviced/led.c +++ b/src/libdeviced/led.c @@ -32,73 +32,73 @@ API int led_get_brightness(void) { - GVariant *msg = NULL; - int ret_val = 0; - int err; + GVariant *reply = NULL; + int reply_val = 0; + int ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_GET_BRIGHTNESS, NULL, - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &ret_val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - ret_val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); - return ret_val; + return reply_val; } API int led_get_max_brightness(void) { - GVariant *msg = NULL; - int ret_val, err; + GVariant *reply = NULL; + int reply_val, ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_GET_MAX_BRIGHTNESS, NULL, - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &ret_val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - ret_val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); - return ret_val; + return reply_val; } API int led_set_brightness_with_noti(int val, bool enable) { - GVariant *msg = NULL; - int ret_val, err; + GVariant *reply = NULL; + int reply_val, ret_dbus; - err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_SET_BRIGHTNESS, g_variant_new("(ii)", val, enable), - &msg); - if (err < 0) + &reply); + if (ret_dbus < 0) return -EBADMSG; - if (!g_variant_get_safe(msg, "(i)", &ret_val)) { - _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg)); - ret_val = -EBADMSG; + if (!g_variant_get_safe(reply, "(i)", &reply_val)) { + _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply)); + reply_val = -EBADMSG; } - g_variant_unref(msg); + g_variant_unref(reply); - return ret_val; + return reply_val; } diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c index 8a6d5a2..5e55845 100644 --- a/src/libdeviced/usbhost.c +++ b/src/libdeviced/usbhost.c @@ -204,16 +204,16 @@ API void deinit_usbhost_signal(void) API int request_usb_storage_info(void) { - int ret, err; - err = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + int reply, ret_dbus; + ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_INFO_ALL, NULL, - &ret); - if(err < 0) - return err; - return ret; + &reply); + if(ret_dbus < 0) + return ret_dbus; + return reply; } API int register_usb_storage_change_handler( @@ -221,20 +221,20 @@ API int register_usb_storage_change_handler( void *data) { union action action; - int ret; + int ret_val; if (!storage_changed) return -EINVAL; action.storage = storage_changed; - ret = register_signal_handler(DEVICED_PATH_USBHOST, + ret_val = register_signal_handler(DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, SIGNAL_NAME_USB_STORAGE_CHANGED, storage_signal_handler, action, data); - if (ret < 0) + if (ret_val < 0) return -1; return 0; @@ -245,19 +245,19 @@ API int register_usb_device_change_handler( void *data) { union action action; - int ret; + int ret_val; if (!device_changed) return -EINVAL; action.device = device_changed; - ret = register_signal_handler(DEVICED_PATH_USBHOST, + ret_val = register_signal_handler(DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, SIGNAL_NAME_USB_DEVICE_CHANGED, device_signal_handler, action, data); - if (ret < 0) + if (ret_val < 0) return -1; return 0; @@ -306,55 +306,55 @@ API int unregister_usb_device_change_handler( API int mount_usb_storage(char *path) { - int ret, val; + int ret_dbus, val; if (!path) return -1; - ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_MOUNT, g_variant_new("(s)", path), &val); - if (ret < 0) - return ret; + if (ret_dbus < 0) + return ret_dbus; return val; } API int unmount_usb_storage(char *path) { - int ret, val; + int ret_dbus, val; if (!path) return -1; - ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_UNMOUNT, g_variant_new("(s)", path), &val); - if (ret < 0) - return ret; + if (ret_dbus < 0) + return ret_dbus; return val; } API int format_usb_storage(char *path) { - int ret, val; + int ret_dbus, val; if (!path) return -1; - ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_FORMAT, g_variant_new("(s)", path), &val); - if (ret < 0) - return ret; + if (ret_dbus < 0) + return ret_dbus; return val; } @@ -362,13 +362,13 @@ API int open_usb_device(char *path, int *out_fd) { GVariant *reply = NULL; int *fdlist = NULL; - int ret = 0; + int ret_dbus = 0; int size = 0; if (!out_fd || !path) return -EINVAL; - ret = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_OPEN_DEVICE, @@ -378,7 +378,7 @@ API int open_usb_device(char *path, int *out_fd) 0, &fdlist, &size); - if (ret < 0) { + if (ret_dbus < 0) { _E("Unable to open USB device."); return -1; } @@ -386,13 +386,13 @@ API int open_usb_device(char *path, int *out_fd) _E("Failed to get fd list."); return -1; } - if (!g_variant_get_safe(reply, "(i)", &ret)) { + if (!g_variant_get_safe(reply, "(i)", &ret_dbus)) { _E("Failed to get(%s): no message.", g_variant_get_type_string(reply)); - ret = -1; + ret_dbus = -1; goto out; } - if (ret >= 0) + if (ret_dbus >= 0) *out_fd = fdlist[0]; out: if (fdlist) @@ -400,5 +400,5 @@ out: if (reply) g_variant_unref(reply); - return ret; + return ret_dbus; } diff --git a/src/power-command/command.c b/src/power-command/command.c index 443756d..6974548 100644 --- a/src/power-command/command.c +++ b/src/power-command/command.c @@ -285,12 +285,12 @@ struct parse_result parse_reboot_et_al(enum application application, int argc, c int call_deviced_poweroff(const char *type, const char *extra_option, const char *message) { - int result = extra_option + int ret_dbus = extra_option ? dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL) : dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL) ; - if (result < 0) { - fprintf(stderr, "Error: %d", result); + if (ret_dbus < 0) { + fprintf(stderr, "Error: %d", ret_dbus); return EXIT_FAILURE; } diff --git a/src/power/power-control.c b/src/power/power-control.c index c5abfd1..0bce7ae 100644 --- a/src/power/power-control.c +++ b/src/power/power-control.c @@ -88,7 +88,7 @@ void pm_history_save(enum pm_log_type log_type, int code) void pm_history_print(int fd, int count) { int start_index, index, i; - int ret; + int ret_val; char buf[255]; char time_buf[30]; @@ -113,8 +113,8 @@ void pm_history_print(int fd, int count) history_string[pm_history_log[index].log_type], pm_history_log[index].keycode, time_buf); - ret = write(fd, buf, strlen(buf)); - if (ret < 0) + ret_val = write(fd, buf, strlen(buf)); + if (ret_val < 0) _E("Write() failed: %d", errno); } } @@ -199,11 +199,11 @@ int vital_state_changed(void *data) int pm_suspend(void) { - int ret; + int ret_val; _I("system suspend"); - ret = sys_set_str(POWER_STATE_PATH, "mem"); - _I("System resume: %d", ret); + ret_val = sys_set_str(POWER_STATE_PATH, "mem"); + _I("System resume: %d", ret_val); return 0; } @@ -230,13 +230,13 @@ int pm_get_power_lock(void) int pm_get_power_lock_support(void) { static int power_lock_support = -1; - int ret; + int ret_val; if (power_lock_support >= 0) goto out; - ret = sys_check_node(POWER_LOCK_PATH); - if (ret < 0) + ret_val = sys_check_node(POWER_LOCK_PATH); + if (ret_val < 0) power_lock_support = false; else power_lock_support = true; @@ -267,15 +267,15 @@ int check_wakeup_src(void) int get_wakeup_count(int *cnt) { - int ret; + int ret_val; int wakeup_count; if (!cnt) return -EINVAL; - ret = sys_get_int(POWER_WAKEUP_PATH, &wakeup_count); - if (ret < 0) - return ret; + ret_val = sys_get_int(POWER_WAKEUP_PATH, &wakeup_count); + if (ret_val < 0) + return ret_val; *cnt = wakeup_count; return 0; @@ -283,11 +283,11 @@ int get_wakeup_count(int *cnt) int set_wakeup_count(int cnt) { - int ret; + int ret_val; - ret = sys_set_int(POWER_WAKEUP_PATH, cnt); - if (ret < 0) - return ret; + ret_val = sys_set_int(POWER_WAKEUP_PATH, cnt); + if (ret_val < 0) + return ret_val; return 0; } diff --git a/src/power/power-handler.c b/src/power/power-handler.c index 58a8807..9c007fe 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -111,10 +111,10 @@ out: static void poweroff_start_animation(void) { - int ret; + int ret_val; - ret = systemd_start_unit_async("shutdown-animation.service", NULL); - if (ret < 0) + ret_val = systemd_start_unit_async("shutdown-animation.service", NULL); + if (ret_val < 0) _E("Failed to start shutdown animation."); gettimeofday(&tv_start_poweroff, NULL); @@ -141,18 +141,18 @@ static void disable_display(void) static int disable_systemd_journald(void) { - int ret; + int ret_val; - ret = systemd_stop_unit_async("systemd-journald.socket", NULL); - if (ret < 0) { + ret_val = systemd_stop_unit_async("systemd-journald.socket", NULL); + if (ret_val < 0) { _E("Failed to stop 'systemd-journald.socket'."); - return ret; + return ret_val; } - ret = systemd_stop_unit_async("systemd-journald.service", NULL); - if (ret < 0) { + ret_val = systemd_stop_unit_async("systemd-journald.service", NULL); + if (ret_val < 0) { _E("Failed to stop 'systemd-journald.service'."); - return ret; + return ret_val; } return 0; } @@ -165,14 +165,14 @@ static int disable_systemd_journald(void) */ static bool disable_coredump_handler(void) { - int ret = 0; + int ret_val = 0; int fd = open("/proc/sys/kernel/core_pattern", O_WRONLY); if (fd >= 0) { - ret = write(fd, "/dev/null", sizeof("/dev/null") - 1); + ret_val = write(fd, "/dev/null", sizeof("/dev/null") - 1); close(fd); } - bool is_ok = ret > 0; + bool is_ok = ret_val > 0; _I("Disabling core dumps %s.", is_ok ? "succeeded" : "failed"); return is_ok; @@ -457,7 +457,7 @@ static int poweroff_option_valid(enum poweroff_type type_e, const char *option) static void poweroff_send_broadcast(int status) { static int old = 0; - int ret; + int ret_dbus; if (old == status) return; @@ -467,18 +467,18 @@ static void poweroff_send_broadcast(int status) old = status; /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangeState signal for POWEROFF_TYPE_DIRECT and POWEROFF_TYPE_RESTART */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret_dbus = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, SIGNAL_POWEROFF_STATE, g_variant_new("(i)", status)); - if (ret < 0) + if (ret_dbus < 0) _E("Failed to send dbus signal(%s)", SIGNAL_POWEROFF_STATE); } static int power_execute_pid(const char *typename, const char *option) { - int ret; + int ret_val; if (poweroff_stage >= POWEROFF_TRIGGERED) { _E("Duplicate poweroff request. Poweroff was already triggered."); @@ -502,8 +502,8 @@ static int power_execute_pid(const char *typename, const char *option) return -EINVAL; } - ret = vconf_set_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, poweroff_opt.type); - if (ret < 0) + ret_val = vconf_set_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, poweroff_opt.type); + if (ret_val < 0) _E("Failed to set vconf value for power off status: %d", vconf_get_ext_errno()); poweroff_stage = POWEROFF_TRIGGERED; @@ -731,7 +731,7 @@ static int add_poweroff_option(enum poweroff_type type, const char *option) static int load_config(struct parse_result *result, void *user_data) { enum poweroff_type type; - int ret; + int ret_val; if (MATCH(result->section, "PowerOff")) type = POWEROFF_TYPE_DIRECT; @@ -743,10 +743,10 @@ static int load_config(struct parse_result *result, void *user_data) if (!MATCH(result->name, "Option")) return 0; - ret = add_poweroff_option(type, result->value); - if (ret < 0) { + ret_val = add_poweroff_option(type, result->value); + if (ret_val < 0) { _E("Failed to add %s option=%s", result->section, result->value); - return ret; + return ret_val; } return 0; @@ -766,12 +766,12 @@ out: static void power_init(void *data) { - int ret; + int ret_val; /* init dbus interface */ - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface); - if (ret < 0) - _E("Failed to init dbus method: %d", ret); + ret_val = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface); + if (ret_val < 0) + _E("Failed to init dbus method: %d", ret_val); add_booting_done_handler(NULL); @@ -781,9 +781,9 @@ static void power_init(void *data) add_poweroff_option(POWEROFF_TYPE_RESTART, NULL); add_poweroff_option(POWEROFF_TYPE_EXIT, NULL); - ret = config_parse(POWER_CONF_FILE, load_config, NULL); - if (ret < 0) - _E("Failed to load power off config: %d", ret); + ret_val = config_parse(POWER_CONF_FILE, load_config, NULL); + if (ret_val < 0) + _E("Failed to load power off config: %d", ret_val); poweroff_stage = POWEROFF_DEFAULT; } diff --git a/src/usb/usb-state.c b/src/usb/usb-state.c index df86bb3..284e468 100644 --- a/src/usb/usb-state.c +++ b/src/usb/usb-state.c @@ -273,23 +273,23 @@ out: static void add_notification_handler(void) { - int ret; + int ret_val; if (noti_id < 0) { - ret = add_async_notification("MediaDeviceNotiOn", media_noti_cb, NULL); - if (ret < 0) - _E("Failed to add USB notification for usb connection: %d", ret); + ret_val = add_async_notification("MediaDeviceNotiOn", media_noti_cb, NULL); + if (ret_val < 0) + _E("Failed to add USB notification for usb connection: %d", ret_val); } } static void remove_notification_handler(void) { - int ret; + int ret_val; if (noti_id >= 0) { - ret = remove_notification("MediaDeviceNotiOff", noti_id); - if (ret < 0) - _E("Failed to remove USB notification for usb connection: %d", ret); + ret_val = remove_notification("MediaDeviceNotiOff", noti_id); + if (ret_val < 0) + _E("Failed to remove USB notification for usb connection: %d", ret_val); else noti_id = -1; } -- 2.7.4 From d76b46fd5296c495236d62e2a3181a49e4302df5 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 19 Mar 2021 16:51:32 +0900 Subject: [PATCH 15/16] Change dbus function name Change-Id: Id55622fd2a822f38328038a9e65cf0fe83960f50 Signed-off-by: Hyotaek Shim --- plugins/iot/display/core.c | 6 +- plugins/iot/display/key-filter.c | 10 +- plugins/mobile/battery/battery-notification.c | 20 +- plugins/mobile/display/core.c | 6 +- plugins/mobile/display/key-filter.c | 8 +- plugins/tv/display/core.c | 6 +- plugins/tv/display/key-filter.c | 8 +- plugins/tv/display/state-tv.c | 10 +- plugins/wearable/display/core.c | 8 +- plugins/wearable/display/display-handler.c | 4 +- plugins/wearable/display/enhance.c | 4 +- plugins/wearable/display/hbm.c | 4 +- plugins/wearable/display/key-filter.c | 6 +- plugins/wearable/display/lbm.c | 4 +- plugins/wearable/display/swim.c | 6 +- src/apps/apps.c | 8 +- src/apps/apps.h | 2 +- src/auto-test/battery.c | 12 +- src/auto-test/brightness.c | 8 +- src/auto-test/display.c | 10 +- src/auto-test/extcon.c | 6 +- src/auto-test/ir.c | 6 +- src/auto-test/led.c | 4 +- src/auto-test/power.c | 2 +- src/auto-test/proc.c | 2 +- src/auto-test/test.h | 2 +- src/auto-test/test_dbus_interface.c | 298 +++++++++++++------------- src/auto-test/test_dbus_interface.h | 2 +- src/auto-test/time.c | 2 +- src/auto-test/udev.c | 2 +- src/battery-monitor/battery-monitor.c | 10 +- src/battery/battery-ops.h | 2 +- src/battery/battery-time.c | 6 +- src/battery/lowbat-handler.c | 4 +- src/battery/power-supply.c | 16 +- src/board/board-info.c | 4 +- src/control/control.c | 8 +- src/core/device-notifier.c | 2 +- src/core/devices.c | 6 +- src/core/event-handler.c | 4 +- src/core/main.c | 10 +- src/core/udev.c | 2 +- src/cpu/pmqos.c | 8 +- src/devicectl/devicectl.c | 24 +-- src/display/ambient-mode.c | 10 +- src/display/display-dbus.c | 48 ++--- src/display/display-lock.c | 6 +- src/display/display-signal.c | 10 +- src/display/display-signal.h | 2 +- src/display/poll.h | 2 +- src/dump/dump.c | 6 +- src/extcon/cradle.c | 6 +- src/extcon/earjack.c | 2 +- src/extcon/extcon.c | 8 +- src/extcon/hdmi.c | 6 +- src/ir/ir.c | 6 +- src/led/noti.c | 6 +- src/led/rgb.c | 10 +- src/led/torch.c | 6 +- src/led/touch-key.c | 2 +- src/libdeviced/deviced-noti.c | 12 +- src/libdeviced/display.c | 12 +- src/libdeviced/haptic.c | 2 +- src/libdeviced/led.c | 8 +- src/libdeviced/usbhost.c | 20 +- src/power-command/command.c | 6 +- src/power/boot.c | 13 +- src/power/doze.c | 2 +- src/power/power-control.c | 8 +- src/power/power-handler.c | 14 +- src/proc/cpu-info.c | 4 +- src/thermal/thermal.c | 4 +- src/time/time-handler.c | 8 +- src/touchscreen/sensitivity.c | 6 +- src/touchscreen/touchscreen.c | 4 +- src/tzip/tzip.c | 8 +- src/usb-host-test/usb-host-test.c | 24 +-- src/usb/usb-dbus.c | 8 +- src/usb/usb.c | 2 +- src/usbhost/usb-host.c | 14 +- 80 files changed, 448 insertions(+), 449 deletions(-) diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index f2a9588..ef4c534 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -268,7 +268,7 @@ static int display_brightness_changed(void *data) brt = DATA_VALUE_INT(data); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "Brightness", @@ -1041,7 +1041,7 @@ static void proc_condition_lock(PMMsg *data) if (lock_type) { /* power lock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", @@ -1095,7 +1095,7 @@ static void proc_condition_unlock(PMMsg *data) if (lock_type) { /* power unlock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", diff --git a/plugins/iot/display/key-filter.c b/plugins/iot/display/key-filter.c index 9e6e343..1cd3892 100644 --- a/plugins/iot/display/key-filter.c +++ b/plugins/iot/display/key-filter.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "ambient-mode.h" @@ -186,7 +186,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -195,7 +195,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -528,7 +528,7 @@ static void sound_vibrate_hardkey(void) /* device notify(vibrator) */ /* sound(dbus) */ /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangedHardKey signal */ - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, @@ -679,7 +679,7 @@ static int check_key_filter(void *data, int fd) _E("Same key(%d, %d) is polled [%d,%d]", code, value, old_fd, fd); } - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_INPUT, DEVICED_INTERFACE_INPUT, "key", diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c index 459f455..c116a73 100644 --- a/plugins/mobile/battery/battery-notification.c +++ b/plugins/mobile/battery/battery-notification.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "apps/apps.h" #include "core/log.h" @@ -141,7 +141,7 @@ static int launch_lowbat_noti(int capacity, int option) /* remove waring notiid*/ noti_id = noti_crit; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_var(POPUP_BUS_NAME, + ret = gdbus_call_async(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, METHOD_LOW_NOTI_OFF, @@ -165,13 +165,13 @@ static int launch_lowbat_noti(int capacity, int option) } prev_level = battery_info.warning; if (battery->charge_now) - ret = dbus_handle_method_async_var(POPUP_BUS_NAME, + ret = gdbus_call_async(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, noti_type, g_variant_new("(ss)", pa[0], pa[1])); else - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, noti_type, @@ -182,7 +182,7 @@ static int launch_lowbat_noti(int capacity, int option) /* remove waring notiid*/ noti_id = noti_low; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_var(POPUP_BUS_NAME, + ret = gdbus_call_async(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, METHOD_CRITICAL_NOTI_OFF, @@ -206,13 +206,13 @@ static int launch_lowbat_noti(int capacity, int option) } prev_level = battery_info.critical; if (battery->charge_now) - ret = dbus_handle_method_async_var(POPUP_BUS_NAME, + ret = gdbus_call_async(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, noti_type, g_variant_new("(ss)", pa[0], pa[1])); else - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, noti_type, @@ -249,7 +249,7 @@ static void clean_lowbat_noti(const char *prev, const char *str) /* remove critical notiid */ noti_id = noti_crit; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_var(POPUP_BUS_NAME, + ret = gdbus_call_async(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, METHOD_CRITICAL_NOTI_OFF, @@ -267,7 +267,7 @@ static void clean_lowbat_noti(const char *prev, const char *str) /* remove waring notiid*/ noti_id = noti_low; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_var(POPUP_BUS_NAME, + ret = gdbus_call_async(POPUP_BUS_NAME, POPUP_PATH_BATTERY, POPUP_INTERFACE_BATTERY, METHOD_LOW_NOTI_OFF, @@ -393,7 +393,7 @@ static void battery_notification_init(void *data) plugin->display_changed = display_changed; - ret = subscribe_dbus_signal(NULL, DEVICED_PATH_SYSNOTI, + ret = gdbus_signal_subscribe(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_CHARGEERR_RESPONSE, abnormal_popup_dbus_signal_handler, NULL, NULL); if (ret <= 0) _E("Failed to init dbus signal: %d", ret); diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index 2818a4f..067ed82 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -270,7 +270,7 @@ static int display_brightness_changed(void *data) brt = DATA_VALUE_INT(data); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "Brightness", @@ -1052,7 +1052,7 @@ static void proc_condition_lock(PMMsg *data) if (lock_type) { /* power lock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", @@ -1105,7 +1105,7 @@ static void proc_condition_unlock(PMMsg *data) if (lock_type) { /* power unlock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c index 93bcaaf..0c834f7 100644 --- a/plugins/mobile/display/key-filter.c +++ b/plugins/mobile/display/key-filter.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "ambient-mode.h" @@ -175,7 +175,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -184,7 +184,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -561,7 +561,7 @@ static void sound_vibrate_hardkey(void) /* device notify(vibrator) */ /* sound(dbus) */ /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangedHardKey signal */ - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c index 806237a..7d611e2 100644 --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -268,7 +268,7 @@ static int display_brightness_changed(void *data) brt = DATA_VALUE_INT(data); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "Brightness", @@ -1041,7 +1041,7 @@ static void proc_condition_lock(PMMsg *data) if (lock_type) { /* power lock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", @@ -1095,7 +1095,7 @@ static void proc_condition_unlock(PMMsg *data) if (lock_type) { /* power unlock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c index 90a94dd..2e88788 100644 --- a/plugins/tv/display/key-filter.c +++ b/plugins/tv/display/key-filter.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "ambient-mode.h" @@ -186,7 +186,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -195,7 +195,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -528,7 +528,7 @@ static void sound_vibrate_hardkey(void) /* device notify(vibrator) */ /* sound(dbus) */ /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangedHardKey signal */ - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, diff --git a/plugins/tv/display/state-tv.c b/plugins/tv/display/state-tv.c index ceb85d0..8a1fcfe 100644 --- a/plugins/tv/display/state-tv.c +++ b/plugins/tv/display/state-tv.c @@ -134,7 +134,7 @@ static int lcdon_pre(void *data) if (get_pm_cur_state() == S_STANDBY) { _I("send pre state change NORMAL"); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_PRE_CHANGE_STATE, @@ -152,7 +152,7 @@ static int lcdon_post(void *data) { int ret; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_CHANGE_STATE, @@ -226,7 +226,7 @@ static int lcdoff_post(void *data) int ret; /* broadcast to other application */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_CHANGE_STATE, @@ -306,7 +306,7 @@ static int standby_post(void *data) int ret; /* broadcast to other application */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_CHANGE_STATE, @@ -408,7 +408,7 @@ static int suspend_post(void *data) _E("Fail to change state to next_state(%s)", state_st(cond)->name); /* Broadcast pre-wakeup signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_POWER, DEVICED_INTERFACE_POWER, SIGNAL_PRE_WAKEUP, diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index ebb2c6b..b1f17a7 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -290,7 +290,7 @@ static int display_brightness_changed(void *data) brt = DATA_VALUE_INT(data); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "Brightness", @@ -1297,7 +1297,7 @@ static void proc_condition_lock(PMMsg *data) if (lock_type) { /* power lock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", @@ -1351,7 +1351,7 @@ static void proc_condition_unlock(PMMsg *data) if (lock_type) { /* power unlock signal */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", @@ -2383,7 +2383,7 @@ static void sec_dsim_uevent_changed(struct udev_device *dev) if (!fnmatch(SEC_DSIM_PATH, devpath, 0)) { action = udev_device_get_action(dev); if (!strcmp(action, UDEV_CHANGE)) { - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, DISPLAY_DETACH_STR, diff --git a/plugins/wearable/display/display-handler.c b/plugins/wearable/display/display-handler.c index 0b0c784..d4d9441 100644 --- a/plugins/wearable/display/display-handler.c +++ b/plugins/wearable/display/display-handler.c @@ -196,7 +196,7 @@ static void display_handler_init(void *data) register_notifier(DEVICE_NOTIFIER_LCD, display_state_changed); aod_clock_displayed = false; - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, DEVICED_OBJECT_PATH, DEVICED_INTERFACE_NAME, SIGNAL_HOMESCREEN, @@ -209,7 +209,7 @@ static void display_handler_init(void *data) if (ret < 0) _E("Can't write %s node.", CHARGER_LCD_NODE); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); if (ret < 0) _E("Failed to register dbus object."); } diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c index d4e0495..24c34a7 100644 --- a/plugins/wearable/display/enhance.c +++ b/plugins/wearable/display/enhance.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "display/core.h" #include "display/display-ops.h" @@ -140,7 +140,7 @@ static void enhance_init(void *data) state = enhance_update_state(); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "Enhance", diff --git a/plugins/wearable/display/hbm.c b/plugins/wearable/display/hbm.c index 376a662..d9d1be2 100644 --- a/plugins/wearable/display/hbm.c +++ b/plugins/wearable/display/hbm.c @@ -51,7 +51,7 @@ static char *hbm_path; static void broadcast_hbm_state(char *state) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, state, @@ -400,7 +400,7 @@ static void hbm_init(void *data) _I("HBM node: %s.", hbm_path); } - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); if (ret < 0) _E("Failed to register dbus object."); diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index 17ee67e..ac438cd 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "ambient-mode.h" @@ -174,7 +174,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -183,7 +183,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c index bb495a1..7e34b36 100644 --- a/plugins/wearable/display/lbm.c +++ b/plugins/wearable/display/lbm.c @@ -61,7 +61,7 @@ static void broadcast_lbm_state(int state) else str = SIGNAL_LBM_OFF; - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, str, @@ -329,7 +329,7 @@ static void lbm_init(void *data) vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_AUTOMATIC_LOW_BRIGHTNESS, lbm_mode_changed, NULL); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); if (ret < 0) _E("Failed to init dbus method, %d.", ret); diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c index eab5f88..6c510f0 100644 --- a/plugins/wearable/display/swim.c +++ b/plugins/wearable/display/swim.c @@ -25,7 +25,7 @@ #include "display/display-ops.h" #include "shared/plugin.h" -#include +#include #define DBUS_COREAPPS_SWIMMODE_PATH "/Org/Tizen/Coreapps/home/swimmode" #define DBUS_COREAPPS_SWIMMODE_INTERFACE "org.tizen.coreapps.home.swimmode" @@ -83,7 +83,7 @@ static void swimmode_signal_handler(GDBusConnection *conn, return; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Sender(%d) does not exist.", pid); return; @@ -119,7 +119,7 @@ static void swim_init(void *data) touchscreen_ops = find_device("touchscreen"); - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, DBUS_COREAPPS_SWIMMODE_PATH, DBUS_COREAPPS_SWIMMODE_INTERFACE, DBUS_SWIMMODE_MEMBER_STATUS, diff --git a/src/apps/apps.c b/src/apps/apps.c index 49ee2f5..6c33fad 100644 --- a/src/apps/apps.c +++ b/src/apps/apps.c @@ -90,7 +90,7 @@ int launch_system_app(char *type, int num, ...) va_start(args, num); - ret = dbus_handle_method_async_pairs_with_reply(app_match[match].bus, + ret = gdbus_call_pairs_async_with_reply(app_match[match].bus, app_match[match].path, app_match[match].iface, app_match[match].method, @@ -115,7 +115,7 @@ int launch_message_post(char *type) if (!type) return -EINVAL; - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, "MessagePostOn", @@ -134,7 +134,7 @@ int add_async_notification(char *type, dbus_pending_cb func, GVariant *param) if (!type) return -EINVAL; - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, type, @@ -151,7 +151,7 @@ int remove_notification(char *type, int id) if (!type || id < 0) return -EINVAL; - return dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + return gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, type, g_variant_new("(i)", id), diff --git a/src/apps/apps.h b/src/apps/apps.h index c6d7070..7ae83e3 100644 --- a/src/apps/apps.h +++ b/src/apps/apps.h @@ -20,7 +20,7 @@ #define __APPS_H__ #include -#include +#include #include "core/common.h" #include "display/poll.h" #include "display/display-ops.h" diff --git a/src/auto-test/battery.c b/src/auto-test/battery.c index cf8c138..10c44e0 100644 --- a/src/auto-test/battery.c +++ b/src/auto-test/battery.c @@ -226,7 +226,7 @@ static bool get_battery_method(const char *method, int *value) char* health = NULL; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, method, NULL, &reply); @@ -268,7 +268,7 @@ static bool get_battery_method_vconf(const char *method) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, method, NULL, &reply); @@ -315,7 +315,7 @@ static bool set_battery_low_level(int newlevel) int ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, METHOD_BATTERY_SETLOWBATLEVEL, g_variant_new("(i)", newlevel), @@ -404,7 +404,7 @@ static bool get_battery_info() bool ret = FALSE; char *reply_argv[3]; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, METHOD_BATTERY_GETINFO, NULL, &reply); @@ -703,7 +703,7 @@ static bool set_battery_power_supply(int index) power_supply_types[index].current_avg, power_supply_types[index].temperature); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, POWER_SUBSYSTEM, var, &reply); @@ -736,7 +736,7 @@ static bool get_battery_power_supply(int out_rsp[], char **out_power_source) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, METHOD_BATTERY_GET_POWERSUPPLY, NULL, &reply); diff --git a/src/auto-test/brightness.c b/src/auto-test/brightness.c index 28e559d..1acc89c 100644 --- a/src/auto-test/brightness.c +++ b/src/auto-test/brightness.c @@ -24,7 +24,7 @@ static int success, fail; static void start_udev(void) { - dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", @@ -34,7 +34,7 @@ static void start_udev(void) static void stop_udev(void) { - dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", @@ -45,7 +45,7 @@ static void stop_udev(void) static int call_display_method_sync(const char *method, GVariant *param) { int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, method, param, NULL); @@ -66,7 +66,7 @@ static void check_result(int expect_default, int expect_current) bool match_current; GVariant *reply; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "GetBrightnessInfo", NULL, &reply); diff --git a/src/auto-test/display.c b/src/auto-test/display.c index 9a9c5d4..d2b3e85 100644 --- a/src/auto-test/display.c +++ b/src/auto-test/display.c @@ -60,7 +60,7 @@ static bool get_display_method(const char *method, GVariant *param, int *out_val int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, method, param, &reply); @@ -87,7 +87,7 @@ static bool set_display_method(const char *method, GVariant *param) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, method, param, &reply); @@ -119,7 +119,7 @@ static bool set_display_method_noreply(const char *method, GVariant *var) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, method, var, &reply); @@ -158,7 +158,7 @@ static bool set_display_autobrightness_min(int min) int reply_val = 0, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_DISPLAY_SETAUTOBRIGHTNESSMIN, @@ -309,7 +309,7 @@ static bool set_display_locktimeout_expired(char *req_id) char *ret_req_id; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_DISPLAY_LOCKTIMEOUT_EXPIRED, g_variant_new("(s)", req_id), diff --git a/src/auto-test/extcon.c b/src/auto-test/extcon.c index bf8efa9..d1ad091 100644 --- a/src/auto-test/extcon.c +++ b/src/auto-test/extcon.c @@ -30,7 +30,7 @@ static bool request_extcon_method(const char *method, GVariant *param) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_EXTCON, DEVICED_INTERFACE_EXTCON, method, @@ -65,7 +65,7 @@ static bool get_sysnoti_method(const char *method) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, method, NULL, &reply); @@ -98,7 +98,7 @@ static bool get_extcon_status(char *device_name) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_EXTCON, DEVICED_INTERFACE_EXTCON, METHOD_EXTCON_GETSTATUS, diff --git a/src/auto-test/ir.c b/src/auto-test/ir.c index 87d11e0..665d75f 100644 --- a/src/auto-test/ir.c +++ b/src/auto-test/ir.c @@ -34,7 +34,7 @@ static bool request_ir_method(const char *method, const char *sig, int *param) GVariant *var = NULL; if (sig && g_variant_type_is_array(G_VARIANT_TYPE(sig))) { - var = dbus_handle_make_simple_array(sig, param); + var = gdbus_make_simple_array(sig, param); } else if (!sig && !param) { var = NULL; } else { @@ -42,7 +42,7 @@ static bool request_ir_method(const char *method, const char *sig, int *param) return FALSE; } - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_IR, DEVICED_INTERFACE_IR, method, @@ -97,7 +97,7 @@ static bool set_ir_command(char *command) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_IR_SETIRCOMMAND, diff --git a/src/auto-test/led.c b/src/auto-test/led.c index 8a4deae..1e31aa9 100755 --- a/src/auto-test/led.c +++ b/src/auto-test/led.c @@ -43,7 +43,7 @@ static bool get_led_method(const char *method) int val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, method, NULL, &msg); @@ -69,7 +69,7 @@ static bool set_led_method(const char *method, GVariant *param) int val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, method, param, &msg); diff --git a/src/auto-test/power.c b/src/auto-test/power.c index ae4d96a..09c7dd2 100644 --- a/src/auto-test/power.c +++ b/src/auto-test/power.c @@ -26,7 +26,7 @@ static bool set_reboot_method(const char *method, GVariant *param) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, method, diff --git a/src/auto-test/proc.c b/src/auto-test/proc.c index 39dad46..b76dbb4 100644 --- a/src/auto-test/proc.c +++ b/src/auto-test/proc.c @@ -26,7 +26,7 @@ static bool get_sysnoti_revision() int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, METHOD_SYSNOTI_GETREVISION, NULL, &reply); diff --git a/src/auto-test/test.h b/src/auto-test/test.h index 33e221c..17056da 100644 --- a/src/auto-test/test.h +++ b/src/auto-test/test.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/auto-test/test_dbus_interface.c b/src/auto-test/test_dbus_interface.c index ffa4e34..92d7404 100644 --- a/src/auto-test/test_dbus_interface.c +++ b/src/auto-test/test_dbus_interface.c @@ -40,7 +40,7 @@ gint test_deviced_Tzip_IsMounted(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "IsMounted", @@ -65,7 +65,7 @@ gint test_deviced_Tzip_UnmountSync(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "UnmountSync", @@ -90,7 +90,7 @@ gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "MountSync", @@ -115,7 +115,7 @@ gint test_deviced_Tzip_Unmount(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "Unmount", @@ -140,7 +140,7 @@ gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gch GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Tzip", "org.tizen.system.deviced.Tzip", "Mount", @@ -168,7 +168,7 @@ gint test_deviced_ExtCon_disable(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "disable", @@ -193,7 +193,7 @@ gint test_deviced_ExtCon_enable(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "enable", @@ -218,7 +218,7 @@ gint test_deviced_ExtCon_GetStatus(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/ExtCon", "org.tizen.system.deviced.ExtCon", "GetStatus", @@ -244,7 +244,7 @@ void test_deviced_UsbHostTest_stop(void) { int ret_dbus; GVariant *reply; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/UsbHostTest", "org.tizen.system.deviced.UsbHostTest", "stop", @@ -263,7 +263,7 @@ void test_deviced_UsbHostTest_start(void) { int ret_dbus; GVariant *reply; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/UsbHostTest", "org.tizen.system.deviced.UsbHostTest", "start", @@ -287,7 +287,7 @@ gint test_deviced_lowpower_GetState(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "GetState", @@ -312,7 +312,7 @@ gint test_deviced_lowpower_Stop(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "Stop", @@ -337,7 +337,7 @@ gint test_deviced_lowpower_Start(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/LowPower", "org.tizen.system.deviced.lowpower", "Start", @@ -365,7 +365,7 @@ gint test_deviced_ir_TransmitIR(gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Ir", "org.tizen.system.deviced.ir", "TransmitIR", @@ -390,7 +390,7 @@ gint test_deviced_ir_IRIsAvailable(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Ir", "org.tizen.system.deviced.ir", "IRIsAvailable", @@ -418,7 +418,7 @@ gint test_deviced_PowerOff_RemovePowerOffWait(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "RemovePowerOffWait", @@ -443,7 +443,7 @@ gint test_deviced_PowerOff_AddPowerOffWait(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "AddPowerOffWait", @@ -468,7 +468,7 @@ gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar * GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "PowerOffWithOption", @@ -493,7 +493,7 @@ gint test_deviced_PowerOff_PowerOff(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PowerOff", "org.tizen.system.deviced.PowerOff", "PowerOff", @@ -521,7 +521,7 @@ gint test_deviced_Battery_MiscEvent(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "MiscEvent", @@ -544,7 +544,7 @@ GVariant * test_deviced_Battery_BatteryProperties(void) { GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "BatteryProperties", @@ -562,7 +562,7 @@ gint test_deviced_Battery_ChargerCharging(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerCharging", @@ -587,7 +587,7 @@ gint test_deviced_Battery_ChargerType(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerType", @@ -611,7 +611,7 @@ GVariant * test_deviced_Battery_GetBatteryInfo(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetBatteryInfo", @@ -630,7 +630,7 @@ gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const g GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "power_supply", @@ -655,7 +655,7 @@ gchar * test_deviced_Battery_GetHealth(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetHealth", @@ -680,7 +680,7 @@ gint test_deviced_Battery_IsFull(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "IsFull", @@ -705,7 +705,7 @@ gint test_deviced_Battery_GetPercentRaw(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetPercentRaw", @@ -730,7 +730,7 @@ gint test_deviced_Battery_GetPercent(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetPercent", @@ -755,7 +755,7 @@ gint test_deviced_Battery_BatteryStatusLow(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "BatteryStatusLow", @@ -780,7 +780,7 @@ gint test_deviced_Battery_ChargeNow(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargeNow", @@ -805,7 +805,7 @@ gint test_deviced_Battery_ChargerStatus(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "ChargerStatus", @@ -830,7 +830,7 @@ gint test_deviced_Battery_GetLowbatLevel(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "GetLowbatLevel", @@ -855,7 +855,7 @@ gint test_deviced_Battery_SetLowbatLevel(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "SetLowbatLevel", @@ -880,7 +880,7 @@ gint test_deviced_Battery_TimeToEmpty(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "TimeToEmpty", @@ -905,7 +905,7 @@ gint test_deviced_Battery_TimeToFull(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Battery", "org.tizen.system.deviced.Battery", "TimeToFull", @@ -933,7 +933,7 @@ gint test_deviced_temperature_GetTemperature(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Temperature", "org.tizen.system.deviced.temperature", "GetTemperature", @@ -960,7 +960,7 @@ GVariant * test_deviced_BatteryMonitor_GetBMData(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/BatteryMonitor", "org.tizen.system.deviced.BatteryMonitor", "GetBMData", @@ -981,7 +981,7 @@ void test_deviced_core_DeviceList(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Core", "org.tizen.system.deviced.core", "DeviceList", @@ -1003,7 +1003,7 @@ GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "OpenDevice", @@ -1022,7 +1022,7 @@ gint test_deviced_Usbhost_GetDeviceListCount(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "GetDeviceListCount", @@ -1046,7 +1046,7 @@ GVariant * test_deviced_Usbhost_GetDeviceList(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "GetDeviceList", @@ -1064,7 +1064,7 @@ void test_deviced_Usbhost_PrintPolicy(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "PrintPolicy", @@ -1084,7 +1084,7 @@ void test_deviced_Usbhost_PrintDeviceList(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usbhost", "org.tizen.system.deviced.Usbhost", "PrintDeviceList", @@ -1108,7 +1108,7 @@ guint test_deviced_Usb_GetMode(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usb", "org.tizen.system.deviced.Usb", "GetMode", @@ -1133,7 +1133,7 @@ guint test_deviced_Usb_GetState(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Usb", "org.tizen.system.deviced.Usb", "GetState", @@ -1161,7 +1161,7 @@ gint test_deviced_SysNoti_GetHDMI(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetHDMI", @@ -1186,7 +1186,7 @@ gint test_deviced_SysNoti_GetCradle(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetCradle", @@ -1211,7 +1211,7 @@ gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const g GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "set_timezone", @@ -1236,7 +1236,7 @@ gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const g GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "set_datetime", @@ -1261,7 +1261,7 @@ gint test_deviced_SysNoti_GetRevision(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "GetRevision", @@ -1286,7 +1286,7 @@ gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *pa GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "udev", @@ -1311,7 +1311,7 @@ gint test_deviced_SysNoti_EventStop(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "EventStop", @@ -1336,7 +1336,7 @@ gint test_deviced_SysNoti_EventStart(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "EventStart", @@ -1361,7 +1361,7 @@ gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gch GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "getcontrol", @@ -1386,7 +1386,7 @@ gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/SysNoti", "org.tizen.system.deviced.SysNoti", "control", @@ -1414,7 +1414,7 @@ gint test_deviced_Led_SetIrCommand(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "SetIrCommand", @@ -1439,7 +1439,7 @@ gint test_deviced_Led_SetBrightness(gint param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "SetBrightness", @@ -1464,7 +1464,7 @@ gint test_deviced_Led_GetMaxBrightness(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetMaxBrightness", @@ -1489,7 +1489,7 @@ gint test_deviced_Led_GetBrightness(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetBrightness", @@ -1514,7 +1514,7 @@ gint test_deviced_Led_GetBrightnessForCamera(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led", "GetBrightnessForCamera", @@ -1542,7 +1542,7 @@ gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockTimeoutInput", @@ -1567,7 +1567,7 @@ gint test_deviced_display_LockTimeoutExpired(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockTimeoutExpired", @@ -1592,7 +1592,7 @@ gint test_deviced_display_CurrentBrightness(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CurrentBrightness", @@ -1617,7 +1617,7 @@ gint test_deviced_display_CustomBrightness(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomBrightness", @@ -1642,7 +1642,7 @@ gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint pa GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ActorControl", @@ -1667,7 +1667,7 @@ gint test_deviced_display_LCDPanelOffMode(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LCDPanelOffMode", @@ -1692,7 +1692,7 @@ gint test_deviced_display_StayTouchScreenOff(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "StayTouchScreenOff", @@ -1717,7 +1717,7 @@ gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, g GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PlatformLCDControl", @@ -1742,7 +1742,7 @@ gint test_deviced_display_CustomLCDOff(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomLCDOff", @@ -1767,7 +1767,7 @@ gint test_deviced_display_CustomLCDOn(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "CustomLCDOn", @@ -1792,7 +1792,7 @@ gint test_deviced_display_PowerKeyLCDOff(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PowerKeyLCDOff", @@ -1817,7 +1817,7 @@ gint test_deviced_display_PowerKeyIgnore(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "PowerKeyIgnore", @@ -1841,7 +1841,7 @@ void test_deviced_display_SaveLog(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SaveLog", @@ -1862,7 +1862,7 @@ gint test_deviced_display_Dumpmode(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "Dumpmode", @@ -1887,7 +1887,7 @@ gint test_deviced_display_SetRefreshRate(gint param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetRefreshRate", @@ -1912,7 +1912,7 @@ gint test_deviced_display_ReleaseBrightness(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ReleaseBrightness", @@ -1937,7 +1937,7 @@ gint test_deviced_display_HoldBrightness(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "HoldBrightness", @@ -1962,7 +1962,7 @@ gint test_deviced_display_SetBrightness(gint param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetBrightness", @@ -1987,7 +1987,7 @@ gint test_deviced_display_GetBrightness(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetBrightness", @@ -2012,7 +2012,7 @@ gint test_deviced_display_SetMaxBrightness(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "SetMaxBrightness", @@ -2037,7 +2037,7 @@ gint test_deviced_display_GetMaxBrightness(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetMaxBrightness", @@ -2062,7 +2062,7 @@ gint test_deviced_display_GetDisplayCount(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "GetDisplayCount", @@ -2087,7 +2087,7 @@ gint test_deviced_display_LockScreenBgOn(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "LockScreenBgOn", @@ -2112,7 +2112,7 @@ gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setlcdtimeout", @@ -2137,7 +2137,7 @@ gint test_deviced_display_setautobrightnessmin(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setautobrightnessmin", @@ -2162,7 +2162,7 @@ gint test_deviced_display_setframerate(gint param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setframerate", @@ -2187,7 +2187,7 @@ gint test_deviced_display_setbrightness(gint param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "setbrightness", @@ -2212,7 +2212,7 @@ gint test_deviced_display_getbrightness(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "getbrightness", @@ -2237,7 +2237,7 @@ gint test_deviced_display_ChangeState(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "ChangeState", @@ -2262,7 +2262,7 @@ gint test_deviced_display_changestate(const gchar *param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "changestate", @@ -2287,7 +2287,7 @@ gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "unlockstate", @@ -2312,7 +2312,7 @@ gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, co GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "lockstate", @@ -2336,7 +2336,7 @@ void test_deviced_display_stop(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "stop", @@ -2356,7 +2356,7 @@ void test_deviced_display_start(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display", "org.tizen.system.deviced.display", "start", @@ -2378,7 +2378,7 @@ GVariant * test_deviced_Board_GetNum(void) { GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetNum", @@ -2397,7 +2397,7 @@ gint test_deviced_Board_GetHWRev(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetHWRev", @@ -2420,7 +2420,7 @@ GVariant * test_deviced_Board_GetSerial(void) { GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Board", "org.tizen.system.deviced.Board", "GetSerial", @@ -2442,7 +2442,7 @@ gint test_deviced_PmQos_MyfilesScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MyfilesScroll", @@ -2467,7 +2467,7 @@ gint test_deviced_PmQos_CallLogScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CallLogScroll", @@ -2492,7 +2492,7 @@ gint test_deviced_PmQos_TizenStoreScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "TizenStoreScroll", @@ -2517,7 +2517,7 @@ gint test_deviced_PmQos_ContactScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ContactScroll", @@ -2542,7 +2542,7 @@ gint test_deviced_PmQos_EmailScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "EmailScroll", @@ -2567,7 +2567,7 @@ gint test_deviced_PmQos_VideoScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "VideoScroll", @@ -2592,7 +2592,7 @@ gint test_deviced_PmQos_FileScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "FileScroll", @@ -2617,7 +2617,7 @@ gint test_deviced_PmQos_MusicScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MusicScroll", @@ -2642,7 +2642,7 @@ gint test_deviced_PmQos_UgLaunch(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "UgLaunch", @@ -2667,7 +2667,7 @@ gint test_deviced_PmQos_SensorWakeup(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SensorWakeup", @@ -2692,7 +2692,7 @@ gint test_deviced_PmQos_WebAppFlick(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebAppFlick", @@ -2717,7 +2717,7 @@ gint test_deviced_PmQos_WebAppDrag(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebAppDrag", @@ -2742,7 +2742,7 @@ gint test_deviced_PmQos_PowerOff(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "PowerOff", @@ -2767,7 +2767,7 @@ gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WifiThroughput", @@ -2792,7 +2792,7 @@ gint test_deviced_PmQos_WebappLaunch(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "WebappLaunch", @@ -2817,7 +2817,7 @@ gint test_deviced_PmQos_SVoice(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SVoice", @@ -2842,7 +2842,7 @@ gint test_deviced_PmQos_SmemoZoom(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "SmemoZoom", @@ -2867,7 +2867,7 @@ gint test_deviced_PmQos_ScreenMirroring(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ScreenMirroring", @@ -2892,7 +2892,7 @@ gint test_deviced_PmQos_ReservedMode(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ReservedMode", @@ -2917,7 +2917,7 @@ gint test_deviced_PmQos_ProcessCrashed(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ProcessCrashed", @@ -2942,7 +2942,7 @@ gint test_deviced_PmQos_PowerSaving(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "PowerSaving", @@ -2967,7 +2967,7 @@ gint test_deviced_PmQos_MusicPlayLcdOn(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MusicPlayLcdOn", @@ -2992,7 +2992,7 @@ gint test_deviced_PmQos_MtpSendFile(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "MtpSendFile", @@ -3017,7 +3017,7 @@ gint test_deviced_PmQos_LowBattery(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "LowBattery", @@ -3042,7 +3042,7 @@ gint test_deviced_PmQos_LockScreen(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "LockScreen", @@ -3067,7 +3067,7 @@ gint test_deviced_PmQos_IMEInput(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "IMEInput", @@ -3092,7 +3092,7 @@ gint test_deviced_PmQos_ImageViewer(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ImageViewer", @@ -3117,7 +3117,7 @@ gint test_deviced_PmQos_HomeScreen(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "HomeScreen", @@ -3142,7 +3142,7 @@ gint test_deviced_PmQos_GpuWakeup(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpuWakeup", @@ -3167,7 +3167,7 @@ gint test_deviced_PmQos_GpuBoost(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpuBoost", @@ -3192,7 +3192,7 @@ gint test_deviced_PmQos_GpsSerialCno(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GpsSerialCno", @@ -3217,7 +3217,7 @@ gint test_deviced_PmQos_GetDefaultLockTime(void) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GetDefaultLockTime", @@ -3242,7 +3242,7 @@ gint test_deviced_PmQos_GalleryRotation(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GalleryRotation", @@ -3267,7 +3267,7 @@ gint test_deviced_PmQos_GalleryScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "GalleryScroll", @@ -3292,7 +3292,7 @@ gint test_deviced_PmQos_Emergency(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "Emergency", @@ -3317,7 +3317,7 @@ gint test_deviced_PmQos_ContactSearch(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "ContactSearch", @@ -3342,7 +3342,7 @@ gint test_deviced_PmQos_CameraSoundAndShot(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraSoundAndShot", @@ -3367,7 +3367,7 @@ gint test_deviced_PmQos_CameraRecording(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraRecording", @@ -3392,7 +3392,7 @@ gint test_deviced_PmQos_CameraPreview(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraPreview", @@ -3417,7 +3417,7 @@ gint test_deviced_PmQos_CameraCaptureAtRec(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraCaptureAtRec", @@ -3442,7 +3442,7 @@ gint test_deviced_PmQos_CameraBurstShot(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CameraBurstShot", @@ -3467,7 +3467,7 @@ gint test_deviced_PmQos_CallSound(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "CallSound", @@ -3492,7 +3492,7 @@ gint test_deviced_PmQos_BrowserScroll(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserScroll", @@ -3517,7 +3517,7 @@ gint test_deviced_PmQos_BrowserLoading(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserLoading", @@ -3542,7 +3542,7 @@ gint test_deviced_PmQos_BrowserJavaScript(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserJavaScript", @@ -3567,7 +3567,7 @@ gint test_deviced_PmQos_BrowserDash(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BrowserDash", @@ -3592,7 +3592,7 @@ gint test_deviced_PmQos_Browser(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "Browser", @@ -3617,7 +3617,7 @@ gint test_deviced_PmQos_BeautyShot(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "BeautyShot", @@ -3642,7 +3642,7 @@ gint test_deviced_PmQos_AppLaunchHome(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "AppLaunchHome", @@ -3667,7 +3667,7 @@ gint test_deviced_PmQos_AppLaunch(gint param1) GVariant *reply; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced", + ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/PmQos", "org.tizen.system.deviced.PmQos", "AppLaunch", @@ -3682,4 +3682,4 @@ gint test_deviced_PmQos_AppLaunch(gint param1) g_variant_unref(reply); return val1; -} \ No newline at end of file +} diff --git a/src/auto-test/test_dbus_interface.h b/src/auto-test/test_dbus_interface.h index 28332cc..fdab751 100644 --- a/src/auto-test/test_dbus_interface.h +++ b/src/auto-test/test_dbus_interface.h @@ -20,7 +20,7 @@ #ifndef __TEST_DBUS_INTERFACE_H__ #define __TEST_DBUS_INTERFACE_H__ -#include +#include // headers gint test_deviced_Tzip_IsMounted(const gchar *param1); diff --git a/src/auto-test/time.c b/src/auto-test/time.c index 5313995..7078aa1 100755 --- a/src/auto-test/time.c +++ b/src/auto-test/time.c @@ -26,7 +26,7 @@ static bool request_sysnoti_method(const char *method, GVariant *param) int reply_val, ret_dbus; bool ret = FALSE; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, method, diff --git a/src/auto-test/udev.c b/src/auto-test/udev.c index 06d047c..2a341fb 100644 --- a/src/auto-test/udev.c +++ b/src/auto-test/udev.c @@ -30,7 +30,7 @@ static int udev(int index) GVariant *reply; int ret = 0, reply_val = 0, ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, "udev", diff --git a/src/battery-monitor/battery-monitor.c b/src/battery-monitor/battery-monitor.c index f6168dc..3e693fd 100644 --- a/src/battery-monitor/battery-monitor.c +++ b/src/battery-monitor/battery-monitor.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include "battery-monitor.h" @@ -530,11 +530,11 @@ static void bm_init(void *data) if (!ht_apptime) _E("Failed to init hash table"); - ret = dbus_handle_add_dbus_object(NULL, DBUS_DEVICED_BM_PATH, &bm_dbus_interface); + ret = gdbus_add_object(NULL, DBUS_DEVICED_BM_PATH, &bm_dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); - dbus_sub_id = subscribe_dbus_signal(NULL, + dbus_sub_id = gdbus_signal_subscribe(NULL, "/Org/Tizen/Aul/AppStatus", "org.tizen.aul.AppStatus", "AppStatusChange", @@ -548,12 +548,12 @@ static void bm_exit(void *data) { int ret; - ret = dbus_handle_unregister_dbus_object(NULL, DBUS_DEVICED_BM_PATH); + ret = gdbus_unregister_object(NULL, DBUS_DEVICED_BM_PATH); if (ret < 0) _E("Failed to unregister dbus object: %d", ret); if (dbus_sub_id > 0) - unsubscribe_dbus_signal(NULL, dbus_sub_id); + gdbus_signal_unsubscribe(NULL, dbus_sub_id); dbus_sub_id = 0; bm_data_init(); diff --git a/src/battery/battery-ops.h b/src/battery/battery-ops.h index dc30a69..b9be61b 100644 --- a/src/battery/battery-ops.h +++ b/src/battery/battery-ops.h @@ -23,7 +23,7 @@ #include #include "core/common.h" #include "power-supply.h" -#include +#include struct battery_ops { char *name; diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c index 7e12b30..74718c0 100644 --- a/src/battery/battery-time.c +++ b/src/battery/battery-time.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "core/common.h" #include "core/devices.h" @@ -226,7 +226,7 @@ static void broadcast_battery_time(char *signal, int time) if (!signal) return; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, signal, @@ -417,7 +417,7 @@ static void battery_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c index 3e280bc..783499d 100644 --- a/src/battery/lowbat-handler.c +++ b/src/battery/lowbat-handler.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "lowbat-handler.h" @@ -714,7 +714,7 @@ static void lowbat_init(void *data) register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); register_notifier(DEVICE_NOTIFIER_POWER_SUPPLY, lowbat_monitor_init); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); } diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index edb8e7b..f42b8aa 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -144,7 +144,7 @@ static int power_supply_broadcast_str(char *sig, char *status) str = status; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, sig, @@ -168,7 +168,7 @@ static void pm_check_and_change(int bInserted) static void health_status_broadcast(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, SIGNAL_TEMP_GOOD, @@ -224,7 +224,7 @@ static int send_full_noti(enum charge_full_type state) switch (state) { case CHARGING_FULL: for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_FULL_NOTI_ON, @@ -240,7 +240,7 @@ static int send_full_noti(enum charge_full_type state) if (noti_id <= 0) return -EPERM; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_FULL_NOTI_OFF, @@ -282,7 +282,7 @@ static int send_charge_noti(void) int retry; for (retry = RETRY_MAX; retry > 0; retry--) { - ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME, + ret = gdbus_call_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_CHARGE_NOTI_ON, @@ -353,7 +353,7 @@ int power_supply_broadcast(char *sig, int status) snprintf(sig_old, sizeof(sig_old), "%s", sig); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, sig, @@ -1277,7 +1277,7 @@ static GVariant *dbus_power_supply_handler(GDBusConnection *conn, goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Process(%d) does not exist, dbus ignored.", pid); ret = -ESRCH; @@ -1696,7 +1696,7 @@ static void power_supply_init(void *data) register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); register_notifier(DEVICE_NOTIFIER_EVENT_HANDLER, event_handler_state_changed); - ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); + ret_dbus = gdbus_add_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface); if (ret_dbus < 0) _E("Failed to init dbus method: %d", ret_dbus); diff --git a/src/board/board-info.c b/src/board/board-info.c index e8d2218..eb2710d 100644 --- a/src/board/board-info.c +++ b/src/board/board-info.c @@ -17,7 +17,7 @@ */ -#include +#include #include "core/log.h" #include "core/devices.h" @@ -162,7 +162,7 @@ static void board_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BOARD, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_BOARD, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); } diff --git a/src/control/control.c b/src/control/control.c index 87f5801..66d564a 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "core/log.h" #include "core/common.h" @@ -130,7 +130,7 @@ static GVariant *dbus_control_handler(GDBusConnection *conn, goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Process(%d) does not exist. Dbus ignored.", pid); ret = -ESRCH; @@ -161,7 +161,7 @@ static GVariant *dbus_get_control_handler(GDBusConnection *conn, goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Process(%d) does not exist. Dbus ignored.", pid); ret = -ESRCH; @@ -192,7 +192,7 @@ static void control_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/core/device-notifier.c b/src/core/device-notifier.c index f606525..6b7ddc7 100644 --- a/src/core/device-notifier.c +++ b/src/core/device-notifier.c @@ -21,7 +21,7 @@ #include "device-notifier.h" #include "common.h" #include "core/devices.h" -#include +#include #include struct device_notifier { diff --git a/src/core/devices.c b/src/core/devices.c index da86123..f12e557 100644 --- a/src/core/devices.c +++ b/src/core/devices.c @@ -18,7 +18,7 @@ #include -#include +#include #include "log.h" #include "common.h" @@ -126,12 +126,12 @@ void devices_init(void *data) dev->init(data); } - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_CORE, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_CORE, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); /* register every objects */ - if (dbus_handle_register_dbus_object_all(NULL) < 0) + if (gdbus_register_object_all(NULL) < 0) _E("Failed to register dbus method: %d", ret); } diff --git a/src/core/event-handler.c b/src/core/event-handler.c index e5ecec4..7629d59 100644 --- a/src/core/event-handler.c +++ b/src/core/event-handler.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "common.h" #include "devices.h" @@ -91,7 +91,7 @@ static void event_handler_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &eh_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &eh_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/core/main.c b/src/core/main.c index 0201395..3c957e4 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -111,7 +111,7 @@ static int deviced_main(int argc, char **argv) return 0; } - handle = dbus_handle_get_connection(G_BUS_TYPE_SYSTEM, FALSE); + handle = gdbus_get_connection(G_BUS_TYPE_SYSTEM, FALSE); if (!handle) _E("Failed to get dbus connection."); @@ -121,10 +121,10 @@ static int deviced_main(int argc, char **argv) devices_init(NULL); - ret = dbus_handle_request_bus_name(handle, DEVICED_BUS_NAME, deviced_dbus_name_acquired, NULL); + ret = gdbus_request_name(handle, DEVICED_BUS_NAME, deviced_dbus_name_acquired, NULL); if (ret <= 0) { _E("Failed to request bus name."); - dbus_handle_check_owner_name(NULL, DEVICED_BUS_NAME); + gdbus_check_name_owner(NULL, DEVICED_BUS_NAME); } signal(SIGTERM, sig_quit); diff --git a/src/core/udev.c b/src/core/udev.c index 008ebf2..9209c2b 100644 --- a/src/core/udev.c +++ b/src/core/udev.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "log.h" diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c index b232288..ebf387e 100644 --- a/src/cpu/pmqos.c +++ b/src/cpu/pmqos.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "core/log.h" @@ -47,7 +47,7 @@ static int pmqos_cpu_request(const char *name, int val) if (val > 0) { _D("Set pm scenario. Lock %s.", name); - ret = dbus_handle_method_async_var(PASS_BUS_NAME, + ret = gdbus_call_async(PASS_BUS_NAME, PASS_PATH_PMQOS, PASS_INTERFACE_PMQOS, PASS_METHOD_SET_SCENARIO, @@ -217,7 +217,7 @@ static int booting_done(void *data) goto out; _I("Booting done."); - ret = dbus_handle_register_dbus_object_all(NULL); + ret = gdbus_register_object_all(NULL); if (ret < 0) _E("Failed to register dbus method: %d", ret); @@ -239,7 +239,7 @@ static void pmqos_init(void *data) int ret; /* register dbus methods */ - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_PMQOS, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_PMQOS, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/devicectl/devicectl.c b/src/devicectl/devicectl.c index 80cb678..143da13 100644 --- a/src/devicectl/devicectl.c +++ b/src/devicectl/devicectl.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "usb.h" @@ -71,7 +71,7 @@ static int start_device(char **args) printf("Start %s device.\n", args[1]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "start", @@ -95,7 +95,7 @@ static int stop_device(char **args) printf("Stop %s device.\n", args[1]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "stop", @@ -122,7 +122,7 @@ static int dump_mode(char **args) printf("%s (%s %s).\n", args[1], args[2], args[3]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "Dumpmode", @@ -158,7 +158,7 @@ static int display_state(char **args) printf("%s (%s %s)!\n", args[1], args[2], args[3]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "changestate", @@ -192,7 +192,7 @@ static int save_log(char **args) printf("Save log %s device.\n", args[1]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "SaveLog", @@ -243,7 +243,7 @@ static int save_dbus_name(char **args) printf("Save dbus name.\n"); - ret_dbus = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DBUS_BUS_NAME, DBUS_OBJECT_PATH, DBUS_INTERFACE_NAME, "ListNames", @@ -263,7 +263,7 @@ static int save_dbus_name(char **args) printf("%" G_GSIZE_FORMAT " connections.\n", g_variant_iter_n_children(iter)); while (g_variant_iter_loop(iter, "s", &str)) { - pid = dbus_handle_get_sender_pid(NULL, str); + pid = gdbus_get_sender_pid(NULL, str); get_pname(pid, pname); printf("%6d %6s %s\n", pid, str, pname); } @@ -284,7 +284,7 @@ static int device_list(char **args) printf("Print %s to dlog.\n", args[1]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "DeviceList", @@ -321,7 +321,7 @@ static int enable_device(char **args) printf("Enable %s device.\n", args[3]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "enable", @@ -356,7 +356,7 @@ static int disable_device(char **args) printf("Disable %s device.\n", args[3]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "disable", @@ -391,7 +391,7 @@ static int power_operation(char **args, char *type) printf("Power %s device.\n", args[2]); - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, devices[arg_id].path, devices[arg_id].iface, "PowerOff", diff --git a/src/display/ambient-mode.c b/src/display/ambient-mode.c index 5fecba8..8ab6f4c 100644 --- a/src/display/ambient-mode.c +++ b/src/display/ambient-mode.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "util.h" #include "core.h" @@ -57,7 +57,7 @@ void broadcast_ambient_state(int state) char *signal; signal = (state == true ? SIGNAL_ALPM_ON : SIGNAL_ALPM_OFF); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -219,7 +219,7 @@ static void homescreen_signal_handler(GDBusConnection *conn, } _D("screen : %s", screen); - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (!strncmp(screen, CLOCK_START, strlen(CLOCK_START))) ambient_start_clock(); @@ -271,7 +271,7 @@ static void ambient_init(void *data) vconf_notify_key_changed("db/starter/always_on_display", ambient_set_condition, NULL); } - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, DEVICED_OBJECT_PATH, DEVICED_INTERFACE_NAME, SIGNAL_HOMESCREEN, @@ -280,7 +280,7 @@ static void ambient_init(void *data) if (ret <= 0) _E("Failed to register signal handler: %d", ret); - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, DEVICED_OBJECT_PATH, DEVICED_INTERFACE_NAME, SIGNAL_ALPMLCDOFF, diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c index b653706..2c5c101 100644 --- a/src/display/display-dbus.c +++ b/src/display/display-dbus.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "ambient-mode.h" @@ -87,7 +87,7 @@ static GVariant *dbus_start(GDBusConnection *conn, display_device_ops->start(CORE_LOGIC_MODE); out: - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static GVariant *dbus_stop(GDBusConnection *conn, @@ -106,7 +106,7 @@ static GVariant *dbus_stop(GDBusConnection *conn, display_device_ops->stop(CORE_LOGIC_MODE); out: - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static GVariant *dbus_lockstate(GDBusConnection *conn, @@ -134,7 +134,7 @@ static GVariant *dbus_lockstate(GDBusConnection *conn, if (!strcmp(state_str, "privilege check")) goto out; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("%d process does not exist, dbus ignored!", pid); ret = -ESRCH; @@ -224,7 +224,7 @@ static GVariant *dbus_unlockstate(GDBusConnection *conn, if (!strcmp(state_str, "privilege check")) goto out; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("%d process does not exist, dbus ignored!", pid); ret = -ESRCH; @@ -288,7 +288,7 @@ static GVariant *dbus_changestate(GDBusConnection *conn, if (!strcmp(state_str, "privilege check")) goto out; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("%d process does not exist, dbus ignored!", pid); ret = -ESRCH; @@ -493,7 +493,7 @@ static GVariant *dbus_setbrightness(GDBusConnection *conn, } else ret = -EINVAL; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Set brightness pid=%d brt=%d ret=%d", pid, brt, ret); error: @@ -548,7 +548,7 @@ static GVariant *dbus_holdbrightness(GDBusConnection *conn, _E("Failed to set vconf value for automatic brightness: %d", vconf_get_ext_errno()); } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Hold brightness pid=%d brt=%d ret=%d", pid, brt, ret); error: @@ -562,7 +562,7 @@ static GVariant *dbus_releasebrightness(GDBusConnection *conn, int bat, charger, changed, setting, brt, autobrt, ret = 0; pid_t pid; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Release brightness pid=%d", pid); ret = vconf_get_int(VCONFKEY_SYSMAN_BATTERY_STATUS_LOW, &bat); @@ -685,7 +685,7 @@ static GVariant *dbus_setautobrightnessmin(GDBusConnection *conn, } g_variant_get(param, "(i)", &val); - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("%d process does not exist, dbus ignored!", pid); ret = -ESRCH; @@ -697,7 +697,7 @@ static GVariant *dbus_setautobrightnessmin(GDBusConnection *conn, goto error; } if (display_info.reset_autobrightness_min) { - id = dbus_handle_watch_name(sender, display_info.reset_autobrightness_min, NULL, NULL, NULL); + id = gdbus_watch_name(sender, display_info.reset_autobrightness_min, NULL, NULL, NULL); if (id <= 0) { _E("failed to watch name %s, id %d", sender, id); //todo: set return value @@ -718,7 +718,7 @@ static GVariant *dbus_setlcdtimeout(GDBusConnection *conn, g_variant_get(param, "(iii)", &on, &dim, &holdkey_block); - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("%d process does not exist, dbus ignored!", pid); ret = -ESRCH; @@ -729,7 +729,7 @@ static GVariant *dbus_setlcdtimeout(GDBusConnection *conn, if (ret) { _W("fail to set lcd timeout %d by %d", ret, pid); } else { - id = dbus_handle_watch_name(sender, reset_lcd_timeout, NULL, NULL, NULL); + id = gdbus_watch_name(sender, reset_lcd_timeout, NULL, NULL, NULL); if (id <= 0) { _E("failed to watch name %s, id %d", sender, id); //todo: set return value @@ -798,7 +798,7 @@ static GVariant *dbus_savelog(GDBusConnection *conn, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { pm_save_logdump(); - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static GVariant *dbus_powerkeyignore(GDBusConnection *conn, @@ -838,7 +838,7 @@ static GVariant *dbus_customlcdon(GDBusConnection *conn, int timeout, lcdon_blocked; pid_t pid; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Change state to S_LCDON pid=%d", pid); g_variant_get(param, "(i)", &timeout); @@ -863,7 +863,7 @@ static GVariant *dbus_customlcdoff(GDBusConnection *conn, char *reason_str = NULL; pid_t pid; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Change state to S_LCDOFF pid=%d", pid); g_variant_get(param, "(s)", &reason_str); @@ -911,7 +911,7 @@ static GVariant *dbus_changestatebyreason(GDBusConnection *conn, ret = -EINVAL; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Change state pid=%d state=%s reason=%s ret=%d", pid, state, reason, ret); g_free(reason); @@ -926,7 +926,7 @@ static GVariant *dbus_staytouchscreenoff(GDBusConnection *conn, int val; pid_t pid; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Stay touchscreen off pid=%d", pid); g_variant_get(param, "(i)", &val); @@ -944,7 +944,7 @@ static GVariant *dbus_lcdpaneloffmode(GDBusConnection *conn, int val; pid_t pid; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); _I("Set lcd panel off mode pid=%d", pid); g_variant_get(param, "(i)", &val); @@ -1043,7 +1043,7 @@ static GVariant *dbus_locktimeout_expired(GDBusConnection *conn, g_variant_get(param, "(s)", &req_id); - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("%d process does not exist, dbus ignored!", pid); ret = -ESRCH; @@ -1203,7 +1203,7 @@ static GVariant *dbus_dimstay_control(GDBusConnection *conn, goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (dimstay) { _I("Set DIM_FLAG pid=%d", pid); set_pm_status_flag(DIM_FLAG); @@ -1360,12 +1360,12 @@ int init_pm_dbus(void) display_add_actor(&display_api_actor); display_add_actor(&display_gesture_actor); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface); if (ret < 0) _E("fail to init dbus method(%d)", ret); - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, AUL_APPSTATUS_PATH, AUL_APPSTATUS_INTERFACE, APP_CHANGE_STATE, @@ -1374,7 +1374,7 @@ int init_pm_dbus(void) if (ret <= 0) _E("Failed to register signal handler: %d", ret); - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, AUL_APPSTATUS_PATH, AUL_APPSTATUS_INTERFACE, APP_TERMINATED, diff --git a/src/display/display-lock.c b/src/display/display-lock.c index 60b093a..641aede 100644 --- a/src/display/display-lock.c +++ b/src/display/display-lock.c @@ -81,7 +81,7 @@ static void broadcast_pmlock_expired(pid_t pid, enum state_t state, const char* CRITICAL_LOG("%s(%d) has held %s lock for a long time(%.0f s).", appid ? appid : "NULL", pid, state_st(state)->name + 2, diff); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "pmlock_expired", @@ -173,7 +173,7 @@ static gboolean default_pmlock_check(void *data) return G_SOURCE_REMOVE; } - ret = dbus_handle_method_async_with_reply_var(RESOURCED_BUS_NAME, + ret = gdbus_call_async_with_reply(RESOURCED_BUS_NAME, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, METHOD_APP_STATUS, @@ -364,7 +364,7 @@ void print_node(int next) if (diff > LOCK_TIME_WARNING) { if (diff > LOCK_TIME_WARNING * 60 && n->pid < INTERNAL_LOCK_BASE && n->broadcast_warning) { - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "pmlock_over", diff --git a/src/display/display-signal.c b/src/display/display-signal.c index 67c3877..ddb02df 100644 --- a/src/display/display-signal.c +++ b/src/display/display-signal.c @@ -48,7 +48,7 @@ void broadcast_pm_suspend(void) pmstate_suspend = PM_SUSPEND; now = clock_gettime_to_long(); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "sleep", @@ -69,7 +69,7 @@ void broadcast_pm_wakeup(void) pmstate_suspend = PM_WAKEUP; now = clock_gettime_to_long(); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "wakeup", @@ -103,7 +103,7 @@ void broadcast_lcd_on(enum signal_type type, enum device_flags flags) signal = lcdon_sig_lookup[type]; _I("lcdstep : Broadcast signal(%s:%s).", signal, str); - ret = dbus_handle_emit_dbus_signal_sync(NULL, + ret = gdbus_signal_emit_sync(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -136,7 +136,7 @@ void broadcast_lcd_off(enum signal_type type, enum device_flags flags) str = disp_plgn->device_flags_to_string(flags); _I("lcdstep : Broadcast signal(%s).", signal); - ret = dbus_handle_emit_dbus_signal_sync(NULL, + ret = gdbus_signal_emit_sync(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -165,7 +165,7 @@ void set_process_active(bool flag, pid_t pid) return; /* Send dbus signal to resourced */ - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, RESOURCED_METHOD_ACTIVE, diff --git a/src/display/display-signal.h b/src/display/display-signal.h index f68b0b2..6589590 100644 --- a/src/display/display-signal.h +++ b/src/display/display-signal.h @@ -20,7 +20,7 @@ #define __DISPLAY_SIGNAL_H__ #include -#include +#include #include "util.h" #include "core/devices.h" diff --git a/src/display/poll.h b/src/display/poll.h index 2a7dd4b..662b0f3 100644 --- a/src/display/poll.h +++ b/src/display/poll.h @@ -27,7 +27,7 @@ #define __PM_POLL_H__ #include -#include +#include /** * @addtogroup POWER_MANAGER * @{ diff --git a/src/dump/dump.c b/src/dump/dump.c index 3f70f9e..a86136e 100644 --- a/src/dump/dump.c +++ b/src/dump/dump.c @@ -23,7 +23,7 @@ #include "core/log.h" #include "core/common.h" #include "core/devices.h" -#include +#include #include #define SERVICE_NAME "deviced" @@ -39,7 +39,7 @@ static void send_dump_signal(char *signal) pid = getpid(); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DUMP_SERVICE_OBJECT_PATH, DUMP_SERVICE_INTERFACE_NAME, signal, @@ -117,7 +117,7 @@ static void dump_init(void *data) int ret; /* register dump signal */ - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, DUMP_SERVICE_OBJECT_PATH, DUMP_SERVICE_INTERFACE_NAME, DUMP_SIGNAL, diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c index 382dcde..023d638 100644 --- a/src/extcon/cradle.c +++ b/src/extcon/cradle.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "core/log.h" #include "core/device-notifier.h" @@ -46,7 +46,7 @@ static void cradle_send_broadcast(int status) _I("Broadcast cradle status(%d).", status); old = status; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_CRADLE_STATE, @@ -127,7 +127,7 @@ static void cradle_init(void *data) register_notifier(DEVICE_NOTIFIER_LCD, display_changed); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); } diff --git a/src/extcon/earjack.c b/src/extcon/earjack.c index 0b89fb5..adce493 100644 --- a/src/extcon/earjack.c +++ b/src/extcon/earjack.c @@ -43,7 +43,7 @@ static void earjack_send_broadcast(int status) _I("Broadcast earjack status(%d).", status); old = status; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_EARJACK_STATE, diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c index 8f698c6..1c28ceb 100644 --- a/src/extcon/extcon.c +++ b/src/extcon/extcon.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "core/log.h" @@ -120,7 +120,7 @@ static int extcon_update(const char *name, const char *index, const char *value) if (dev->enabled == false && strncmp(name, "USB", strlen("USB")) == 0) { if (status > 0) { snprintf(buf, BUF_MAX, "usb-client"); - ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICEMANAGER_BUS_NAME, DEVICEMANAGER_PATH_POPUP, DEVICEMANAGER_INTERFACE_POPUP, METHOD_SYSPOPUP_SHOW, @@ -183,7 +183,7 @@ int extcon_disable_device(const char *name) return -ENODEV; snprintf(buf, BUF_MAX, "usb-client"); - ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICEMANAGER_BUS_NAME, DEVICEMANAGER_PATH_POPUP, DEVICEMANAGER_INTERFACE_POPUP, METHOD_SYSPOPUP_SHOW, @@ -486,7 +486,7 @@ static void extcon_init(void *data) event_handler_state_changed((void *)&state); - ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface); + ret_dbus = gdbus_add_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface); if (ret_dbus < 0) _E("Failed to init dbus method: %d", ret_dbus); diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c index 02e91bd..e5bb737 100644 --- a/src/extcon/hdmi.c +++ b/src/extcon/hdmi.c @@ -18,7 +18,7 @@ #include -#include +#include #include #include "core/log.h" #include "core/bitmap.h" @@ -48,7 +48,7 @@ static void hdmi_send_broadcast(int status) _I("Broadcast hdmi status(%d)", status); old = status; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_HDMI_STATE, @@ -189,7 +189,7 @@ static void hdmi_init(void *data) register_notifier(DEVICE_NOTIFIER_LCD, display_changed); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/ir/ir.c b/src/ir/ir.c index 91b56d4..05f9a0e 100644 --- a/src/ir/ir.c +++ b/src/ir/ir.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "core/devices.h" #include "core/common.h" #include "core/log.h" @@ -147,11 +147,11 @@ static void ir_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_IR, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_IR, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_LED, &dbus_interface_legacy); + ret = gdbus_add_object(NULL, DEVICED_PATH_LED, &dbus_interface_legacy); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/led/noti.c b/src/led/noti.c index bac00b6..2c706b2 100644 --- a/src/led/noti.c +++ b/src/led/noti.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "core/log.h" @@ -36,7 +36,7 @@ int ongoing_show(void) return 0; } - ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, METHOD_TORCH_NOTI_ON, @@ -59,7 +59,7 @@ int ongoing_clear(void) return 0; } - ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME, POPUP_PATH_LED, POPUP_INTERFACE_LED, METHOD_TORCH_NOTI_OFF, diff --git a/src/led/rgb.c b/src/led/rgb.c index ec4d96f..2e4b45b 100644 --- a/src/led/rgb.c +++ b/src/led/rgb.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "core/log.h" @@ -216,7 +216,7 @@ static GVariant *dbus_playcustom(GDBusConnection *conn, g_variant_get(param, "(iiuu)", &on, &off, &color, &flags); - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Sender(%d) does not exist.", pid); ret = -EINVAL; @@ -256,7 +256,7 @@ static GVariant *dbus_stopcustom(GDBusConnection *conn, pid_t pid; static pid_t old_pid; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Sender(%d) does not exist.", pid); ret = -EINVAL; @@ -308,7 +308,7 @@ static GVariant *dbus_multi_led_control(GDBusConnection *conn, static pid_t old_pid; struct led_state state; - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Sender(%d) does not exist.", pid); ret = -EINVAL; @@ -388,7 +388,7 @@ static void rgb_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_LED, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_LED, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/led/torch.c b/src/led/torch.c index 752174c..a9304eb 100644 --- a/src/led/torch.c +++ b/src/led/torch.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "core/log.h" #include "core/devices.h" @@ -45,7 +45,7 @@ static void flash_state_broadcast(int val) { int ret; - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, SIGNAL_FLASH_STATE, @@ -176,7 +176,7 @@ static void torch_init(void *data) int ret; /* init dbus interface */ - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_LED, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_LED, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); } diff --git a/src/led/touch-key.c b/src/led/touch-key.c index dfd865b..f816d9c 100644 --- a/src/led/touch-key.c +++ b/src/led/touch-key.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "core/log.h" #include "core/devices.h" diff --git a/src/libdeviced/deviced-noti.c b/src/libdeviced/deviced-noti.c index 5496e66..401a365 100644 --- a/src/libdeviced/deviced-noti.c +++ b/src/libdeviced/deviced-noti.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "dd-deviced.h" #include "deviced-priv.h" @@ -59,7 +59,7 @@ static int dbus_proc_handler(char* type, char *buf) GVariant *reply; int reply_val, ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_PROCESS, DEVICED_INTERFACE_PROCESS, type, @@ -114,7 +114,7 @@ static int dbus_power_handler(char* type) GVariant *reply; int reply_val, ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", @@ -159,7 +159,7 @@ static int dbus_time_handler(char* type, char* buf) if (ret_val != 0) snprintf(name, sizeof(name), "%d", pid); - ret_val = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_val = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, type, @@ -194,7 +194,7 @@ static int alarm_set_time(time_t timet) snprintf(name, sizeof(name), "%d", pid); _SI("[%s]start %s %ld.", name, ALARM_INTERFACE_NAME, timet); - ret_val = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME, + ret_val = gdbus_call_sync_with_reply(ALARM_BUS_NAME, ALARM_PATH_NAME, ALARM_INTERFACE_NAME, ALARM_SET_TIME_METHOD, @@ -239,7 +239,7 @@ static int dbus_cpu_handler(char* type, char* buf_pid, char* buf_freq) GVariant *reply; int reply_val, ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, type, diff --git a/src/libdeviced/display.c b/src/libdeviced/display.c index 06f276b..b41d816 100644 --- a/src/libdeviced/display.c +++ b/src/libdeviced/display.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "log.h" #include "common.h" @@ -63,7 +63,7 @@ API int display_get_max_brightness(void) { int reply, ret_dbus; - ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_GET_MAX_BRIGHTNESS, @@ -82,7 +82,7 @@ API int display_set_brightness_with_setting(int val) if (val < 0 || val > 100) return -EINVAL; - ret = dbus_handle_method_async_var(DEVICED_BUS_NAME, + ret = gdbus_call_async(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_SET_BRIGHTNESS, @@ -136,7 +136,7 @@ API int display_change_state(unsigned int s_bits) if (!lcd_str) return -EINVAL; - ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME, + ret = gdbus_call_async_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_CHANGE_STATE, @@ -194,7 +194,7 @@ API int display_lock_state(unsigned int s_bits, unsigned int flag, p = STR_NULL; pa[2] = p; - ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME, + ret = gdbus_call_async_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_LOCK_STATE, @@ -253,7 +253,7 @@ API int display_unlock_state(unsigned int s_bits, unsigned int flag) } pa[1] = p; - ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME, + ret = gdbus_call_async_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, METHOD_UNLOCK_STATE, diff --git a/src/libdeviced/haptic.c b/src/libdeviced/haptic.c index d935aa5..d158a4a 100644 --- a/src/libdeviced/haptic.c +++ b/src/libdeviced/haptic.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "log.h" #include "dd-haptic.h" diff --git a/src/libdeviced/led.c b/src/libdeviced/led.c index 8d09a25..4c467b4 100644 --- a/src/libdeviced/led.c +++ b/src/libdeviced/led.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "log.h" #include "common.h" @@ -36,7 +36,7 @@ API int led_get_brightness(void) int reply_val = 0; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_GET_BRIGHTNESS, @@ -60,7 +60,7 @@ API int led_get_max_brightness(void) GVariant *reply = NULL; int reply_val, ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_GET_MAX_BRIGHTNESS, @@ -84,7 +84,7 @@ API int led_set_brightness_with_noti(int val, bool enable) GVariant *reply = NULL; int reply_val, ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, METHOD_SET_BRIGHTNESS, diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c index 5e55845..713aacd 100644 --- a/src/libdeviced/usbhost.c +++ b/src/libdeviced/usbhost.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "log.h" @@ -66,7 +66,7 @@ static int register_signal_handler(const char *path, const char *iface, const ch handler->name = name; handler->action = action; handler->data = data; - handler->id = subscribe_dbus_signal(NULL, path, iface, name, cb, NULL, NULL); + handler->id = gdbus_signal_subscribe(NULL, path, iface, name, cb, NULL, NULL); if (!handler->id) { _E("Failed to add dbus handler."); ret = -1; @@ -189,7 +189,7 @@ API void deinit_usbhost_signal(void) SYS_G_LIST_FOREACH_SAFE(handlers, n, next, handler) { SYS_G_LIST_REMOVE(handlers, handler); if (handler->id) { - unsubscribe_dbus_signal(NULL, handler->id); + gdbus_signal_unsubscribe(NULL, handler->id); handler->id = 0; } @@ -205,7 +205,7 @@ API void deinit_usbhost_signal(void) API int request_usb_storage_info(void) { int reply, ret_dbus; - ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_INFO_ALL, @@ -274,7 +274,7 @@ API int unregister_usb_storage_change_handler(void) if (handler->id == 0) continue; - unsubscribe_dbus_signal(NULL, handler->id); + gdbus_signal_unsubscribe(NULL, handler->id); SYS_G_LIST_REMOVE(handlers, handler); free(handler); } @@ -296,7 +296,7 @@ API int unregister_usb_device_change_handler( if (handler->action.device != device_changed) continue; - unsubscribe_dbus_signal(NULL, handler->id); + gdbus_signal_unsubscribe(NULL, handler->id); SYS_G_LIST_REMOVE(handlers, handler); free(handler); } @@ -311,7 +311,7 @@ API int mount_usb_storage(char *path) if (!path) return -1; - ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_MOUNT, @@ -329,7 +329,7 @@ API int unmount_usb_storage(char *path) if (!path) return -1; - ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_UNMOUNT, @@ -347,7 +347,7 @@ API int format_usb_storage(char *path) if (!path) return -1; - ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_REQUEST_STORAGE_FORMAT, @@ -368,7 +368,7 @@ API int open_usb_device(char *path, int *out_fd) if (!out_fd || !path) return -EINVAL; - ret_dbus = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME, + ret_dbus = gdbus_call_unix_fd_list_sync_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, METHOD_OPEN_DEVICE, diff --git a/src/power-command/command.c b/src/power-command/command.c index 6974548..808aa18 100644 --- a/src/power-command/command.c +++ b/src/power-command/command.c @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include @@ -286,8 +286,8 @@ struct parse_result parse_reboot_et_al(enum application application, int argc, c int call_deviced_poweroff(const char *type, const char *extra_option, const char *message) { int ret_dbus = extra_option - ? dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL) - : dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL) + ? gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL) + : gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL) ; if (ret_dbus < 0) { fprintf(stderr, "Error: %d", ret_dbus); diff --git a/src/power/boot.c b/src/power/boot.c index e49ca75..0f38a39 100644 --- a/src/power/boot.c +++ b/src/power/boot.c @@ -20,9 +20,8 @@ #include #include #include -#include -#include -#include +#include +#include #include "core/log.h" #include "core/device-notifier.h" @@ -40,8 +39,8 @@ static guint sig_id[2] = {0, 0}; void remove_booting_done_handler(void *data) { - unsubscribe_dbus_signal(NULL, sig_id[0]); - unsubscribe_dbus_signal(NULL, sig_id[1]); + gdbus_signal_unsubscribe(NULL, sig_id[0]); + gdbus_signal_unsubscribe(NULL, sig_id[1]); } static void booting_done_received(GDBusConnection *conn, @@ -92,7 +91,7 @@ void add_booting_done_handler(void *data) { /* System Session is loaded completely */ /*ret = */ - sig_id[0] = subscribe_dbus_signal(NULL, + sig_id[0] = gdbus_signal_subscribe(NULL, SYSTEMD_DBUS_PATH, SYSTEMD_DBUS_IFACE_MANAGER, SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED, @@ -103,7 +102,7 @@ void add_booting_done_handler(void *data) _E("Failed to init dbus signal(%s).", SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED); /* User Session is loaded completely */ - sig_id[1] = subscribe_dbus_signal(NULL, + sig_id[1] = gdbus_signal_subscribe(NULL, SYSTEMD_DBUS_PATH, SYSTEMD_DBUS_IFACE_MANAGER, SYSTEMD_DBUS_SIGNAL_USER_STARTUP_FINISHED, diff --git a/src/power/doze.c b/src/power/doze.c index a8b090f..3b1ae4e 100644 --- a/src/power/doze.c +++ b/src/power/doze.c @@ -39,7 +39,7 @@ int doze_pmqos_request(int req) { int ret = 0; - ret = dbus_handle_method_async_var(PASS_BUS_NAME, + ret = gdbus_call_async(PASS_BUS_NAME, PASS_PATH_PMQOS, PASS_INTERFACE_PMQOS, PASS_METHOD_SET_SCENARIO, diff --git a/src/power/power-control.c b/src/power/power-control.c index 0bce7ae..fa013a1 100644 --- a/src/power/power-control.c +++ b/src/power/power-control.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "core/log.h" #include "core/devices.h" @@ -159,7 +159,7 @@ int suspend_other_process(int type) return ret; if (type == VITAL_SLEEP) { - dbus_handle_method_sync_with_reply_var_timeout(RESOURCED_BUS_NAME, + gdbus_call_sync_with_reply_timeout(RESOURCED_BUS_NAME, RESOURCED_PATH_FREEZER, RESOURCED_INTERFACE_FREEZER, "SetSuspend", @@ -168,13 +168,13 @@ int suspend_other_process(int type) SET_SUSPEND_TIME*1000); vital_sleep = true; } else if (type == VITAL_WAKEUP) { - ret = dbus_handle_method_async_var(RESOURCED_BUS_NAME, + ret = gdbus_call_async(RESOURCED_BUS_NAME, RESOURCED_PATH_FREEZER, RESOURCED_INTERFACE_FREEZER, "SetSuspend", g_variant_new("(s)", "wakeup")); } else if (type == VITAL_EXIT) { - ret = dbus_handle_method_async_var(RESOURCED_BUS_NAME, + ret = gdbus_call_async(RESOURCED_BUS_NAME, RESOURCED_PATH_FREEZER, RESOURCED_INTERFACE_FREEZER, "SetSuspend", diff --git a/src/power/power-handler.c b/src/power/power-handler.c index 9c007fe..fdc1540 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include #include "dd-deviced.h" @@ -123,7 +123,7 @@ static void poweroff_start_animation(void) static void poweroff_notify_resourced(void) { _I("Request to stop systemd service to resourced."); - dbus_handle_method_sync_with_reply_var_timeout(RESOURCED_BUS_NAME, + gdbus_call_sync_with_reply_timeout(RESOURCED_BUS_NAME, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, "PrePoweroff", @@ -194,7 +194,7 @@ void poweroff_request_shutdown(void) } CRITICAL_LOG("Requested %s via systemd.", method); - dbus_handle_method_sync_with_reply_var_timeout(SYSTEMD_DBUS_DEST, + gdbus_call_sync_with_reply_timeout(SYSTEMD_DBUS_DEST, SYSTEMD_DBUS_PATH, SYSTEMD_DBUS_IFACE_MANAGER, method, @@ -467,7 +467,7 @@ static void poweroff_send_broadcast(int status) old = status; /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangeState signal for POWEROFF_TYPE_DIRECT and POWEROFF_TYPE_RESTART */ - ret_dbus = dbus_handle_emit_dbus_signal(NULL, + ret_dbus = gdbus_signal_emit(NULL, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, SIGNAL_POWEROFF_STATE, @@ -540,7 +540,7 @@ static int check_sender_process(GDBusConnection *conn, const char *sender) return -EINVAL; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Process(%d) does not exist, dbus ignored.", pid); return -ESRCH; @@ -769,7 +769,7 @@ static void power_init(void *data) int ret_val; /* init dbus interface */ - ret_val = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface); + ret_val = gdbus_add_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface); if (ret_val < 0) _E("Failed to init dbus method: %d", ret_val); diff --git a/src/proc/cpu-info.c b/src/proc/cpu-info.c index cbf3db2..2fb1a57 100644 --- a/src/proc/cpu-info.c +++ b/src/proc/cpu-info.c @@ -18,7 +18,7 @@ #include -#include +#include #include "core/log.h" #include "core/devices.h" @@ -148,7 +148,7 @@ static void cpu_info_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); } diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c index e3ca4f8..e2eb623 100644 --- a/src/thermal/thermal.c +++ b/src/thermal/thermal.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "apps/apps.h" #include "core/devices.h" @@ -89,7 +89,7 @@ static void thermal_init(void *data) if (ret < 0) _E("Failed to register booting done notifier."); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TEMPERATURE, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_TEMPERATURE, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); } diff --git a/src/time/time-handler.c b/src/time/time-handler.c index 42f49a6..fcf6a3d 100644 --- a/src/time/time-handler.c +++ b/src/time/time-handler.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include "core/log.h" @@ -233,7 +233,7 @@ int set_timezone_action(int argc, char **argv) static void time_changed_broadcast(void) { - dbus_handle_emit_dbus_signal(NULL, + gdbus_signal_emit(NULL, DEVICED_PATH_TIME, DEVICED_INTERFACE_TIME, TIME_CHANGE_SIGNAL, NULL); } @@ -323,7 +323,7 @@ static GVariant *dbus_time_handler(GDBusConnection *conn, goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (pid == -1 || kill(pid, 0) == -1) { _E("Process(%d) does not exist, dbus ignored.", pid); ret = -ESRCH; @@ -391,7 +391,7 @@ static void time_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/touchscreen/sensitivity.c b/src/touchscreen/sensitivity.c index 65d3746..13c75b7 100644 --- a/src/touchscreen/sensitivity.c +++ b/src/touchscreen/sensitivity.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "core/devices.h" #include "core/common.h" @@ -182,11 +182,11 @@ static void sensitivity_init(void *data) _I("Touch sensitivity device structure load success."); /* init dbus interface */ - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); - ret = subscribe_dbus_signal(NULL, + ret = gdbus_signal_subscribe(NULL, DEVICED_PATH_TOUCH, DEVICED_INTERFACE_TOUCH, DISABLE_SENSITIVITY_SIGNAL, diff --git a/src/touchscreen/touchscreen.c b/src/touchscreen/touchscreen.c index aefb70a..21032a1 100644 --- a/src/touchscreen/touchscreen.c +++ b/src/touchscreen/touchscreen.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include "core/devices.h" @@ -349,7 +349,7 @@ static void touchscreen_init(void *data) display_conf->touch_wakeup = val; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface); if (ret < 0) _E("Failed to init dbus method. (%d)", ret); diff --git a/src/tzip/tzip.c b/src/tzip/tzip.c index 0f0dff4..88c4802 100644 --- a/src/tzip/tzip.c +++ b/src/tzip/tzip.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "core/log.h" @@ -766,7 +766,7 @@ static GVariant *dbus_request_mount_tzip_internal(GDBusConnection *conn, const g goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (is_app(pid) != 0) { _E("PID(%d) is not privileged to use tzip.", pid); ret = -EPERM; @@ -851,7 +851,7 @@ static GVariant *dbus_request_unmount_tzip_internal(GDBusConnection *conn, const goto out; } - pid = dbus_connection_get_sender_pid(conn, sender); + pid = gdbus_connection_get_sender_pid(conn, sender); if (is_app(pid) != 0) { _E("PID(%d) is not privileged to use tzip.", pid); ret = -EPERM; @@ -1023,7 +1023,7 @@ static void tzip_init(void *data) register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done); register_notifier(DEVICE_NOTIFIER_POWEROFF, tzip_poweroff); - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TZIP, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_TZIP, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); diff --git a/src/usb-host-test/usb-host-test.c b/src/usb-host-test/usb-host-test.c index 6cc1586..aeccc82 100644 --- a/src/usb-host-test/usb-host-test.c +++ b/src/usb-host-test/usb-host-test.c @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -286,7 +286,7 @@ static void service_started_handler(GDBusConnection *conn, _I("Start"); if (sigid_start) { - unsubscribe_dbus_signal(NULL, sigid_start); + gdbus_signal_unsubscribe(NULL, sigid_start); sigid_start = 0; } /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH, @@ -374,7 +374,7 @@ out: usbg_cleanup(s); out1: if (sigid_stop) { - unsubscribe_dbus_signal(NULL, sigid_stop); + gdbus_signal_unsubscribe(NULL, sigid_stop); sigid_stop = 0; } } @@ -455,7 +455,7 @@ int start() goto out; } - ret = subscribe_dbus_signal(NULL, SYSTEMD_DBUS_PATH, + ret = gdbus_signal_subscribe(NULL, SYSTEMD_DBUS_PATH, JOB_MANAGER_INTERFACE, JOB_REMOVED, service_started_handler, NULL, NULL); if (ret <= 0) @@ -468,7 +468,7 @@ int start() /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH, JOB_MANAGER_INTERFACE, JOB_REMOVED);*/ if (sigid_start) { - unsubscribe_dbus_signal(NULL, sigid_start); + gdbus_signal_unsubscribe(NULL, sigid_start); sigid_start = 0; } goto out; @@ -489,7 +489,7 @@ out: /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH, JOB_MANAGER_INTERFACE, JOB_REMOVED);*/ if (sigid_start) - unsubscribe_dbus_signal(NULL, sigid_start); + gdbus_signal_unsubscribe(NULL, sigid_start); return ret; } @@ -498,7 +498,7 @@ static int stop() { int ret = 0; - ret = subscribe_dbus_signal(NULL, SYSTEMD_DBUS_PATH, + ret = gdbus_signal_subscribe(NULL, SYSTEMD_DBUS_PATH, JOB_MANAGER_INTERFACE, JOB_REMOVED, service_stopped_handler, NULL, NULL); if (ret <= 0) { @@ -527,7 +527,7 @@ out: /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH, JOB_MANAGER_INTERFACE, JOB_REMOVED);*/ if (sigid_stop) { - unsubscribe_dbus_signal(NULL, sigid_stop); + gdbus_signal_unsubscribe(NULL, sigid_stop); sigid_stop = 0; } return ret; @@ -547,7 +547,7 @@ static GVariant *dbus_start(GDBusConnection *conn, if (ret != 0 && ret != -EALREADY) _E("Failed to start usb-host-test : %d", ret); - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static GVariant *dbus_stop(GDBusConnection *conn, @@ -564,7 +564,7 @@ static GVariant *dbus_stop(GDBusConnection *conn, if (ret != 0 && ret != -EALREADY) _E("Failed to stop usb-host-test : %d", ret); - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static int usb_host_test_start(enum device_flags flags) @@ -600,7 +600,7 @@ static void usb_host_test_init(void *data) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_USB_HOST_TEST, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_USB_HOST_TEST, &dbus_interface); if (ret < 0) { _E("Failed to register dbus method! %d", ret); return; diff --git a/src/usb/usb-dbus.c b/src/usb/usb-dbus.c index c6ddfd3..700c86d 100644 --- a/src/usb/usb-dbus.c +++ b/src/usb/usb-dbus.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "core/log.h" @@ -69,7 +69,7 @@ void broadcast_usb_state_changed(void) _I("USB state(%u) changed.", state); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_USB, DEVICED_INTERFACE_USB, SIGNAL_STATE_CHANGED, @@ -162,11 +162,11 @@ int usb_dbus_init(void) { int ret; - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_USB, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_USB, &dbus_interface); if (ret < 0) _E("Failed to init dbus method for USB: %d", ret); - ret = subscribe_dbus_signal(NULL, DEVICED_PATH_USB, + ret = gdbus_signal_subscribe(NULL, DEVICED_PATH_USB, DEVICED_INTERFACE_USB, "ChangeUsbMode", change_usb_client_mode, NULL, NULL); if (ret <= 0) { diff --git a/src/usb/usb.c b/src/usb/usb.c index 7ddf8cf..d1f9198 100644 --- a/src/usb/usb.c +++ b/src/usb/usb.c @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c index e144ae9..d321efa 100644 --- a/src/usbhost/usb-host.c +++ b/src/usbhost/usb-host.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "core/log.h" @@ -176,7 +176,7 @@ static void broadcast_usbhost_signal(enum usbhost_state state, (usbhost->product ? usbhost->product : ""), (usbhost->serial ? usbhost->serial : "")); - ret = dbus_handle_emit_dbus_signal(NULL, + ret = gdbus_signal_emit(NULL, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, SIGNAL_USB_HOST_CHANGED, @@ -433,7 +433,7 @@ static GVariant *print_device_list(GDBusConnection *conn, print_usbhost(usbhost); } - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } #define nullstr(x) (x ? x : "") static GVariant *get_device_list(GDBusConnection *conn, @@ -584,7 +584,7 @@ static GVariant *print_policy(GDBusConnection *conn, _I("\t%s", line); } - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static int store_policy(void) @@ -1052,7 +1052,7 @@ static GVariant *open_device(GDBusConnection *conn, req->invocation = invocation; - ret = dbus_handle_get_sender_credentials(NULL, sender, &req->cred); + ret = gdbus_get_sender_credentials(NULL, sender, &req->cred); if (ret < 0) { _E("Unable to get credentials for caller: %d", ret); goto out; @@ -1139,7 +1139,7 @@ static void usbhost_init(void *data) _E("Failed to register usb uevent: %d", ret); /* register usbhost interface and method */ - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_USBHOST, &dbus_interface); + ret = gdbus_add_object(NULL, DEVICED_PATH_USBHOST, &dbus_interface); if (ret < 0) _E("Failed to register dbus interface and method: %d", ret); @@ -1152,7 +1152,7 @@ static void usbhost_init(void *data) return; } - ret = subscribe_dbus_signal(NULL, POPUP_PATH_SYSTEM, + ret = gdbus_signal_subscribe(NULL, POPUP_PATH_SYSTEM, POPUP_INTERFACE_SYSTEM, USB_HOST_RESULT_SIGNAL, popup_result_signal_handler, NULL, NULL); if (ret < 0) { -- 2.7.4 From 2cc30d1def292bc2c6956801af29dbebcb38af13 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 19 Mar 2021 19:53:21 +0900 Subject: [PATCH 16/16] [ACR-1626] Add usb.host privilege Check http://tizen.org/privilege/usb.host for org.tizen.system.deviced.Usbhost Change-Id: I0d97448ebd8907316157feb376eeafd71dd1d0bd Signed-off-by: Hyotaek Shim --- conf/org.tizen.system.deviced.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/org.tizen.system.deviced.conf b/conf/org.tizen.system.deviced.conf index bafc8fa..a548416 100644 --- a/conf/org.tizen.system.deviced.conf +++ b/conf/org.tizen.system.deviced.conf @@ -48,6 +48,8 @@ privilege="http://tizen.org/privilege/led"/> + - -- 2.7.4