From c71c47131ccab6338aeacaae46f56c0d28418ca0 Mon Sep 17 00:00:00 2001 From: Przemyslaw Marczak Date: Thu, 18 Sep 2014 15:27:59 +0200 Subject: [PATCH] thor: check board type before display for CONFIG_OF_MULTI. For multi platform binary, it is required to check the board type because not every board supports display. Change-Id: Ia4153d58f48846a0bec6e9dc90ea17d87d5da096 Signed-off-by: Przemyslaw Marczak --- cmd/thordown.c | 9 +++++++-- drivers/usb/gadget/f_thor.c | 16 ++++++++++++++++ include/libtizen.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/cmd/thordown.c b/cmd/thordown.c index f2322bb..2b4ea8a 100644 --- a/cmd/thordown.c +++ b/cmd/thordown.c @@ -67,9 +67,14 @@ done: #ifdef CONFIG_TIZEN #ifdef CONFIG_LCD /* TODO : Need to enable LCD */ - if (ret != CMD_RET_SUCCESS) + if (ret != CMD_RET_SUCCESS) { +#ifdef CONFIG_OF_MULTI + if (board_is_trats2()) + draw_thor_fail_screen(); +#else draw_thor_fail_screen(); - else +#endif + } else lcd_clear(); #endif #endif diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index ad7d19c..2a97299 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -579,9 +579,15 @@ static int thor_rx_data(void) #ifdef CONFIG_TIZEN downloaded_file_size += dev->out_req->actual; #ifdef CONFIG_LCD /* TODO : Need to enable LCD*/ +#ifdef CONFIG_OF_MULTI + if (board_is_trats2()) + draw_thor_progress(total_file_size, + downloaded_file_size); +#else draw_thor_progress(total_file_size, downloaded_file_size); #endif #endif +#endif /* CONFIG_TIZEN */ } while (data_to_rx); return tmp; @@ -728,9 +734,14 @@ int thor_init(void) #ifdef CONFIG_TIZEN #ifdef CONFIG_LCD /* TODO : Need to enable LCD*/ draw_thor_init_screen(); +#ifdef CONFIG_OF_MULTI + if (board_is_trats2()) + draw_thor_screen(); +#else draw_thor_screen(); #endif #endif +#endif /* CONFIG_TIZEN */ /* Wait for a device enumeration and configuration settings */ debug("THOR enumeration/configuration setting....\n"); while (!dev->configuration_done) { @@ -748,9 +759,14 @@ int thor_init(void) #ifdef CONFIG_TIZEN #ifdef CONFIG_LCD /* TODO : Need to enable LCD*/ draw_thor_screen(); +#ifdef CONFIG_OF_MULTI + if (board_is_trats2()) + draw_thor_connected(); +#else draw_thor_connected(); #endif #endif +#endif /* CONFIG_TIZEN */ thor_set_dma(thor_rx_data_buf, strlen("THOR")); /* detect the download request from Host PC */ if (thor_rx_data() < 0) { diff --git a/include/libtizen.h b/include/libtizen.h index 07b9497..cce5f40 100644 --- a/include/libtizen.h +++ b/include/libtizen.h @@ -9,6 +9,7 @@ #define _LIBTIZEN_H_ #include +#include #define HD_RESOLUTION 0 -- 2.7.4