From 9a91a9e3729ccb79b0d1064efea66abf1a0642ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 14 Apr 2017 00:41:49 +0200 Subject: [PATCH] Simplify usb_device_full_shutdown() --- right/src/buspal/bus_pal_hardware.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/right/src/buspal/bus_pal_hardware.c b/right/src/buspal/bus_pal_hardware.c index f5b4b5f..c1a1695 100644 --- a/right/src/buspal/bus_pal_hardware.c +++ b/right/src/buspal/bus_pal_hardware.c @@ -225,20 +225,13 @@ void usb_device_full_shutdown(const peripheral_descriptor_t *self) return; } - // Shutdown class driver - usb_device_hid_generic_deinit(&g_device_composite); + usb_device_hid_generic_deinit(&g_device_composite); // Shutdown class driver // Make sure we are clocking to the peripheral to ensure there are no bus errors - if ((CONTROLLER_ID == kUSB_ControllerKhci0) && (SIM->SCGC4 & SIM_SCGC4_USBOTG_MASK)) - { - // Disable the USB interrupt - NVIC_DisableIRQ(USB0_IRQn); - - // Clear any pending interrupts on USB - NVIC_ClearPendingIRQ(USB0_IRQn); - - // Turn off clocking to USB - SIM->SCGC4 &= ~SIM_SCGC4_USBOTG_MASK; + if (SIM->SCGC4 & SIM_SCGC4_USBOTG_MASK) { + NVIC_DisableIRQ(USB0_IRQn); // Disable the USB interrupt + NVIC_ClearPendingIRQ(USB0_IRQn); // Clear any pending interrupts on USB + SIM->SCGC4 &= ~SIM_SCGC4_USBOTG_MASK; // Turn off clocking to USB } }