rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-602 significant change to USB layer. force complete USB stack reset on replug/reset from host device

Browse Source
This commit is contained in:
Eric Price 2018-10-16 11:11:30 +02:00
parent ca82317970
commit a4e20499c0
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
flight/pios/stm32f4xx/pios_usb.c
View File

@ -38,7 +38,7 @@
#include <pios_helpers.h> #include <pios_helpers.h>
/* Rx/Tx status */ /* Rx/Tx status */
static uint8_t transfer_possible = 0; static volatile uint8_t transfer_possible = 0;
#ifdef PIOS_INCLUDE_FREERTOS #ifdef PIOS_INCLUDE_FREERTOS
static void(*disconnection_cb_list[3]) (void); static void(*disconnection_cb_list[3]) (void);
@ -148,6 +148,9 @@ out_fail:
*/ */
int32_t PIOS_USB_ChangeConnectionState(bool connected) int32_t PIOS_USB_ChangeConnectionState(bool connected)
{ {
#ifdef PIOS_INCLUDE_FREERTOS
static volatile uint8_t lastStatus = 2; // 2 is "no last status"
#endif
// In all cases: re-initialise USB HID driver // In all cases: re-initialise USB HID driver
if (connected) { if (connected) {
transfer_possible = 1; transfer_possible = 1;
@ -168,6 +171,12 @@ int32_t PIOS_USB_ChangeConnectionState(bool connected)
#ifdef PIOS_INCLUDE_FREERTOS #ifdef PIOS_INCLUDE_FREERTOS
raiseConnectionStateCallback(connected); raiseConnectionStateCallback(connected);
if (lastStatus != transfer_possible) {
if (lastStatus == 1) {
raiseDisconnectionCallbacks();
}
lastStatus = transfer_possible;
}
#endif #endif
return 0; return 0;
@ -187,28 +196,7 @@ bool PIOS_USB_CheckAvailable(__attribute__((unused)) uint32_t id)
return false; return false;
} }
usb_found = ((usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin) != 0) ^ usb_dev->cfg->vsense_active_low; return transfer_possible;
// Please note that checks of transfer_possible and the reconnection handling is
// suppressed for non freertos mode (aka bootloader) as this is causing problems detecting connection and
// broken communications.
#ifdef PIOS_INCLUDE_FREERTOS
static bool lastStatus = false;
bool status = usb_found != 0 && transfer_possible ? 1 : 0;
bool reconnect = false;
if (xSemaphoreTakeFromISR(usb_dev->statusCheckSemaphore, NULL) == pdTRUE) {
reconnect = (lastStatus && !status);
lastStatus = status;
xSemaphoreGiveFromISR(usb_dev->statusCheckSemaphore, NULL);
}
if (reconnect) {
raiseDisconnectionCallbacks();
}
return status;
#else
return usb_found;
#endif
} }
/* /*

25
flight/pios/stm32f4xx/pios_usbhook.c
View File

@ -280,7 +280,9 @@ static USBD_DEVICE device_callbacks = {
static void PIOS_USBHOOK_USR_Init(void) static void PIOS_USBHOOK_USR_Init(void)
{ {
PIOS_USB_ChangeConnectionState(false); PIOS_USB_ChangeConnectionState(false);
reconnect(); // reconnect dev logically on init (previously a call to reconnect())
DCD_DevDisconnect(&pios_usb_otg_core_handle);
DCD_DevConnect(&pios_usb_otg_core_handle);
} }
static void PIOS_USBHOOK_USR_DeviceReset(__attribute__((unused)) uint8_t speed) static void PIOS_USBHOOK_USR_DeviceReset(__attribute__((unused)) uint8_t speed)
@ -491,9 +493,24 @@ static USBD_Class_cb_TypeDef class_callbacks = {
static void reconnect(void) static void reconnect(void)
{ {
/* Force a physical disconnect/reconnect */ static volatile bool in_reconnect = false;
DCD_DevDisconnect(&pios_usb_otg_core_handle);
DCD_DevConnect(&pios_usb_otg_core_handle); /* Force a complete device reset. This can trigger a call to reconnect() so prevent recursion */
if (!in_reconnect) {
in_reconnect = true; // save since volatile and STM32F4 is single core
// disable USB device
DCD_DevDisconnect(&pios_usb_otg_core_handle);
USBD_DeInit(&pios_usb_otg_core_handle);
USB_OTG_StopDevice(&pios_usb_otg_core_handle);
// enable USB device
USBD_Init(&pios_usb_otg_core_handle,
USB_OTG_FS_CORE_ID,
&device_callbacks,
&class_callbacks,
&user_callbacks);
in_reconnect = false;
}
} }
#endif /* PIOS_INCLUDE_USB */ #endif /* PIOS_INCLUDE_USB */