From: Jinhyung Choi Date: Fri, 12 Jun 2015 05:15:54 +0000 (+0900) Subject: wearable: changed dbus message (SysNoti -> ExtCon) X-Git-Tag: submit/tizen/20151105.051558~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1de0963ab5a4b7aa50136b705fc0c51783ba206f;p=platform%2Fadaptation%2Femulator%2Femulator-daemon.git wearable: changed dbus message (SysNoti -> ExtCon) Change-Id: Ib5e3202b028794b56f407b8d0380efc8adc38197 Signed-off-by: Jinhyung Choi --- diff --git a/include/emuld.h b/include/emuld.h index 699c34b..9d7aebc 100644 --- a/include/emuld.h +++ b/include/emuld.h @@ -200,6 +200,12 @@ void* dbus_booting_done_check(void* data); void systemcall(const char* param); int parse_val(char *buff, unsigned char data, char *parsbuf); +#define DBUS_MSG_BUF_SIZE 512 +#define DBUS_SEND_SYSNOTI "SysNoti" +#define DBUS_SEND_EXTCON "ExtCon" +#define DEVICE_CHANGED "device_changed" +void dbus_send(const char* device, const char* target, const char* option); + #define HDS_DEFAULT_ID "fsdef0" #define HDS_DEFAULT_TAG "fileshare" #define HDS_DEFAULT_PATH "/mnt/host" diff --git a/packaging/emuld.spec b/packaging/emuld.spec index 015e504..f007c36 100644 --- a/packaging/emuld.spec +++ b/packaging/emuld.spec @@ -1,5 +1,5 @@ Name: emuld -Version: 0.9.9 +Version: 0.9.10 Release: 0 Summary: Emulator daemon License: Apache-2.0 diff --git a/src/common.cpp b/src/common.cpp index 606e097..7576c29 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -1573,3 +1573,22 @@ void set_vconf_cb(void) LOGERR("vconf_notify_key_changed() failed"); } } + +#define DBUS_SEND_PRE_CMD "dbus-send --system --type=method_call --print-reply --reply-timeout=120000 --dest=org.tizen.system.deviced /Org/Tizen/System/DeviceD/" +#define DBUS_SEND_MID_CMD " org.tizen.system.deviced." + +void dbus_send(const char* device, const char* target, const char* option) +{ + const char* dbus_send_pre_cmd = DBUS_SEND_PRE_CMD; + const char* dbus_send_mid_cmd = DBUS_SEND_MID_CMD; + char cmd[DBUS_MSG_BUF_SIZE]; + + if (device == NULL || option == NULL || target == NULL) + return; + + snprintf(cmd, sizeof(cmd), "%s%s%s%s.%s string:\"%s\" %s", dbus_send_pre_cmd, target, dbus_send_mid_cmd, target, device, device, option); + + systemcall(cmd); + LOGINFO("dbus_send: %s", cmd); +} + diff --git a/src/mobile.cpp b/src/mobile.cpp index 2d77202..712a607 100644 --- a/src/mobile.cpp +++ b/src/mobile.cpp @@ -73,41 +73,6 @@ enum motion_move{ SENSOR_MOTION_MOVE_MOVETOCALL = 1 }; -static void system_cmd(const char* msg) -{ - int ret = system(msg); - if (ret == -1) { - LOGERR("system command is failed: %s", msg); - } -} - -#define DBUS_SEND_PRE_CMD "dbus-send --system --type=method_call --print-reply --reply-timeout=120000 --dest=org.tizen.system.deviced /Org/Tizen/System/DeviceD/" -#define DBUS_SEND_MID_CMD " org.tizen.system.deviced." -#define DBUS_SEND_SYSNOTI "SysNoti" -#define DBUS_SEND_EXTCON "ExtCon" -static void dbus_send(const char* device, const char* target, const char* option) -{ - const char* dbus_send_pre_cmd = DBUS_SEND_PRE_CMD; - const char* dbus_send_mid_cmd = DBUS_SEND_MID_CMD; - char* cmd; - - if (device == NULL || option == NULL) - return; - - cmd = (char*)malloc(512); - if (cmd == NULL) - return; - - memset(cmd, 0, 512); - - sprintf(cmd, "%s%s%s%s.%s string:\"%s\" %s", dbus_send_pre_cmd, target, dbus_send_mid_cmd, target, device, device, option); - - system_cmd(cmd); - LOGINFO("dbus_send: %s", cmd); - - free(cmd); -} - #define POWER_SUPPLY "power_supply" #define FULL "Full" #define CHARGING "Charging" @@ -116,9 +81,8 @@ static void dbus_send_power_supply(int capacity, int charger) { const char* power_device = POWER_SUPPLY; char state [16]; - char option [128]; - memset(state, 0, 16); - memset(option, 0, 128); + char option [DBUS_MSG_BUF_SIZE]; + memset(state, 0, sizeof(state)); if (capacity == 100 && charger == 1) { memcpy(state, FULL, 4); @@ -128,21 +92,18 @@ static void dbus_send_power_supply(int capacity, int charger) memcpy(state, DISCHARGING, 11); } - sprintf(option, "int32:5 string:\"%d\" string:\"%s\" string:\"Good\" string:\"%d\" string:\"1\"", + snprintf(option, sizeof(option), "int32:5 string:\"%d\" string:\"%s\" string:\"Good\" string:\"%d\" string:\"1\"", capacity, state, (charger + 1)); dbus_send(power_device, DBUS_SEND_SYSNOTI, option); } -#define DEVICE_CHANGED "device_changed" - static void dbus_send_usb(int on) { const char* usb_device = DEVICE_CHANGED; - char option [128]; - memset(option, 0, 128); + char option [DBUS_MSG_BUF_SIZE]; - sprintf(option, "int32:2 string:\"usb\" string:\"%d\"", on); + snprintf(option, sizeof(option), "int32:2 string:\"usb\" string:\"%d\"", on); dbus_send(usb_device, DBUS_SEND_EXTCON, option); } @@ -150,10 +111,9 @@ static void dbus_send_usb(int on) static void dbus_send_earjack(int on) { const char* earjack_device = DEVICE_CHANGED; - char option [128]; - memset(option, 0, 128); + char option [DBUS_MSG_BUF_SIZE]; - sprintf(option, "int32:2 string:\"earjack\" string:\"%d\"", on); + snprintf(option, sizeof(option), "int32:2 string:\"earjack\" string:\"%d\"", on); dbus_send(earjack_device, DBUS_SEND_EXTCON, option); } diff --git a/src/wearable.cpp b/src/wearable.cpp index 9ba76d9..d3377b1 100644 --- a/src/wearable.cpp +++ b/src/wearable.cpp @@ -38,41 +38,16 @@ enum sensor_type{ USB = 10, }; -#define DBUS_SEND_CMD "dbus-send --system --type=method_call --print-reply --reply-timeout=120000 --dest=org.tizen.system.deviced /Org/Tizen/System/DeviceD/SysNoti org.tizen.system.deviced.SysNoti." -static void dbus_send(const char* device, const char* option) -{ - const char* dbus_send_cmd = DBUS_SEND_CMD; - char* cmd; - - if (device == NULL || option == NULL) - return; - - cmd = (char*)malloc(512); - if (cmd == NULL) - return; - - memset(cmd, 0, 512); - - sprintf(cmd, "%s%s string:\"%s\" %s", dbus_send_cmd, device, device, option); - - systemcall(cmd); - LOGINFO("dbus_send: %s", cmd); - - free(cmd); -} - #define POWER_SUPPLY "power_supply" #define FULL "Full" #define CHARGING "Charging" #define DISCHARGING "Discharging" - static void dbus_send_power_supply(int capacity, int charger) { const char* power_device = POWER_SUPPLY; char state [16]; - char option [128]; - memset(state, 0, 16); - memset(option, 0, 128); + char option [DBUS_MSG_BUF_SIZE]; + memset(state, 0, sizeof(state)); if (capacity == 100 && charger == 1) { memcpy(state, FULL, 4); @@ -82,33 +57,30 @@ static void dbus_send_power_supply(int capacity, int charger) memcpy(state, DISCHARGING, 11); } - sprintf(option, "int32:5 string:\"%d\" string:\"%s\" string:\"Good\" string:\"%d\" string:\"1\"", + snprintf(option, sizeof(option), "int32:5 string:\"%d\" string:\"%s\" string:\"Good\" string:\"%d\" string:\"1\"", capacity, state, (charger + 1)); - dbus_send(power_device, option); + dbus_send(power_device, DBUS_SEND_SYSNOTI, option); } -#define DEVICE_CHANGED "device_changed" static void dbus_send_usb(int on) { const char* usb_device = DEVICE_CHANGED; - char option [128]; - memset(option, 0, 128); + char option [DBUS_MSG_BUF_SIZE]; - sprintf(option, "int32:2 string:\"usb\" string:\"%d\"", on); + snprintf(option, sizeof(option), "int32:2 string:\"usb\" string:\"%d\"", on); - dbus_send(usb_device, option); + dbus_send(usb_device, DBUS_SEND_EXTCON, option); } static void dbus_send_earjack(int on) { const char* earjack_device = DEVICE_CHANGED; - char option [128]; - memset(option, 0, 128); + char option [DBUS_MSG_BUF_SIZE]; - sprintf(option, "int32:2 string:\"earjack\" string:\"%d\"", on); + snprintf(option, sizeof(option), "int32:2 string:\"earjack\" string:\"%d\"", on); - dbus_send(earjack_device, option); + dbus_send(earjack_device, DBUS_SEND_EXTCON, option); } static int read_from_file(const char* file_name)