dfu: Implementation of target reset after communication with dfu-util's -R switch
PATCH 1/1 dfu: Implementation of target reset after communication with dfu-util's -R switch
This patch extends dfu code to support transmission with -R switch specified at dfu-util.
When -R is specified, the extra USB_REQ_DFU_DETACH request is sent after successful data transmission. Then dfu resources are released and reset command is issued.
--- common/cmd_dfu.c | 14 +++++++++++++- drivers/dfu/dfu.c | 11 +++++++++++ drivers/usb/gadget/f_dfu.c | 2 ++ include/dfu.h | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-)
common/cmd_dfu.c +13 -1
@@ -31,8 +31,8 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {const char *str_env;char *s ="dfu" ; +int ret, i =0 ;char *env_bkp; -int ret;if (argc <3 )return CMD_RET_USAGE ;
@@ -61,6 +61,15 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])g_dnl_register (s);while (1 ) { +if (dfu_reset ()) +/* +* This extra number of usb_gadget_handle_interrupts() +* calls is necessary to assure correct transmission +* completion with dfu-util +*/ +if (++i ==10 ) + goto exit; +if (ctrlc ()) goto exit;
@@ -72,6 +81,9 @@ done:dfu_free_entities ();free (env_bkp); +if (dfu_reset ()) +run_command ("reset" ,0 ); +return CMD_RET_SUCCESS ; }
drivers/dfu/dfu.c +11 -0
@@ -28,9 +28,20 @@#include <linux/list.h> #include <linux/compiler.h> +static bool dfu_reset_request;static LIST_HEAD (dfu_list);static int dfu_alt_num; +bool dfu_reset (void ) +{ +return dfu_reset_request; +} + +void dfu_trigger_reset () +{ + dfu_reset_request = true; +} +static int dfu_find_alt_num (const char *s) {int i =0 ;
drivers/usb/gadget/f_dfu.c +2 -0
@@ -324,6 +324,8 @@ static int state_dfu_idle(struct f_dfu *f_dfu, DFU_STATE_dfuMANIFEST_WAIT_RST;to_runtime_mode (f_dfu); f_dfu->dfu_state = DFU_STATE_appIDLE; + +dfu_trigger_reset ();break ;default : f_dfu->dfu_state = DFU_STATE_dfuERROR;
include/dfu.h +2 -0
@@ -121,6 +121,8 @@ const char *dfu_get_dev_type(enum dfu_device_type t);const char *dfu_get_layout (enum dfu_layout l);struct dfu_entity *dfu_get_entity (int alt);char *dfu_extract_token (char ** e,int *n); +void dfu_trigger_reset (void ); +bool dfu_reset (void );int dfu_read (struct dfu_entity *de,void *buf,int size,int blk_seq_num);int dfu_write (struct dfu_entity *de,void *buf,int size,int blk_seq_num);
Signature · 1 line
1.7.10.4
PATCH 1/1 dfu: Implementation of target reset after communication with dfu-util's -R switch
Hello Lukasz,
Am 18.07.2013 13:19, schrieb Lukasz Majewski:
Quoted 7 lines
This patch extends dfu code to support transmission with -R switch specified at dfu-util.
When -R is specified, the extra
USB_REQ_DFU_DETACHrequest is sent after successful data transmission. Then dfu resources are released and reset command is issued.
Quoted 8 lines
Signed-off-by Lukasz Majewski<[email protected]>Signed-off-by Kyungmin Park<[email protected]>--- common/cmd_dfu.c | 14 +++++++++++++- drivers/dfu/dfu.c | 11 +++++++++++ drivers/usb/gadget/f_dfu.c | 2 ++ include/dfu.h | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-)
Tested on AM335x based boards, so:
Thanks!
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Marek Vasut
AppliedPATCH 1/1 dfu: Implementation of target reset after communication with dfu-util's -R switch
In reply to Lukasz MajewskiDear Lukasz Majewski,
Quoted 7 lines
This patch extends dfu code to support transmission with -R switch specified at dfu-util.
When -R is specified, the extra
USB_REQ_DFU_DETACHrequest is sent after successful data transmission. Then dfu resources are released and reset command is issued.
Quoted 9 lines
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- common/cmd_dfu.c | 14 +++++++++++++- drivers/dfu/dfu.c | 11 +++++++++++ drivers/usb/gadget/f_dfu.c | 2 ++ include/dfu.h | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-)
Applied, thanks
Best regards,
Marek Vasut