From 5a7d1ea93eea47e47a88edb8d7f25242b21626f0 Mon Sep 17 00:00:00 2001 From: Inha Song Date: Fri, 11 Oct 2013 17:50:24 +0900 Subject: [PATCH] usb: thor: add screen support cmd_thordown.c: - add libtizen header - change error handling for thor init - add call to draw_thor_fail_screen() on error f_thor.c: - thor_init(): return -EINTR on ctrl+c or if power key was pressed 3 times - thor_rx_data(): return -EINTR when pressed ctrl+c on data receiving - add display simple info screen before cable is not connected - add display download screen when connection is established - update download progress bar if data receiving Change-Id: Ia89ef48c6c2faa5eda5dda5c5b3951e675eec03b Signed-off-by: Inha Song Signed-off-by: Przemyslaw Marczak --- cmd/thordown.c | 17 +++++++++++-- drivers/usb/gadget/f_thor.c | 51 +++++++++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/cmd/thordown.c b/cmd/thordown.c index 838764ccef..86c69db668 100644 --- a/cmd/thordown.c +++ b/cmd/thordown.c @@ -12,6 +12,7 @@ #include #include #include +#include int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -47,8 +48,12 @@ int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) ret = thor_init(); if (ret) { - pr_err("THOR DOWNLOAD failed: %d\n", ret); - ret = CMD_RET_FAILURE; + error("THOR DOWNLOAD failed: %d", ret); + if (ret == -EINTR) + ret = CMD_RET_SUCCESS; + else + ret = CMD_RET_FAILURE; + goto exit; } @@ -70,6 +75,14 @@ exit: done: dfu_free_entities(); +#ifdef CONFIG_TIZEN +#ifdef CONFIG_LCD /* TODO : Need to enable LCD */ + if (ret != CMD_RET_SUCCESS) + draw_thor_fail_screen(); + else + lcd_clear(); +#endif +#endif return ret; } diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 47ef55b2fd..4818db5a5c 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -31,6 +31,10 @@ #include #include #include +#include +#include +#include +#include #include "f_thor.h" @@ -54,6 +58,10 @@ DEFINE_CACHE_ALIGN_BUFFER(unsigned char, thor_rx_data_buf, /* ********************************************************** */ DEFINE_CACHE_ALIGN_BUFFER(char, f_name, F_NAME_BUF_SIZE + 1); static unsigned long long int thor_file_size; +#ifdef CONFIG_TIZEN +static unsigned long long int total_file_size; +static unsigned long long int downloaded_file_size; +#endif static int alt_setting_num; static void send_rsp(const struct rsp_box *rsp) @@ -270,7 +278,11 @@ static long long int process_rqt_download(const struct rqt_box *rqt) thor_file_size = (uint64_t)(uint32_t)rqt->int_data[0] + (((uint64_t)(uint32_t)rqt->int_data[1]) << 32); - debug("INIT: total %llu bytes\n", thor_file_size); +#ifdef CONFIG_TIZEN + total_file_size = thor_file_size; + downloaded_file_size = 0; +#endif + debug("INIT: total %d bytes\n", rqt->int_data[0]); break; case RQT_DL_FILE_INFO: file_type = rqt->int_data[0]; @@ -559,10 +571,17 @@ static int thor_rx_data(void) while (!dev->rxdata) { usb_gadget_handle_interrupts(0); if (ctrlc()) - return -1; + return -EINTR; } + dev->rxdata = 0; data_to_rx -= dev->out_req->actual; +#ifdef CONFIG_TIZEN + downloaded_file_size += dev->out_req->actual; +#ifdef CONFIG_LCD /* TODO : Need to enable LCD*/ + draw_thor_progress(total_file_size, downloaded_file_size); +#endif +#endif } while (data_to_rx); return tmp; @@ -688,12 +707,32 @@ static void thor_set_dma(void *addr, int len) int thor_init(void) { struct thor_dev *dev = thor_func->dev; + int power_key_cnt = 0; +#ifdef CONFIG_TIZEN +#ifdef CONFIG_LCD /* TODO : Need to enable LCD*/ + draw_thor_init_screen(); +#endif +#endif /* Wait for a device enumeration and configuration settings */ debug("THOR enumeration/configuration setting....\n"); - while (!dev->configuration_done) + while (!dev->configuration_done) { usb_gadget_handle_interrupts(0); - +#ifdef CONFIG_LCD_MENU + power_key_cnt += key_pressed(KEY_POWER); +#endif + if (ctrlc() || power_key_cnt >= 3) { +#ifdef CONFIG_BOOT_INFORM + boot_inform_clear(); +#endif + return -EINTR; + } + } +#ifdef CONFIG_TIZEN +#ifdef CONFIG_LCD /* TODO : Need to enable LCD*/ + draw_thor_screen(); +#endif +#endif thor_set_dma(thor_rx_data_buf, strlen("THOR")); /* detect the download request from Host PC */ if (thor_rx_data() < 0) { @@ -734,7 +773,7 @@ int thor_handle(void) return ret; } else { printf("%s: No data received!\n", __func__); - break; + return ret; } if (dfu_reinit_needed) return THOR_DFU_REINIT_NEEDED; @@ -899,6 +938,8 @@ static void thor_func_disable(struct usb_function *f) usb_ep_disable(dev->int_ep); dev->int_ep->driver_data = NULL; } + + dev->configuration_done = 0; } static int thor_eps_setup(struct usb_function *f) -- 2.34.1