diff options
| author | Tom Rini <trini@ti.com> | 2014-12-18 12:37:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-18 12:37:18 -0500 |
| commit | 7a7ffedabd29adde9cb6ebe6066256c4cf8b77af (patch) | |
| tree | 6122c4c1e597e26b0c0a3ae706086cf9c2ba880e /drivers/dfu/dfu.c | |
| parent | d8bec60c1b0de7770f9b56ad092ab9be801d99af (diff) | |
| parent | 0ff7e585df83470139739533bdbf41114f395470 (diff) | |
| download | u-boot-imx-7a7ffedabd29adde9cb6ebe6066256c4cf8b77af.zip u-boot-imx-7a7ffedabd29adde9cb6ebe6066256c4cf8b77af.tar.gz u-boot-imx-7a7ffedabd29adde9cb6ebe6066256c4cf8b77af.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/dfu/dfu.c')
| -rw-r--r-- | drivers/dfu/dfu.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 14cb366..ad0a7e7 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -17,7 +17,6 @@ #include <linux/list.h> #include <linux/compiler.h> -static bool dfu_detach_request; static LIST_HEAD(dfu_list); static int dfu_alt_num; static int alt_num_cnt; @@ -39,21 +38,6 @@ __weak bool dfu_usb_get_reset(void) return true; } -bool dfu_detach(void) -{ - return dfu_detach_request; -} - -void dfu_trigger_detach(void) -{ - dfu_detach_request = true; -} - -void dfu_clear_detach(void) -{ - dfu_detach_request = false; -} - static int dfu_find_alt_num(const char *s) { int i = 0; @@ -111,8 +95,12 @@ unsigned char *dfu_get_buf(struct dfu_entity *dfu) return dfu_buf; s = getenv("dfu_bufsiz"); - dfu_buf_size = s ? (unsigned long)simple_strtol(s, NULL, 16) : - CONFIG_SYS_DFU_DATA_BUF_SIZE; + if (s) + dfu_buf_size = (unsigned long)simple_strtol(s, NULL, 0); + + if (!s || !dfu_buf_size) + dfu_buf_size = CONFIG_SYS_DFU_DATA_BUF_SIZE; + if (dfu->max_buf_size && dfu_buf_size > dfu->max_buf_size) dfu_buf_size = dfu->max_buf_size; |