This commit is contained in:
iceman1001 committed 2023-10-18 20:34:35 +02:00
1 parent 185da09e62
commit 1f3cf80898
16 files changed
+139 -107

No files matched your search

+15 -15
View File
@@ -1,13 +1,13 @@
#include "ringbuffer.h"
#include <stdlib.h>
RingBuffer* RingBuf_create(int capacity) {
RingBuffer* buffer = (RingBuffer*)malloc(sizeof(RingBuffer));
RingBuffer *RingBuf_create(int capacity) {
RingBuffer *buffer = (RingBuffer *)malloc(sizeof(RingBuffer));
if (!buffer) {
return NULL;
}
buffer->data = (uint8_t*)calloc(capacity, sizeof(uint8_t));
buffer->data = (uint8_t *)calloc(capacity, sizeof(uint8_t));
if (!buffer->data) {
free(buffer);
return NULL;
@@ -21,15 +21,15 @@ RingBuffer* RingBuf_create(int capacity) {
return buffer;
}
inline bool RingBuf_isFull(RingBuffer* buffer) {
inline bool RingBuf_isFull(RingBuffer *buffer) {
return buffer->size == buffer->capacity;
}
inline bool RingBuf_isEmpty(RingBuffer* buffer) {
inline bool RingBuf_isEmpty(RingBuffer *buffer) {
return buffer->size == 0;
}
bool RingBuf_enqueue(RingBuffer* buffer, uint8_t value) {
bool RingBuf_enqueue(RingBuffer *buffer, uint8_t value) {
if (RingBuf_isFull(buffer)) {
return false;
}
@@ -40,7 +40,7 @@ bool RingBuf_enqueue(RingBuffer* buffer, uint8_t value) {
return true;
}
bool RingBuf_dequeue(RingBuffer* buffer, uint8_t* value) {
bool RingBuf_dequeue(RingBuffer *buffer, uint8_t *value) {
if (RingBuf_isEmpty(buffer)) {
return false;
}
@@ -51,7 +51,7 @@ bool RingBuf_dequeue(RingBuffer* buffer, uint8_t* value) {
return true;
}
int RingBuf_enqueueBatch(RingBuffer* buffer, const uint8_t* values, int count) {
int RingBuf_enqueueBatch(RingBuffer *buffer, const uint8_t *values, int count) {
int processed = 0;
if (RingBuf_getAvailableSize(buffer) < count) {
@@ -69,7 +69,7 @@ int RingBuf_enqueueBatch(RingBuffer* buffer, const uint8_t* values, int count) {
return processed;
}
int RingBuf_dequeueBatch(RingBuffer* buffer, uint8_t* values, int count) {
int RingBuf_dequeueBatch(RingBuffer *buffer, uint8_t *values, int count) {
int processed = 0;
if (buffer->size < count) {
@@ -87,32 +87,32 @@ int RingBuf_dequeueBatch(RingBuffer* buffer, uint8_t* values, int count) {
return processed;
}
inline int RingBuf_getUsedSize(RingBuffer* buffer) {
inline int RingBuf_getUsedSize(RingBuffer *buffer) {
return buffer->size;
}
inline int RingBuf_getAvailableSize(RingBuffer* buffer) {
inline int RingBuf_getAvailableSize(RingBuffer *buffer) {
return (buffer->capacity) - (buffer->size);
}
void RingBuf_destroy(RingBuffer* buffer) {
void RingBuf_destroy(RingBuffer *buffer) {
if (buffer != NULL)
free(buffer->data);
free(buffer);
}
inline int RingBuf_getContinousAvailableSize(RingBuffer* buffer) {
inline int RingBuf_getContinousAvailableSize(RingBuffer *buffer) {
const int availableSize = RingBuf_getAvailableSize(buffer);
const int continousSize = (buffer->capacity) - (buffer->rear);
return (availableSize < continousSize) ? availableSize : continousSize;
}
inline void RingBuf_postEnqueueBatch(RingBuffer* buffer, int count) {
inline void RingBuf_postEnqueueBatch(RingBuffer *buffer, int count) {
// no check there
buffer->rear = (buffer->rear + count) % buffer->capacity;
buffer->size += count;
}
inline uint8_t* RingBuf_getRearPtr(RingBuffer* buffer) {
inline uint8_t *RingBuf_getRearPtr(RingBuffer *buffer) {
return buffer->data + buffer->rear;
}
+14 -14
View File
@@ -5,27 +5,27 @@
#include <stdint.h>
typedef struct {
uint8_t* data;
uint8_t *data;
int capacity;
int size;
int front;
int rear;
} RingBuffer;
RingBuffer* RingBuf_create(int capacity);
bool RingBuf_isFull(RingBuffer* buffer);
bool RingBuf_isEmpty(RingBuffer* buffer);
bool RingBuf_enqueue(RingBuffer* buffer, uint8_t value);
bool RingBuf_dequeue(RingBuffer* buffer, uint8_t* value);
int RingBuf_enqueueBatch(RingBuffer* buffer, const uint8_t* values, int count);
int RingBuf_dequeueBatch(RingBuffer* buffer, uint8_t* values, int count);
int RingBuf_getUsedSize(RingBuffer* buffer);
int RingBuf_getAvailableSize(RingBuffer* buffer);
void RingBuf_destroy(RingBuffer* buffer);
RingBuffer *RingBuf_create(int capacity);
bool RingBuf_isFull(RingBuffer *buffer);
bool RingBuf_isEmpty(RingBuffer *buffer);
bool RingBuf_enqueue(RingBuffer *buffer, uint8_t value);
bool RingBuf_dequeue(RingBuffer *buffer, uint8_t *value);
int RingBuf_enqueueBatch(RingBuffer *buffer, const uint8_t *values, int count);
int RingBuf_dequeueBatch(RingBuffer *buffer, uint8_t *values, int count);
int RingBuf_getUsedSize(RingBuffer *buffer);
int RingBuf_getAvailableSize(RingBuffer *buffer);
void RingBuf_destroy(RingBuffer *buffer);
// for direct write
int RingBuf_getContinousAvailableSize(RingBuffer* buffer);
void RingBuf_postEnqueueBatch(RingBuffer* buffer, int count);
uint8_t* RingBuf_getRearPtr(RingBuffer* buffer);
int RingBuf_getContinousAvailableSize(RingBuffer *buffer);
void RingBuf_postEnqueueBatch(RingBuffer *buffer, int count);
uint8_t *RingBuf_getRearPtr(RingBuffer *buffer);
#endif
+6 -6
View File
@@ -56,7 +56,7 @@ typedef struct {
int fd; // Serial port file descriptor
term_info tiOld; // Terminal info before using the port
term_info tiNew; // Terminal info during the transaction
RingBuffer* udpBuffer;
RingBuffer *udpBuffer;
} serial_port_unix_t_t;
// see pm3_cmd.h
@@ -150,7 +150,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
portstr = rColon + 1;
} else {
portstr = "18888";
}
}
}
// handle the end of the address
@@ -261,7 +261,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
portstr = rColon + 1;
} else {
portstr = "18888";
}
}
}
// handle the end of the address
@@ -519,9 +519,9 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
*pszRxLen = 0;
do {
int res;
if(spu->udpBuffer != NULL) {
if (spu->udpBuffer != NULL) {
// for UDP connection, try to use the data from the buffer
byteCount = RingBuf_getAvailableSize(spu->udpBuffer);
// Cap the number of bytes, so we don't overrun the buffer
if (pszMaxRxLen - (*pszRxLen) < byteCount) {
@@ -536,7 +536,7 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
return PM3_SUCCESS;
}
}
// Reset file descriptor
FD_ZERO(&rfds);
FD_SET(spu->fd, &rfds);
+2 -2
View File
@@ -38,7 +38,7 @@ typedef struct {
DCB dcb; // Device control settings
COMMTIMEOUTS ct; // Serial port time-out configuration
SOCKET hSocket; // Socket handle
RingBuffer* udpBuffer; // Buffer for UDP
RingBuffer *udpBuffer; // Buffer for UDP
} serial_port_windows_t;
// this is for TCP connection
@@ -473,7 +473,7 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
*pszRxLen = 0;
do {
int res;
if(spw->udpBuffer != NULL) {
if (spw->udpBuffer != NULL) {
// for UDP connection, try to use the data from the buffer
byteCount = RingBuf_getAvailableSize(spw->udpBuffer);