diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dfu/dfu.c | 31 | ||||
-rw-r--r-- | drivers/usb/gadget/f_dfu.c | 2 |
2 files changed, 27 insertions, 6 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 3512b149c5..55e6a83b9a 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -17,20 +17,41 @@ #include <linux/list.h> #include <linux/compiler.h> -static bool dfu_reset_request; +static bool dfu_detach_request; static LIST_HEAD(dfu_list); static int dfu_alt_num; static int alt_num_cnt; static struct hash_algo *dfu_hash_algo; -bool dfu_reset(void) +/* + * The purpose of the dfu_usb_get_reset() function is to + * provide information if after USB_DETACH request + * being sent the dfu-util performed reset of USB + * bus. + * + * Described behaviour is the only way to distinct if + * user has typed -e (detach) or -R (reset) when invoking + * dfu-util command. + * + */ +__weak bool dfu_usb_get_reset(void) +{ + return true; +} + +bool dfu_detach(void) +{ + return dfu_detach_request; +} + +void dfu_trigger_detach(void) { - return dfu_reset_request; + dfu_detach_request = true; } -void dfu_trigger_reset() +void dfu_clear_detach(void) { - dfu_reset_request = true; + dfu_detach_request = false; } static int dfu_find_alt_num(const char *s) diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index 9863dec44d..3e4f02932b 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -372,7 +372,7 @@ static int state_dfu_idle(struct f_dfu *f_dfu, to_runtime_mode(f_dfu); f_dfu->dfu_state = DFU_STATE_appIDLE; - dfu_trigger_reset(); + dfu_trigger_detach(); break; default: f_dfu->dfu_state = DFU_STATE_dfuERROR; |