From: ChulHo Song Date: Fri, 29 Jan 2016 08:45:14 +0000 (+0900) Subject: sdcard: send notification to ECP when sdcard state is changed X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ba3eea132c29d9dd38f698266fa4f93235665bc;p=sdk%2Femulator%2Fqemu.git sdcard: send notification to ECP when sdcard state is changed Change-Id: Ic8804fc221058cae14bd74509c2ca84b6b45c29c Signed-off-by: ChulHo Song (cherry picked from commit 7e051a5400555016e4656f9635e0fe4b26409405) --- diff --git a/tizen/src/ecs/ecs_sdcard.c b/tizen/src/ecs/ecs_sdcard.c index f70c406d47..e249510285 100644 --- a/tizen/src/ecs/ecs_sdcard.c +++ b/tizen/src/ecs/ecs_sdcard.c @@ -136,10 +136,10 @@ static void send_sdcard_status(void) qapi_free_BlockInfoList(block_list); LOG_INFO("sdcard data: %s\n", data); - if (data[0] == 0) { - make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, ACT_SDCARD_DETACH_STATUS, NULL); - } else { + if (is_sdcard_attached() && data[0] != 0) { make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, ACT_SDCARD_ATTACH_STATUS, data); + } else { + make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, ACT_SDCARD_DETACH_STATUS, NULL); } } @@ -157,8 +157,6 @@ void handle_sdcard(char* dataBuf, size_t dataLen) err_no = remove_sdcard_lock_os(sdcard_full_path); if (err_no == 0 && is_sdcard_attached()) { do_hotplug(DETACH_SDCARD, sdcard_full_path, strlen(sdcard_full_path) + 1); - make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, - ACT_SDCARD_DETACH, g_path_get_basename(sdcard_full_path)); } else { LOG_SEVERE("failed to umount: %s, err_no: %d\n", sdcard_full_path, err_no); make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, @@ -171,8 +169,6 @@ void handle_sdcard(char* dataBuf, size_t dataLen) LOG_TRACE("sdcard_full_path: %s\n", sdcard_full_path); if (!is_sdcard_attached() && make_sdcard_lock_os(sdcard_full_path)) { do_hotplug(ATTACH_SDCARD, sdcard_full_path, strlen(sdcard_full_path) + 1); - make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, - ACT_SDCARD_ATTACH, g_path_get_basename(sdcard_full_path)); } else { make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, ACT_SDCARD_ATTACH_FAIL, g_path_get_basename(sdcard_full_path)); diff --git a/tizen/src/util/device_hotplug.c b/tizen/src/util/device_hotplug.c index 05acabca0d..2965169f31 100644 --- a/tizen/src/util/device_hotplug.c +++ b/tizen/src/util/device_hotplug.c @@ -130,6 +130,8 @@ static bool do_sdcard_attach(const char * const file) g_free(sdcard_device_id); g_free(sdcard_drive_id); state->sdcard_attached = true; + make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, + ACT_SDCARD_ATTACH, g_path_get_basename(file)); return true; } @@ -143,6 +145,9 @@ static bool do_sdcard_detach(const char * const file) QDECREF(qdict); state->sdcard_attached = false; + make_send_device_ntf((char*)MSG_TYPE_SDCARD, GROUP_SDCARD, + ACT_SDCARD_DETACH, g_path_get_basename(file)); + g_free(sdcard_drive_id); return true; }