mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Change fifo push to eliminate chars > x80 

sending 0xff through rigctld was pushing -1 and causing peek to lock up
pull/1347/head
Mike Black W9MDB 2023-07-24 09:44:40 -05:00
rodzic 75569ab3f2
commit 557e9a71e5
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
src/fifo.c
Wyświetl plik

@ -26,6 +26,7 @@ int push(FIFO_RIG *fifo, const char *msg)
{ {
// FIFO is meant for CW use only // FIFO is meant for CW use only
// So we skip some chars that don't work with CW // So we skip some chars that don't work with CW
if (msg[i] & 0x80) continue; // drop any chars that have high bit set
switch(msg[i]) switch(msg[i])
{ {
case 0x0d: case 0x0d:
@ -33,7 +34,7 @@ int push(FIFO_RIG *fifo, const char *msg)
continue; continue;
} }
fifo->data[fifo->tail] = msg[i]; fifo->data[fifo->tail] = msg[i];
if (isprint(msg[i])) if (isalnum(msg[i]))
rig_debug(RIG_DEBUG_VERBOSE, "%s: push %c (%d,%d)\n", __func__, msg[i], rig_debug(RIG_DEBUG_VERBOSE, "%s: push %c (%d,%d)\n", __func__, msg[i],
fifo->head, fifo->tail); fifo->head, fifo->tail);
else else
@ -55,7 +56,7 @@ int peek(FIFO_RIG *fifo)
if (fifo->tail > 1023 || fifo->head > 1023) return -1; if (fifo->tail > 1023 || fifo->head > 1023) return -1;
if (fifo->tail == fifo->head) { return -1; } if (fifo->tail == fifo->head) { return -1; }
char c = fifo->data[fifo->head]; char c = fifo->data[fifo->head];
if (isprint(c)) if (isalnum(c))
rig_debug(RIG_DEBUG_VERBOSE, "%s: peek %c (%d,%d)\n", __func__, c, fifo->head, rig_debug(RIG_DEBUG_VERBOSE, "%s: peek %c (%d,%d)\n", __func__, c, fifo->head,
fifo->tail); fifo->tail);
else else
@ -69,7 +70,7 @@ int pop(FIFO_RIG *fifo)
if (fifo->tail == fifo->head) { return -1; } if (fifo->tail == fifo->head) { return -1; }
char c = fifo->data[fifo->head]; char c = fifo->data[fifo->head];
if (isprint(c)) if (isalnum(c))
rig_debug(RIG_DEBUG_VERBOSE, "%s: pop %c (%d,%d)\n", __func__, c, fifo->head, rig_debug(RIG_DEBUG_VERBOSE, "%s: pop %c (%d,%d)\n", __func__, c, fifo->head,
fifo->tail); fifo->tail);
else else