Git-Mirrors/OpenModem
1
0
Fork 0
mirror of https://github.com/markqvist/OpenModem.git synced 2024-09-19 17:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed FIFO16 buffer and inits

Browse Source
This commit is contained in:
Mark Qvist 2020-06-01 13:05:09 +02:00
parent 0b78bce168
commit c5dad05775
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device.h
View File

@ -5,7 +5,7 @@
// Version info // Version info
#define MAJ_VERSION 0x01 #define MAJ_VERSION 0x01
#define MIN_VERSION 0x01 #define MIN_VERSION 0x02
// CPU settings // CPU settings
#define TARGET_CPU m1284p #define TARGET_CPU m1284p
@ -26,8 +26,8 @@
// Serial settings // Serial settings
#define SERIAL_DEBUG false #define SERIAL_DEBUG false
#define TX_MAXWAIT 2UL #define TX_MAXWAIT 2UL
#define CONFIG_QUEUE_SIZE 6000 #define CONFIG_QUEUE_SIZE 5760
#define CONFIG_QUEUE_MAX_LENGTH 15 #define CONFIG_QUEUE_MAX_LENGTH 32
#define CONFIG_UART0_BUFFER_SIZE 1536 #define CONFIG_UART0_BUFFER_SIZE 1536
#define CONFIG_UART1_BUFFER_SIZE 128 #define CONFIG_UART1_BUFFER_SIZE 128
#define CONFIG_SERIAL_TIMEOUT_MS 10 #define CONFIG_SERIAL_TIMEOUT_MS 10

9
protocol/KISS.c
View File

@ -52,11 +52,12 @@ void kiss_init(AX25Ctx *ax25, Afsk *afsk, Serial *ser) {
channel = afsk; channel = afsk;
memset(packet_queue, 0, sizeof(packet_queue)); memset(packet_queue, 0, sizeof(packet_queue));
memset(packet_starts_buf, 0, sizeof(packet_starts));
memset(packet_lengths_buf, 0, sizeof(packet_lengths));
fifo16_init(&packet_starts, packet_starts_buf, sizeof(packet_starts_buf)); memset(packet_starts_buf, 0, sizeof(packet_starts));
fifo16_init(&packet_lengths, packet_lengths_buf, sizeof(packet_lengths_buf)); fifo16_init(&packet_starts, packet_starts_buf, CONFIG_QUEUE_MAX_LENGTH);
memset(packet_lengths_buf, 0, sizeof(packet_lengths));
fifo16_init(&packet_lengths, packet_lengths_buf, CONFIG_QUEUE_MAX_LENGTH);
} }
void kiss_poll(void) { void kiss_poll(void) {

2
util/FIFO.h
View File

@ -75,7 +75,7 @@ static inline unsigned char fifo_pop_locked(FIFOBuffer *f) {
inline void fifo_init(FIFOBuffer *f, unsigned char *buffer, size_t size) { inline void fifo_init(FIFOBuffer *f, unsigned char *buffer, size_t size) {
f->head = f->tail = f->begin = buffer; f->head = f->tail = f->begin = buffer;
f->end = buffer + size -1; f->end = buffer + size;
} }
inline size_t fifo_len(FIFOBuffer *f) { inline size_t fifo_len(FIFOBuffer *f) {

4
util/FIFO16.h
View File

@ -77,11 +77,11 @@ static inline size_t fifo16_pop_locked(FIFOBuffer16 *f) {
inline void fifo16_init(FIFOBuffer16 *f, size_t *buffer, size_t size) { inline void fifo16_init(FIFOBuffer16 *f, size_t *buffer, size_t size) {
f->head = f->tail = f->begin = buffer; f->head = f->tail = f->begin = buffer;
f->end = buffer + (size/sizeof(size_t)) - 2; f->end = buffer + size;
} }
inline size_t fifo16_len(FIFOBuffer16 *f) { inline size_t fifo16_len(FIFOBuffer16 *f) {
return ((f->end - f->begin))/sizeof(size_t); return (f->end - f->begin);
} }
#endif #endif