rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-197 Flight/USB: Make non-blocking send return -2 instead of -1 for not enough space

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2026 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-10-28 14:30:00 +00:00 committed by peabody124
parent 365a2a121a
commit 0bdaf4d0df
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,19 +225,21 @@ void sendChunk()
* \param[in] *buffer pointer to buffer which should be transmitted
* \param[in] len number of bytes which should be transmitted
* \return 0 if no error
* \return -1 if too many bytes to be send
* \return -1 if port unavailable (disconnected)
* \return -2 if too many bytes to be send
* \note Applications shouldn't call this function directly, instead please use \ref PIOS_COM layer functions
*/
int32_t PIOS_USB_HID_TxBufferPutMoreNonBlocking(uint8_t id, const uint8_t * buffer, uint16_t len)
{
/*if( len > PIOS_USB_HID_DATA_LENGTH )
return - 1; */
uint16_t ret;
if(!transfer_possible)
return -1;
uint8_t previous_data = bufferBufferedData(&txBuffer);
if (len > bufferRemainingSpace(&txBuffer))
return -1; /* Cannot send all requested bytes */
return -2; /* Cannot send all requested bytes */
while(in_irq);
PIOS_IRQ_Disable();
@ -247,7 +249,7 @@ int32_t PIOS_USB_HID_TxBufferPutMoreNonBlocking(uint8_t id, const uint8_t * buff
ret = 0;
PIOS_IRQ_Enable();
if (ret == 0)
return -1;
return -2;
/* 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)
@ -267,20 +269,11 @@ int32_t PIOS_USB_HID_TxBufferPutMoreNonBlocking(uint8_t id, const uint8_t * buff
*/
int32_t PIOS_USB_HID_TxBufferPutMore(uint8_t id, const uint8_t * buffer, uint16_t len)
{
if(len > TX_BUFFER_SIZE)
return -1;
uint32_t error;
if ((error = PIOS_USB_HID_TxBufferPutMoreNonBlocking(id, buffer, len)) != 0)
return error;
error = 1;
while (error) {
while(in_irq);
PIOS_IRQ_Disable();
if(!in_irq)
error = bufferBufferedData(&txBuffer);
else
error = 1;
PIOS_IRQ_Enable();
while ((error = PIOS_USB_HID_TxBufferPutMoreNonBlocking(id, buffer, len)) == -2) {
#if defined(PIOS_INCLUDE_FREERTOS)
taskYIELD();
#endif