RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

capture: Fix buffer allocation and free

Browse Source 
Do not use function static variables.  Remove superfluous volatile
qualifiers.  Use proper integer types.

Close #2706.
This commit is contained in:
Sebastian Huber
2016-05-12 11:12:27 +02:00
parent 1379d840a4
commit 2f11d4a014
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/libmisc/capture/capture_buffer.c
View File

@@ -28,8 +28,8 @@
void * rtems_capture_buffer_allocate( rtems_capture_buffer_t* buffer, size_t size ) void * rtems_capture_buffer_allocate( rtems_capture_buffer_t* buffer, size_t size )
{ {
static uint32_t end; size_t end;
static void *ptr; void *ptr;
if ( rtems_capture_buffer_is_full( buffer ) ) if ( rtems_capture_buffer_is_full( buffer ) )
return NULL; return NULL;
@@ -89,9 +89,9 @@ void * rtems_capture_buffer_allocate( rtems_capture_buffer_t* buffer, size_t siz
void *rtems_capture_buffer_free( rtems_capture_buffer_t* buffer, size_t size ) void *rtems_capture_buffer_free( rtems_capture_buffer_t* buffer, size_t size )
{ {
static void *ptr; void *ptr;
static uint32_t next; size_t next;
size_t buff_size; size_t buff_size;
if (size == 0) if (size == 0)
return NULL; return NULL;

12
cpukit/libmisc/capture/capture_buffer.h
View File

@@ -32,12 +32,12 @@ extern "C" {
#endif #endif
typedef struct { typedef struct {
uint8_t *buffer; uint8_t *buffer;
size_t size; size_t size;
volatile uint32_t count; size_t count;
volatile uint32_t head; size_t head;
volatile uint32_t tail; size_t tail;
volatile uint32_t end; size_t end;
} rtems_capture_buffer_t; } rtems_capture_buffer_t;
static inline void rtems_capture_buffer_flush( rtems_capture_buffer_t* buffer ) static inline void rtems_capture_buffer_flush( rtems_capture_buffer_t* buffer )