ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Astyle fixed USBPhy_Nordic.cpp

pull/10689/head
George Beckstein 2019-05-02 12:26:55 -04:00 committed by aglass0fmilk
parent 5386b87693
commit cd3d939b5d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usb/device/targets/TARGET_NORDIC/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp
View File

@ -74,10 +74,10 @@ void USBPhyHw::init(USBPhyEvents *events)
// Interrupts will be reenabled by the Nordic driver // Interrupts will be reenabled by the Nordic driver
NRFX_IRQ_DISABLE(USBD_IRQn); NRFX_IRQ_DISABLE(USBD_IRQn);
if(this->events == NULL) { if (this->events == NULL) {
sleep_manager_lock_deep_sleep(); sleep_manager_lock_deep_sleep();
} }
this->events = events; this->events = events;
ret_code_t ret; ret_code_t ret;
@ -89,7 +89,7 @@ void USBPhyHw::init(USBPhyEvents *events)
// Register callback for USB Power events // Register callback for USB Power events
static const nrfx_power_usbevt_config_t config = { static const nrfx_power_usbevt_config_t config = {
.handler = power_usb_event_handler .handler = power_usb_event_handler
}; };
nrfx_power_usbevt_init(&config); nrfx_power_usbevt_init(&config);
@ -133,8 +133,8 @@ void USBPhyHw::deinit()
// Disable the power peripheral driver // Disable the power peripheral driver
nrfx_power_uninit(); nrfx_power_uninit();
if(this->events != NULL) { if (this->events != NULL) {
sleep_manager_unlock_deep_sleep(); sleep_manager_unlock_deep_sleep();
} }
this->events = NULL; this->events = NULL;
@ -146,7 +146,7 @@ void USBPhyHw::deinit()
bool USBPhyHw::powered() bool USBPhyHw::powered()
{ {
if (nrfx_power_usbstatus_get() == NRFX_POWER_USB_STATE_CONNECTED if (nrfx_power_usbstatus_get() == NRFX_POWER_USB_STATE_CONNECTED
|| nrfx_power_usbstatus_get() == NRFX_POWER_USB_STATE_READY) { || nrfx_power_usbstatus_get() == NRFX_POWER_USB_STATE_READY) {
return true; return true;
} else { } else {
return false; return false;
@ -403,9 +403,10 @@ void USBPhyHw::endpoint_unstall(usb_ep_t endpoint)
nrf_drv_usbd_ep_t ep = get_nordic_endpoint(endpoint); nrf_drv_usbd_ep_t ep = get_nordic_endpoint(endpoint);
// Unstall may be called on an endpoint that isn't stalled // Unstall may be called on an endpoint that isn't stalled
if(nrf_drv_usbd_ep_stall_check(ep)) if (nrf_drv_usbd_ep_stall_check(ep)) {
nrf_drv_usbd_ep_stall_clear(ep); nrf_drv_usbd_ep_stall_clear(ep);
}
// Clear data toggle // Clear data toggle
nrf_drv_usbd_ep_dtoggle_clear(ep); nrf_drv_usbd_ep_dtoggle_clear(ep);