From 8fb81ae17b57cd49f54bd1872e109d09b18126cc Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Wed, 5 Jun 2013 01:02:16 +0200 Subject: [PATCH] OP-980 uncrustify +review OPReview-501 --- flight/pios/stm32f4xx/pios_usb.c | 18 +++++++++++------- flight/pios/stm32f4xx/pios_usb_hid.c | 2 +- flight/pios/stm32f4xx/pios_usbhook.c | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/flight/pios/stm32f4xx/pios_usb.c b/flight/pios/stm32f4xx/pios_usb.c index 2c9ebea88..b17089114 100644 --- a/flight/pios/stm32f4xx/pios_usb.c +++ b/flight/pios/stm32f4xx/pios_usb.c @@ -40,7 +40,7 @@ /* Rx/Tx status */ static uint8_t transfer_possible = 0; -static void (*disconnection_cb_list[3])(void); +static void(*disconnection_cb_list[3]) (void); enum pios_usb_dev_magic { PIOS_USB_DEV_MAGIC = 0x17365904, @@ -167,6 +167,7 @@ bool PIOS_USB_CheckAvailable(__attribute__((unused)) uint32_t id) { struct pios_usb_dev *usb_dev = (struct pios_usb_dev *)pios_usb_id; static bool lastStatus = false; + if (!PIOS_USB_validate(usb_dev)) { return false; } @@ -175,7 +176,7 @@ bool PIOS_USB_CheckAvailable(__attribute__((unused)) uint32_t id) bool status = usb_found != 0 && transfer_possible ? 1 : 0; - if(lastStatus && !status){ + if (lastStatus && !status) { raiseDisconnectionCallbacks(); } lastStatus = status; @@ -187,10 +188,11 @@ bool PIOS_USB_CheckAvailable(__attribute__((unused)) uint32_t id) * Register a physical disconnection callback * */ -void PIOS_USB_RegisterDisconnectionCallback(void (*disconnectionCB)(void)){ +void PIOS_USB_RegisterDisconnectionCallback(void (*disconnectionCB)(void)) +{ PIOS_Assert(disconnectionCB); - for(uint32_t i = 0; i < NELEMENTS(disconnection_cb_list); i++){ - if(disconnection_cb_list[i] == NULL){ + for (uint32_t i = 0; i < NELEMENTS(disconnection_cb_list); i++) { + if (disconnection_cb_list[i] == NULL) { disconnection_cb_list[i] = disconnectionCB; return; } @@ -198,9 +200,11 @@ void PIOS_USB_RegisterDisconnectionCallback(void (*disconnectionCB)(void)){ PIOS_Assert(0); } -static void raiseDisconnectionCallbacks(void){ +static void raiseDisconnectionCallbacks(void) +{ uint32_t i = 0; - while(i < NELEMENTS(disconnection_cb_list) && disconnection_cb_list[i] != NULL){ + + while (i < NELEMENTS(disconnection_cb_list) && disconnection_cb_list[i] != NULL) { (disconnection_cb_list[i++])(); } } diff --git a/flight/pios/stm32f4xx/pios_usb_hid.c b/flight/pios/stm32f4xx/pios_usb_hid.c index 92f9117ff..c6862eb18 100644 --- a/flight/pios/stm32f4xx/pios_usb_hid.c +++ b/flight/pios/stm32f4xx/pios_usb_hid.c @@ -254,7 +254,7 @@ static void PIOS_USB_HID_RxStart(uint32_t usbhid_id, uint16_t rx_bytes_avail) // add a timeout to prevent connection drops static uint32_t last_rx_time_raw = 0; - if(PIOS_DELAY_DiffuS(last_rx_time_raw) > 1000000){ + if (PIOS_DELAY_DiffuS(last_rx_time_raw) > 1000000) { usb_hid_dev->rx_active = false; } diff --git a/flight/pios/stm32f4xx/pios_usbhook.c b/flight/pios/stm32f4xx/pios_usbhook.c index 12a4f6c50..cc8907e2f 100644 --- a/flight/pios/stm32f4xx/pios_usbhook.c +++ b/flight/pios/stm32f4xx/pios_usbhook.c @@ -84,7 +84,6 @@ static USBD_Usr_cb_TypeDef user_callbacks; void PIOS_USBHOOK_Activate(void) { - PIOS_USB_RegisterDisconnectionCallback(&reconnect); USBD_Init(&pios_usb_otg_core_handle, @@ -484,7 +483,8 @@ static USBD_Class_cb_TypeDef class_callbacks = { #endif /* USB_SUPPORT_USER_STRING_DESC */ }; -static void reconnect(void){ +static void reconnect(void) +{ /* Force a physical disconnect/reconnect */ DCD_DevDisconnect(&pios_usb_otg_core_handle); DCD_DevConnect(&pios_usb_otg_core_handle);