rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

OP-121 OP-122 Flight: Improved the Blocking/Nonblocking behavior for USB to be correct. I'd like a mutex still around the transmission buffer but don't want to slow down the interrupt.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1404 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-08-25 05:32:54 +00:00 committed by peabody124
parent 4ca10e92c7
commit dd491160c5
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
flight/PiOS/STM32F10x/pios_usb_hid.c
View File

@ -190,16 +190,17 @@ int32_t PIOS_USB_HID_CheckAvailable(uint8_t id)
void sendChunk()
{
uint32_t size = bufferBufferedData(&txBuffer);
if(size > 0)
{
if(size > PIOS_USB_HID_DATA_LENGTH)
size = PIOS_USB_HID_DATA_LENGTH;
bufferGetChunkFromFront(&txBuffer, &tx_buffer[2], size);
tx_buffer[0] = 1; /* report ID */
tx_buffer[1] = size; /* valid data length */
/* Wait for any pending transmissions to complete */
while(GetEPTxStatus(ENDP1) == EP_TX_VALID)
taskYIELD();
@ -225,17 +226,18 @@ int32_t PIOS_USB_HID_TxBufferPutMoreNonBlocking(uint8_t id, const uint8_t *buffe
{
/*if( len > PIOS_USB_HID_DATA_LENGTH )
return - 1;*/
uint8_t previous_data = bufferBufferedData(&txBuffer);
if(len > bufferRemainingSpace(&txBuffer))
return -1; /* Cannot send all requested bytes */
if(bufferAddChunkToEnd(&txBuffer, buffer, len) == 0)
return -1;
while(bufferBufferedData(&txBuffer))
/* If no previous data queued and not sending, then TX complete interrupt not likely so send manually */
if(previous_data == 0 && GetEPTxStatus(ENDP1) != EP_TX_VALID)
sendChunk();
bufferFlush(&txBuffer);
//PIOS_USB_HID_EP1_IN_Callback();
return 0;
}
@ -251,11 +253,14 @@ int32_t PIOS_USB_HID_TxBufferPutMoreNonBlocking(uint8_t id, const uint8_t *buffe
*/
int32_t PIOS_USB_HID_TxBufferPutMore(uint8_t id, const uint8_t *buffer, uint16_t len)
{
int32_t error;
while((error = PIOS_USB_HID_TxBufferPutMoreNonBlocking(id, buffer, len)) == -2);
return error;
uint32_t error;
if((error = PIOS_USB_HID_TxBufferPutMoreNonBlocking(id, buffer, len)) != 0)
return error;
while( bufferBufferedData(&txBuffer) )
taskYIELD();
return 0;
}
/**
@ -299,7 +304,7 @@ int32_t PIOS_USB_HID_RxBufferUsed(uint8_t id)
*/
void PIOS_USB_HID_EP1_IN_Callback(void)
{
//sendChunk();
sendChunk();
}
/**

2
flight/PiOS/STM32F10x/pios_usb_hid_istr.c
View File

@ -33,7 +33,7 @@ __IO uint8_t bIntPackSOF = 0; /* SOFs received between 2 consecutive packets */
/* function pointers to non-control endpoints service routines */
void (*pEpInt_IN[7])(void) =
{
EP1_IN_Callback, //PIOS_USB_HID_EP1_IN_Callback,
PIOS_USB_HID_EP1_IN_Callback,
EP2_IN_Callback,
EP3_IN_Callback,
EP4_IN_Callback,