V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
This commit is contained in:
Lukasz Majewski 2013-07-18 13:19:14 +02:00 committed by Marek Vasut
parent 6dd30af0fa
commit 6bed7ce569
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/cmd_dfu.c
View File

@ -19,8 +19,8 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
const char *str_env; const char *str_env;
char *s = "dfu"; char *s = "dfu";
int ret, i = 0;
char *env_bkp; char *env_bkp;
int ret;
if (argc < 3) if (argc < 3)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -49,6 +49,15 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
g_dnl_register(s); g_dnl_register(s);
while (1) { 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()) if (ctrlc())
goto exit; goto exit;
@ -60,6 +69,9 @@ done:
dfu_free_entities(); dfu_free_entities();
free(env_bkp); free(env_bkp);
if (dfu_reset())
run_command("reset", 0);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }

11
drivers/dfu/dfu.c
View File

@ -16,9 +16,20 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/compiler.h> #include <linux/compiler.h>
static bool dfu_reset_request;
static LIST_HEAD(dfu_list); static LIST_HEAD(dfu_list);
static int dfu_alt_num; 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) static int dfu_find_alt_num(const char *s)
{ {
int i = 0; int i = 0;

2
drivers/usb/gadget/f_dfu.c
View File

@ -312,6 +312,8 @@ static int state_dfu_idle(struct f_dfu *f_dfu,
DFU_STATE_dfuMANIFEST_WAIT_RST; DFU_STATE_dfuMANIFEST_WAIT_RST;
to_runtime_mode(f_dfu); to_runtime_mode(f_dfu);
f_dfu->dfu_state = DFU_STATE_appIDLE; f_dfu->dfu_state = DFU_STATE_appIDLE;
dfu_trigger_reset();
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_dfuERROR; f_dfu->dfu_state = DFU_STATE_dfuERROR;

2
include/dfu.h
View File

@ -109,6 +109,8 @@ const char *dfu_get_dev_type(enum dfu_device_type t);
const char *dfu_get_layout(enum dfu_layout l); const char *dfu_get_layout(enum dfu_layout l);
struct dfu_entity *dfu_get_entity(int alt); struct dfu_entity *dfu_get_entity(int alt);
char *dfu_extract_token(char** e, int *n); 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_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); int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num);