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

Remove kpa1500_int as redundant and clean up cppcheck warnings

pull/154/head
Michael Black 2019-12-06 15:19:58 -06:00
rodzic 2b4400b2be
commit 0b7a26ed28
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
2 zmienionych plików z 5 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
amplifiers/elecraft/kpa.c
Wyświetl plik

@ -119,7 +119,7 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
if (err != RIG_OK) { return err; }
int len = read_string(&rs->ampport, responsebuf, KPABUFSZ, ";", 1);
len = read_string(&rs->ampport, responsebuf, KPABUFSZ, ";", 1);
if (len < 0) { return len; }
}
@ -197,7 +197,7 @@ int kpa_get_freq(AMP *amp, freq_t *freq)
if (retval != RIG_OK) { return retval; }
unsigned long tfreq;
int nargs = sscanf(responsebuf, "^FR%ld", &tfreq);
int nargs = sscanf(responsebuf, "^FR%lu", &tfreq);
if (nargs != 1)
{
@ -225,7 +225,7 @@ int kpa_set_freq(AMP *amp, freq_t freq)
if (retval != RIG_OK) { return retval; }
unsigned long tfreq;
int nargs = sscanf(responsebuf, "^FR%ld", &tfreq);
int nargs = sscanf(responsebuf, "^FR%lu", &tfreq);
if (nargs != 1)
{

36
amplifiers/elecraft/kpa1500.c
Wyświetl plik

@ -41,7 +41,6 @@ struct kpa_priv_data *kpa1500_priv;
*
*/
static int kpa1500_init(AMP *amp);
static int kpa1500_cleanup(AMP *amp);
/*
@ -68,7 +67,7 @@ const struct amp_caps kpa1500_amp_caps =
.amp_model = AMP_MODEL_ELECRAFT_KPA1500,
.model_name = "KPA1500",
.mfg_name = "Elecraft",
.version = "2019-05-26",
.version = "2019-12-06",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.amp_type = AMP_TYPE_OTHER,
@ -85,7 +84,7 @@ const struct amp_caps kpa1500_amp_caps =
.retry = 2,
.amp_open = amp_open,
.amp_init = kpa1500_init,
.amp_init = kpa_init,
.amp_cleanup = kpa1500_cleanup,
.reset = kpa_reset,
.get_info = kpa_get_info,
@ -104,37 +103,6 @@ const struct amp_caps kpa1500_amp_caps =
* ************************************
*/
/*
* Initialize data structures
*/
static int kpa1500_init(AMP *amp)
{
struct kpa_priv_data *priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!amp)
{
return -RIG_EINVAL;
}
priv = (struct kpa_priv_data *)
malloc(sizeof(struct kpa_priv_data));
if (!priv)
{
return -RIG_ENOMEM;
}
amp->state.priv = (void *)priv;
amp->state.ampport.type.rig = RIG_PORT_SERIAL;
return RIG_OK;
}
/*
* Clean up allocated memory structures
*/