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

Astyle files

pull/1045/head
Mike Black W9MDB 2022-05-29 12:06:44 -05:00
rodzic fc26aa545f
commit f19d354ede
5 zmienionych plików z 31 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
rigs/yaesu/ft847.c
Wyświetl plik

@ -612,12 +612,12 @@ const struct rig_caps ft650_caps =
}, /* rx range end */ }, /* rx range end */
.tx_range_list2 = { .tx_range_list2 = {
{kHz(24500),kHz(25000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS}, {kHz(24500), kHz(25000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
{kHz(24500),kHz(25000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS}, {kHz(24500), kHz(25000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
{kHz(28000),kHz(29700), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS}, {kHz(28000), kHz(29700), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
{kHz(28000),kHz(29700), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS}, {kHz(28000), kHz(29700), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
{kHz(50000),kHz(54000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS}, {kHz(50000), kHz(54000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
{kHz(50000),kHz(54000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS}, {kHz(50000), kHz(54000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
RIG_FRNG_END, RIG_FRNG_END,
}, /* tx range end */ }, /* tx range end */

14
simulators/simicom.c
Wyświetl plik

@ -253,9 +253,10 @@ void frameParse(int fd, unsigned char *frame, int len)
} }
break; break;
case 0x1c: case 0x1c:
switch(frame[5]) switch (frame[5])
{ {
case 0: case 0:
if (frame[6] == 0xfd) if (frame[6] == 0xfd)
{ {
@ -263,16 +264,19 @@ void frameParse(int fd, unsigned char *frame, int len)
frame[7] = 0xfd; frame[7] = 0xfd;
write(fd, frame, 8); write(fd, frame, 8);
} }
else { else
{
ptt = frame[6]; ptt = frame[6];
frame[7] = 0xfb; frame[7] = 0xfb;
frame[8] = 0xfd; frame[8] = 0xfd;
write(fd, frame, 9); write(fd, frame, 9);
} }
break; break;
} }
break;
break;
#ifdef X25 #ifdef X25

6
src/rig.c
Wyświetl plik

@ -328,7 +328,7 @@ void add2debugmsgsave(const char *s)
char *p; char *p;
char stmp[DEBUGMSGSAVE_SIZE]; char stmp[DEBUGMSGSAVE_SIZE];
int i, nlines; int i, nlines;
int maxmsg = DEBUGMSGSAVE_SIZE/2; int maxmsg = DEBUGMSGSAVE_SIZE / 2;
MUTEX_LOCK(debugmsgsave); MUTEX_LOCK(debugmsgsave);
memset(stmp, 0, sizeof(stmp)); memset(stmp, 0, sizeof(stmp));
p = debugmsgsave; p = debugmsgsave;
@ -361,7 +361,8 @@ void add2debugmsgsave(const char *s)
} }
--nlines; --nlines;
if (nlines == 0 && strlen(debugmsgsave) > maxmsg) strcpy(debugmsgsave,"!!!!debugmsgsave too long\n");
if (nlines == 0 && strlen(debugmsgsave) > maxmsg) { strcpy(debugmsgsave, "!!!!debugmsgsave too long\n"); }
} }
if (strlen(stmp) + strlen(s) + 1 < DEBUGMSGSAVE_SIZE) if (strlen(stmp) + strlen(s) + 1 < DEBUGMSGSAVE_SIZE)
@ -374,6 +375,7 @@ void add2debugmsgsave(const char *s)
"%s: debugmsgsave overflow!! len of debugmsgsave=%d, len of add=%d\n", __func__, "%s: debugmsgsave overflow!! len of debugmsgsave=%d, len of add=%d\n", __func__,
(int)strlen(debugmsgsave), (int)strlen(s)); (int)strlen(debugmsgsave), (int)strlen(s));
} }
MUTEX_UNLOCK(debugmsgsave); MUTEX_UNLOCK(debugmsgsave);
} }

3
src/sprintflst.c
Wyświetl plik

@ -41,7 +41,8 @@ int check_buffer_overflow(char *str, int len, int nlen)
{ {
if (len + 32 >= nlen) // make sure at least 32 bytes are available if (len + 32 >= nlen) // make sure at least 32 bytes are available
{ {
rig_debug(RIG_DEBUG_ERR, "%s: buffer overflow, len=%u, nlen=%d, str='%s', len+32 must be >= nlen\n", rig_debug(RIG_DEBUG_ERR,
"%s: buffer overflow, len=%u, nlen=%d, str='%s', len+32 must be >= nlen\n",
__func__, len, nlen, str); __func__, len, nlen, str);
} }

16
tests/rigctl_parse.c
Wyświetl plik

@ -364,8 +364,8 @@ static struct test_table test_list[] =
{ 0xf7, "get_mode_bandwidths", ACTION(get_mode_bandwidths), ARG_IN | ARG_NOVFO, "Mode" }, { 0xf7, "get_mode_bandwidths", ACTION(get_mode_bandwidths), ARG_IN | ARG_NOVFO, "Mode" },
{ 0xa0, "set_separator", ACTION(set_separator), ARG_IN | ARG_NOVFO, "Separator" }, { 0xa0, "set_separator", ACTION(set_separator), ARG_IN | ARG_NOVFO, "Separator" },
{ 0xa1, "get_separator", ACTION(get_separator), ARG_NOVFO, "Separator" }, { 0xa1, "get_separator", ACTION(get_separator), ARG_NOVFO, "Separator" },
{ 0xa2, "set_lock_mode", ACTION(set_lock_mode), ARG_IN | ARG_NOVFO, "Locked" }, { 0xa2, "set_lock_mode", ACTION(set_lock_mode), ARG_IN | ARG_NOVFO, "Locked" },
{ 0xa3, "get_lock_mode", ACTION(get_lock_mode), ARG_NOVFO, "Locked" }, { 0xa3, "get_lock_mode", ACTION(get_lock_mode), ARG_NOVFO, "Locked" },
{ 0x00, "", NULL }, { 0x00, "", NULL },
}; };
@ -2176,7 +2176,9 @@ declare_proto_rig(set_mode)
mode = rig_parse_mode(arg1); mode = rig_parse_mode(arg1);
CHKSCN1ARG(sscanf(arg2, "%ld", &width)); CHKSCN1ARG(sscanf(arg2, "%ld", &width));
if (rig->state.lock_mode) RETURNFUNC(RIG_OK);
if (rig->state.lock_mode) { RETURNFUNC(RIG_OK); }
RETURNFUNC(rig_set_mode(rig, vfo, mode, width)); RETURNFUNC(rig_set_mode(rig, vfo, mode, width));
} }
@ -2337,7 +2339,8 @@ declare_proto_rig(get_vfo_info)
} }
else else
{ {
fprintf(fout, "%.0f%c%s%c%d%c%d%c%d\n", freq, resp_sep, modestr, resp_sep, (int)width, resp_sep, (int)split, resp_sep, fprintf(fout, "%.0f%c%s%c%d%c%d%c%d\n", freq, resp_sep, modestr, resp_sep,
(int)width, resp_sep, (int)split, resp_sep,
(int)satmode); (int)satmode);
} }
@ -5206,8 +5209,9 @@ declare_proto_rig(get_separator)
if ((interactive && prompt) || (interactive && !prompt && ext_resp)) if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{ {
fprintf(fout, "%s: ", cmd->arg1); fprintf(fout, "%s: ", cmd->arg1);
} }
sprintf(buf, "0x%x", rig_resp_sep); sprintf(buf, "0x%x", rig_resp_sep);
fprintf(fout, "%s\n", buf); fprintf(fout, "%s\n", buf);
@ -5227,7 +5231,7 @@ declare_proto_rig(get_lock_mode)
{ {
if ((interactive && prompt) || (interactive && !prompt && ext_resp)) if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{ {
fprintf(fout, "%s: ", cmd->arg1); fprintf(fout, "%s: ", cmd->arg1);
} }
fprintf(fout, "%d\n", rig->state.lock_mode); fprintf(fout, "%d\n", rig->state.lock_mode);