Merge branch 'bugfix/ringbuffer_receive_upto_api' into 'master'

bugfix: ring buffer

Fix API xRingbufferReceiveUpToFromISR

See merge request !327
This commit is contained in:
Angus Gratton 2016-12-21 10:01:13 +08:00
commit 4f3ff1cf7e

View file

@ -600,7 +600,7 @@ void *xRingbufferReceiveUpToFromISR(RingbufHandle_t ringbuf, size_t *item_size,
configASSERT(rb);
configASSERT(rb->flags & flag_bytebuf);
portENTER_CRITICAL_ISR(&rb->mux);
itemData=rb->getItemFromRingbufImpl(rb, item_size, 0);
itemData=rb->getItemFromRingbufImpl(rb, item_size, wanted_size);
portEXIT_CRITICAL_ISR(&rb->mux);
return (void*)itemData;
}