michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb: nordic: Fix for startup with USB cable attached.

Browse source 
Fixes bug introduced in #14875.
USBDETECTED event is be generated on cable attachment and
when cable is already attached during reset, but not when
the peripheral is re-initialized. When USB-enabled bootloader
is used, target application will not receive this event
and it needs to be generated again. This commit implements
a check against driver being enabled multiple times in case
of application without bootlader starting with cable attached
(both "fake" and "real" events are generated). Such dirty
trick allows bootloader to leave the peripheral in any state
before jumping to target application.

Fixes #15073

Signed-off-by: Paweł Zadrożniak <pawel.zadrozniak@nordicsemi.no>
This commit is contained in:
Paweł Zadrożniak 2019-04-02 11:35:24 +02:00 • committed by Anas Nashif
commit e01662d387
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/usb/device/usb_dc_nrfx.c
View file

@ -755,9 +755,11 @@ static inline void usbd_work_process_pwr_events(struct usbd_pwr_event *pwr_evt)
switch (pwr_evt->state) {
case USBD_ATTACHED:
LOG_DBG("USB detected");
nrfx_usbd_enable();
(void) hf_clock_enable(true, false);
if (!nrfx_usbd_is_enabled()) {
LOG_DBG("USB detected");
nrfx_usbd_enable();
(void) hf_clock_enable(true, false);
}
/* No callback here.
* Stack will be notified when the peripheral is ready.
@ -1317,6 +1319,13 @@ int usb_dc_attach(void)
}
if (nrf_power_usbregstatus_vbusdet_get()) {
/* USBDETECTED event is be generated on cable attachment and
* when cable is already attached during reset, but not when
* the peripheral is re-enabled.
* When USB-enabled bootloader is used, target application
* will not receive this event and it needs to be generated
* again here.
*/
usb_dc_nrfx_power_event_callback(NRF_POWER_EVENT_USBDETECTED);
}