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

You now supply a buffer address and buffer size when initializing the fifo buffer.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2171 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-11-28 10:59:24 +00:00 committed by pip
parent 45b216bf57
commit 912ba59cf9
2 changed files with 150 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
flight/Libraries/fifo_buffer.c
View File

@ -31,233 +31,236 @@
// circular buffer functions // circular buffer functions
uint16_t fifoBuf_getSize(t_fifo_buffer *buf) uint16_t fifoBuf_getSize(t_fifo_buffer *buf)
{ // return the usable size of the buffer { // return the usable size of the buffer
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
if (buf_size > 0) if (buf_size > 0)
return (buf_size - 1); return (buf_size - 1);
else else
return 0; return 0;
} }
uint16_t fifoBuf_getUsed(t_fifo_buffer *buf) uint16_t fifoBuf_getUsed(t_fifo_buffer *buf)
{ // return the number of bytes available in the rx buffer { // return the number of bytes available in the rx buffer
uint16_t rd = buf->rd; uint16_t rd = buf->rd;
uint16_t wr = buf->wr; uint16_t wr = buf->wr;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint16_t num_bytes = wr - rd; uint16_t num_bytes = wr - rd;
if (wr < rd) if (wr < rd)
num_bytes = (buf_size - rd) + wr; num_bytes = (buf_size - rd) + wr;
return num_bytes; return num_bytes;
} }
uint16_t fifoBuf_getFree(t_fifo_buffer *buf) uint16_t fifoBuf_getFree(t_fifo_buffer *buf)
{ // return the free space size in the buffer { // return the free space size in the buffer
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint16_t num_bytes = fifoBuf_getUsed(buf); uint16_t num_bytes = fifoBuf_getUsed(buf);
return ((buf_size - num_bytes) - 1); return ((buf_size - num_bytes) - 1);
} }
void fifoBuf_clearData(t_fifo_buffer *buf) void fifoBuf_clearData(t_fifo_buffer *buf)
{ // remove all data from the buffer { // remove all data from the buffer
buf->rd = buf->wr = 0; buf->rd = buf->wr = 0;
} }
void fifoBuf_removeData(t_fifo_buffer *buf, uint16_t len) void fifoBuf_removeData(t_fifo_buffer *buf, uint16_t len)
{ // remove a number of bytes from the buffer { // remove a number of bytes from the buffer
uint16_t rd = buf->rd; uint16_t rd = buf->rd;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
// get number of bytes available // get number of bytes available
uint16_t num_bytes = fifoBuf_getUsed(buf); uint16_t num_bytes = fifoBuf_getUsed(buf);
if (num_bytes > len) if (num_bytes > len)
num_bytes = len; num_bytes = len;
if (num_bytes < 1) if (num_bytes < 1)
return; // nothing to remove return; // nothing to remove
rd += num_bytes; rd += num_bytes;
if (rd >= buf_size) if (rd >= buf_size)
rd -= buf_size; rd -= buf_size;
buf->rd = rd; buf->rd = rd;
} }
int16_t fifoBuf_getBytePeek(t_fifo_buffer *buf) int16_t fifoBuf_getBytePeek(t_fifo_buffer *buf)
{ // get a data byte from the buffer without removing it { // get a data byte from the buffer without removing it
uint16_t rd = buf->rd; uint16_t rd = buf->rd;
// get number of bytes available // get number of bytes available
uint16_t num_bytes = fifoBuf_getUsed(buf); uint16_t num_bytes = fifoBuf_getUsed(buf);
if (num_bytes < 1) if (num_bytes < 1)
return -1; // no byte retuened return -1; // no byte retuened
return buf->buffer[rd]; // return the byte return buf->buf_ptr[rd]; // return the byte
} }
int16_t fifoBuf_getByte(t_fifo_buffer *buf) int16_t fifoBuf_getByte(t_fifo_buffer *buf)
{ // get a data byte from the buffer { // get a data byte from the buffer
uint16_t rd = buf->rd; uint16_t rd = buf->rd;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint8_t *buff = buf->buf_ptr;
// get number of bytes available // get number of bytes available
uint16_t num_bytes = fifoBuf_getUsed(buf); uint16_t num_bytes = fifoBuf_getUsed(buf);
if (num_bytes < 1) if (num_bytes < 1)
return -1; // no byte returned return -1; // no byte returned
uint8_t b = buf->buffer[rd]; uint8_t b = buff[rd];
if (++rd >= buf_size) if (++rd >= buf_size)
rd = 0; rd = 0;
buf->rd = rd; buf->rd = rd;
return b; // return the byte return b; // return the byte
} }
uint16_t fifoBuf_getDataPeek(t_fifo_buffer *buf, void *data, uint16_t len) uint16_t fifoBuf_getDataPeek(t_fifo_buffer *buf, void *data, uint16_t len)
{ // get data from the buffer without removing it { // get data from the buffer without removing it
uint16_t rd = buf->rd; uint16_t rd = buf->rd;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint8_t *buff = buf->buffer; uint8_t *buff = buf->buf_ptr;
// get number of bytes available // get number of bytes available
uint16_t num_bytes = fifoBuf_getUsed(buf); uint16_t num_bytes = fifoBuf_getUsed(buf);
if (num_bytes > len) if (num_bytes > len)
num_bytes = len; num_bytes = len;
if (num_bytes < 1) if (num_bytes < 1)
return 0; // return number of bytes copied return 0; // return number of bytes copied
uint8_t *p = (uint8_t *)data; uint8_t *p = (uint8_t *)data;
uint16_t i = 0; uint16_t i = 0;
while (num_bytes > 0) while (num_bytes > 0)
{ {
uint16_t j = buf_size - rd; uint16_t j = buf_size - rd;
if (j > num_bytes) if (j > num_bytes)
j = num_bytes; j = num_bytes;
memcpy(p + i, buff + rd, j); memcpy(p + i, buff + rd, j);
i += j; i += j;
num_bytes -= j; num_bytes -= j;
rd += j; rd += j;
if (rd >= buf_size) if (rd >= buf_size)
rd = 0; rd = 0;
} }
return i; // return number of bytes copied return i; // return number of bytes copied
} }
uint16_t fifoBuf_getData(t_fifo_buffer *buf, void *data, uint16_t len) uint16_t fifoBuf_getData(t_fifo_buffer *buf, void *data, uint16_t len)
{ // get data from our rx buffer { // get data from our rx buffer
uint16_t rd = buf->rd; uint16_t rd = buf->rd;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint8_t *buff = buf->buffer; uint8_t *buff = buf->buf_ptr;
// get number of bytes available // get number of bytes available
uint16_t num_bytes = fifoBuf_getUsed(buf); uint16_t num_bytes = fifoBuf_getUsed(buf);
if (num_bytes > len) if (num_bytes > len)
num_bytes = len; num_bytes = len;
if (num_bytes < 1) if (num_bytes < 1)
return 0; // return number of bytes copied return 0; // return number of bytes copied
uint8_t *p = (uint8_t *)data; uint8_t *p = (uint8_t *)data;
uint16_t i = 0; uint16_t i = 0;
while (num_bytes > 0) while (num_bytes > 0)
{ {
uint16_t j = buf_size - rd; uint16_t j = buf_size - rd;
if (j > num_bytes) if (j > num_bytes)
j = num_bytes; j = num_bytes;
memcpy(p + i, buff + rd, j); memcpy(p + i, buff + rd, j);
i += j; i += j;
num_bytes -= j; num_bytes -= j;
rd += j; rd += j;
if (rd >= buf_size) if (rd >= buf_size)
rd = 0; rd = 0;
} }
buf->rd = rd; buf->rd = rd;
return i; // return number of bytes copied return i; // return number of bytes copied
} }
uint16_t fifoBuf_putByte(t_fifo_buffer *buf, const uint8_t b) uint16_t fifoBuf_putByte(t_fifo_buffer *buf, const uint8_t b)
{ // add a data byte to the buffer { // add a data byte to the buffer
uint16_t wr = buf->wr; uint16_t wr = buf->wr;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint8_t *buff = buf->buf_ptr;
uint16_t num_bytes = fifoBuf_getFree(buf); uint16_t num_bytes = fifoBuf_getFree(buf);
if (num_bytes < 1) if (num_bytes < 1)
return 0; return 0;
buf->buffer[wr] = b; buff[wr] = b;
if (++wr >= buf_size) if (++wr >= buf_size)
wr = 0; wr = 0;
buf->wr = wr; buf->wr = wr;
return 1; // return number of bytes copied return 1; // return number of bytes copied
} }
uint16_t fifoBuf_putData(t_fifo_buffer *buf, const void *data, uint16_t len) uint16_t fifoBuf_putData(t_fifo_buffer *buf, const void *data, uint16_t len)
{ // add data to the buffer { // add data to the buffer
uint16_t wr = buf->wr; uint16_t wr = buf->wr;
uint16_t buf_size = buf->buf_size; uint16_t buf_size = buf->buf_size;
uint8_t *buff = buf->buffer; uint8_t *buff = buf->buf_ptr;
uint16_t num_bytes = fifoBuf_getFree(buf); uint16_t num_bytes = fifoBuf_getFree(buf);
if (num_bytes > len) if (num_bytes > len)
num_bytes = len; num_bytes = len;
if (num_bytes < 1) if (num_bytes < 1)
return 0; // return number of bytes copied return 0; // return number of bytes copied
uint8_t *p = (uint8_t *)data; uint8_t *p = (uint8_t *)data;
uint16_t i = 0; uint16_t i = 0;
while (num_bytes > 0) while (num_bytes > 0)
{ {
uint16_t j = buf_size - wr; uint16_t j = buf_size - wr;
if (j > num_bytes) if (j > num_bytes)
j = num_bytes; j = num_bytes;
memcpy(buff + wr, p + i, j); memcpy(buff + wr, p + i, j);
i += j; i += j;
num_bytes -= j; num_bytes -= j;
wr += j; wr += j;
if (wr >= buf_size) if (wr >= buf_size)
wr = 0; wr = 0;
} }
buf->wr = wr; buf->wr = wr;
return i; // return number of bytes copied return i; // return number of bytes copied
} }
void fifoBuf_init(t_fifo_buffer *buf) void fifoBuf_init(t_fifo_buffer *buf, const void *buffer, const uint16_t buffer_size)
{ {
buf->rd = 0; buf->buf_ptr = (uint8_t *)buffer;
buf->wr = 0; buf->rd = 0;
buf->buf_size = FIFO_BUFFER_SIZE; buf->wr = 0;
buf->buf_size = buffer_size;
} }
// ***************************************************************************** // *****************************************************************************

12
flight/Libraries/inc/fifo_buffer.h
View File

@ -28,16 +28,14 @@
#include "stm32f10x.h" #include "stm32f10x.h"
#define FIFO_BUFFER_SIZE 1024
// ********************* // *********************
typedef struct typedef struct
{ {
uint8_t buffer[FIFO_BUFFER_SIZE] __attribute__ ((aligned(4))); uint8_t *buf_ptr;
volatile uint16_t rd; volatile uint16_t rd;
volatile uint16_t wr; volatile uint16_t wr;
uint16_t buf_size; uint16_t buf_size;
} t_fifo_buffer; } t_fifo_buffer;
// ********************* // *********************
@ -60,7 +58,7 @@ uint16_t fifoBuf_putByte(t_fifo_buffer *buf, const uint8_t b);
uint16_t fifoBuf_putData(t_fifo_buffer *buf, const void *data, uint16_t len); uint16_t fifoBuf_putData(t_fifo_buffer *buf, const void *data, uint16_t len);
void fifoBuf_init(t_fifo_buffer *buf); void fifoBuf_init(t_fifo_buffer *buf, const void *buffer, const uint16_t buffer_size);
// ********************* // *********************