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

WARNING: renamed strmode to strrmode because the symbol is already in use on BSD systems 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1139 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.4
Stéphane Fillod, F8CFE 2002-08-26 21:26:06 +00:00
rodzic acb2ff113a
commit 27f6be0fd0
6 zmienionych plików z 20 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
dummy/dummy.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Dummy backend - main file
* Copyright (c) 2001,2002 by Stephane Fillod
*
* $Id: dummy.c,v 1.26 2002-08-16 17:43:01 fillods Exp $
* $Id: dummy.c,v 1.27 2002-08-26 21:26:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -185,7 +185,7 @@ static int dummy_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
sprintf_freq(buf, width);
rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s %s\n", __FUNCTION__,
strvfo(vfo), strmode(mode), buf);
strvfo(vfo), strrmode(mode), buf);
curr->mode = mode;
curr->width = width;
@ -458,7 +458,7 @@ static int dummy_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode, pbwidth_t
sprintf_freq(buf, tx_width);
rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s %s\n", __FUNCTION__,
strvfo(vfo), strmode(tx_mode), buf);
strvfo(vfo), strrmode(tx_mode), buf);
curr->tx_mode = tx_mode;
curr->tx_width = tx_width;

4
gnuradio/gnuradio.cc
Wyświetl plik

@ -3,7 +3,7 @@
* Hamlib GNUradio backend - main file
* Copyright (c) 2001,2002 by Stephane Fillod
*
* $Id: gnuradio.cc,v 1.1 2002-07-06 09:27:38 fillods Exp $
* $Id: gnuradio.cc,v 1.2 2002-08-26 21:26:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -205,7 +205,7 @@ int gr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
sprintf_freq(buf, width);
rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s %s\n",
__FUNCTION__, strvfo(vfo), strmode(mode), buf);
__FUNCTION__, strvfo(vfo), strrmode(mode), buf);
curr->mode = mode;
curr->width = width;

6
src/misc.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - toolbox
* Copyright (c) 2000-2002 by Stephane Fillod and Frank Singleton
*
* $Id: misc.c,v 1.20 2002-07-09 22:18:33 fillods Exp $
* $Id: misc.c,v 1.21 2002-08-26 21:26:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -256,7 +256,7 @@ int sprintf_freq(char *str, freq_t freq)
return sprintf (str, "%g %s", f, hz);
}
const char * strmode(rmode_t mode)
const char * strrmode(rmode_t mode)
{
switch (mode) {
case RIG_MODE_AM: return "AM";
@ -461,7 +461,7 @@ int sprintf_mode(char *str, rmode_t mode)
return 0;
for (i = 0; i < 30; i++) {
const char *ms = strmode(mode & (1UL<<i));
const char *ms = strrmode(mode & (1UL<<i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);

4
src/misc.h
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - toolbox header
* Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
*
* $Id: misc.h,v 1.13 2002-07-06 09:26:59 fillods Exp $
* $Id: misc.h,v 1.14 2002-08-26 21:26:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -68,7 +68,7 @@ extern HAMLIB_EXPORT(int) sprintf_level(char *str, setting_t);
extern HAMLIB_EXPORT(int) sprintf_parm(char *str, setting_t);
extern HAMLIB_EXPORT(int) sprintf_vfop(char *str, vfo_op_t);
extern HAMLIB_EXPORT(int) sprintf_scan(char *str, scan_t);
extern HAMLIB_EXPORT(const char *) strmode(rmode_t mode);
extern HAMLIB_EXPORT(const char *) strrmode(rmode_t mode);
extern HAMLIB_EXPORT(const char *) strvfo(vfo_t vfo);
extern HAMLIB_EXPORT(const char *) strfunc(setting_t);
extern HAMLIB_EXPORT(const char *) strlevel(setting_t);

8
tcl/tclrig.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib tcl/tk bindings - rig
* Copyright (c) 2001,2002 by Stephane Fillod
*
* $Id: tclrig.c,v 1.3 2002-02-15 15:09:03 fillods Exp $
* $Id: tclrig.c,v 1.4 2002-08-26 21:26:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -435,7 +435,7 @@ declare_proto_rig(get_mode)
return status;
/* FIXME: return also width */
Tcl_SetStringObj(resultPtr, strmode(mode), -1);
Tcl_SetStringObj(resultPtr, strrmode(mode), -1);
return RIG_OK;
}
@ -608,7 +608,7 @@ declare_proto_rig(get_split_mode)
return status;
/* FIXME: return also width */
Tcl_SetStringObj(resultPtr, strmode(mode), -1);
Tcl_SetStringObj(resultPtr, strrmode(mode), -1);
return RIG_OK;
}
@ -1145,7 +1145,7 @@ declare_proto_rig(get_split_mode)
return status;
if (interactive)
printf("%s: ", cmd->arg1);
printf("%s\n", strmode(mode));
printf("%s\n", strrmode(mode));
if (interactive)
printf("%s: ", cmd->arg2);
printf("%ld\n", width);

12
tests/rigctl.c
Wyświetl plik

@ -5,7 +5,7 @@
* It takes commands in interactive mode as well as
* from command line options.
*
* $Id: rigctl.c,v 1.34 2002-08-22 23:44:50 fillods Exp $
* $Id: rigctl.c,v 1.35 2002-08-26 21:26:06 fillods Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -753,7 +753,7 @@ declare_proto_rig(get_mode)
return status;
if (interactive)
printf("%s: ", cmd->arg1);
printf("%s\n", strmode(mode));
printf("%s\n", strrmode(mode));
if (interactive)
printf("%s: ", cmd->arg2);
printf("%ld\n", width);
@ -950,7 +950,7 @@ declare_proto_rig(get_split_mode)
return status;
if (interactive)
printf("%s: ", cmd->arg1);
printf("%s\n", strmode(mode));
printf("%s\n", strrmode(mode));
if (interactive)
printf("%s: ", cmd->arg2);
printf("%ld\n", width);
@ -1327,7 +1327,7 @@ static int myfreq_event(RIG *rig, vfo_t vfo, freq_t freq, rig_ptr_t arg)
static int mymode_event(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width, rig_ptr_t arg)
{
printf("Event: mode changed to %s, width %liHz on %s\n", strmode(mode),
printf("Event: mode changed to %s, width %liHz on %s\n", strrmode(mode),
width, strvfo(vfo));
return 0;
}
@ -1410,12 +1410,12 @@ void dump_chan(RIG *rig, channel_t *chan)
sprintf_freq(freqbuf, chan->freq);
sprintf_freq(widthbuf, chan->width);
printf("Freq: %s\tMode: %s\tWidth: %s\n",
freqbuf, strmode(chan->mode), widthbuf);
freqbuf, strrmode(chan->mode), widthbuf);
sprintf_freq(freqbuf, chan->tx_freq);
sprintf_freq(widthbuf, chan->tx_width);
printf("txFreq: %s\ttxMode: %s\ttxWidth: %s\n",
freqbuf, strmode(chan->tx_mode), widthbuf);
freqbuf, strrmode(chan->tx_mode), widthbuf);
sprintf_freq(freqbuf,chan->rptr_offs);
printf("Shift: %s, Offset: %s%s, ", strptrshift(chan->rptr_shift),