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

Fix some errors with the HAMLIB_ macro changes

pull/608/head
Michael Black W9MDB 2021-03-11 06:42:21 -06:00
rodzic fd0c8cba7c
commit 1d23fb6358
5 zmienionych plików z 15 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
extra/kylix/hamlib_rigapi.pas
Wyświetl plik

@ -52,15 +52,15 @@ type
//typedef struct rig RIG;
const
RIGNAMSIZ = 30;
RIGVERSIZ = 8;
FILPATHLEN = 512;
FRQRANGESIZ = 30;
MAXCHANDESC = 30; {* describe channel eg: "WWV 5Mhz" *}
TSLSTSIZ = 20; {* max tuning step list size, zero ended *}
FLTLSTSIZ = 16; {* max mode/filter list size, zero ended *}
MAXDBLSTSIZ = 8; {* max preamp/att levels supported, zero ended *}
CHANLSTSIZ = 16; {* max mem_list size, zero ended *}
HAMLIB_RIGNAMSIZ = 30;
HAMLIB_RIGVERSIZ = 8;
HAMLIB_FILPATHLEN = 512;
HAMLIB_FRQRANGESIZ = 30;
HAMLIB_MAXCHANDESC = 30; {* describe channel eg: "WWV 5Mhz" *}
HAMLIB_TSLSTSIZ = 20; {* max tuning step list size, zero ended *}
HAMLIB_FLTLSTSIZ = 16; {* max mode/filter list size, zero ended *}
HAMLIB_MAXDBLSTSIZ = 8; {* max preamp/att levels supported, zero ended *}
HAMLIB_CHANLSTSIZ = 16; {* max mem_list size, zero ended *}
type
{*

2
rigs/dummy/netrigctl.c
Wyświetl plik

@ -380,7 +380,7 @@ static int netrigctl_open(RIG *rig)
#if 0
/* TODO */
chan_t chan_list[CHANLSTSIZ]; /*!< Channel list, zero ended */
chan_t chan_list[HAMLIB_CHANLSTSIZ]; /*!< Channel list, zero ended */
#endif
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);

4
src/cal.c
Wyświetl plik

@ -63,7 +63,7 @@ float HAMLIB_API rig_raw2val(int rawval, const cal_table_t *cal)
int i;
/* ASSERT(cal != NULL) */
/* ASSERT(cal->size <= MAX_CAL_LENGTH) */
/* ASSERT(cal->size <= HAMLIB_MAX_CAL_LENGTH) */
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -130,7 +130,7 @@ float HAMLIB_API rig_raw2val_float(int rawval, const cal_table_float_t *cal)
int i;
/* ASSERT(cal != NULL) */
/* ASSERT(cal->size <= MAX_CAL_LENGTH) */
/* ASSERT(cal->size <= HAMLIB_MAX_CAL_LENGTH) */
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);

4
tests/memload.c
Wyświetl plik

@ -145,7 +145,7 @@ int set_chan(RIG *rig, channel_t *chan, xmlNodePtr node)
n = chan->channel_num = atoi((char *) prop);
/* find channel caps */
for (i = 0; i < CHANLSTSIZ ; i++)
for (i = 0; i < HAMLIB_CHANLSTSIZ ; i++)
{
if (rig->state.chan_list[i].startc <= n
&& rig->state.chan_list[i].endc >= n)
@ -155,7 +155,7 @@ int set_chan(RIG *rig, channel_t *chan, xmlNodePtr node)
}
}
if (i == CHANLSTSIZ) { return -RIG_EINVAL; }
if (i == HAMLIB_CHANLSTSIZ) { return -RIG_EINVAL; }
fprintf(stderr, "node %d %d\n", n, i);

2
tests/rigmatrix.c
Wyświetl plik

@ -422,7 +422,7 @@ static void draw_range(const freq_range_t range_list[],
{
int i;
for (i = 0; i < FRQRANGESIZ; i++)
for (i = 0; i < HAMLIB_FRQRANGESIZ; i++)
{
float start_pix, end_pix;