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

Added a dummy snprintf to rig_debug to allow gcc to check format strings 

This found tons of errors in rig_debug statements
So this patch cleans up all the files that were producing warnings or errors
This should fix a few segfaults when running with debug turned on
pull/149/head
Michael Black 2019-11-30 10:04:31 -06:00
rodzic 471c2fa69f
commit 2f4d62709e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
135 zmienionych plików z 932 dodań i 979 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

134
adat/adat.c
Wyświetl plik

@ -601,7 +601,7 @@ size_t trimwhitespace(char *out, size_t len, const char *str)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. In -> \"%s\", %d.\n",
"*** ADAT: %d %s (%s:%d): ENTRY. In -> '%s', %zu\n",
gFnLevel, __func__, __FILE__, __LINE__, str, len);
if (len == 0)
@ -643,7 +643,7 @@ size_t trimwhitespace(char *out, size_t len, const char *str)
out[out_size] = 0;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): EXIT. Out -> \"%s\", %d.\n",
"*** ADAT: %d %s (%s:%d): EXIT. Out -> \"%s\", %zu\n",
gFnLevel, __func__, __FILE__, __LINE__, out, out_size);
gFnLevel--;
@ -666,20 +666,12 @@ int adat_print_cmd(adat_cmd_def_ptr pCmd)
__func__, __FILE__, __LINE__);
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT COMMAND:\n");
rig_debug(RIG_DEBUG_TRACE,
"*** -> Command ID = %"PRIll"\n",
pCmd->nCmdId);
"*** -> Command ID = %u\n", (unsigned int)(pCmd->nCmdId));
rig_debug(RIG_DEBUG_TRACE,
"*** -> Command kind = %d\n",
pCmd->nCmdKind);
rig_debug(RIG_DEBUG_TRACE,
"*** -> Command FN Ptr = 0x%08x\n",
pCmd->pfCmdFn);
while (nI < pCmd->nNrCmdStrs)
{
rig_debug(RIG_DEBUG_TRACE,
@ -891,7 +883,7 @@ int adat_parse_mode(char *pcStr,
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, Mode = %d\n",
gFnLevel, __func__, __FILE__, __LINE__, nRC, *nRIGMode);
gFnLevel, __func__, __FILE__, __LINE__, nRC, (int)*nRIGMode);
gFnLevel--;
return nRC;
@ -912,8 +904,8 @@ int adat_mode_rnr2anr(rmode_t nRIGMode,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n",
gFnLevel, __func__, __FILE__, __LINE__, nRIGMode);
"*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %u\n",
gFnLevel, __func__, __FILE__, __LINE__, (unsigned int)nRIGMode);
while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0))
{
@ -960,8 +952,8 @@ int adat_mode_anr2rnr(int nADATMode,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n",
gFnLevel, __func__, __FILE__, __LINE__, nRIGMode);
"*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %u\n",
gFnLevel, __func__, __FILE__, __LINE__, (unsigned int)*nRIGMode);
while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0))
{
@ -986,8 +978,8 @@ int adat_mode_anr2rnr(int nADATMode,
// Done
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, RIG Mode = %d\n",
gFnLevel, __func__, __FILE__, __LINE__, nRC, *nRIGMode);
"*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, RIG Mode = %u\n",
gFnLevel, __func__, __FILE__, __LINE__, nRC, (unsigned int)*nRIGMode);
gFnLevel--;
return nRC;
@ -1283,7 +1275,7 @@ int adat_send(RIG *pRig,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcData = %s\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p, pcData = %s\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig, pcData);
serial_flush(&pRigState->rigport);
@ -1313,7 +1305,7 @@ int adat_receive(RIG *pRig,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
nRC = read_string(&pRigState->rigport, pcData, ADAT_RESPSZ, ADAT_EOL, 1);
@ -1344,7 +1336,7 @@ int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcCmd = \"%s\"\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p, pcCmd = \"%s\"\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig, pcCmd);
if (pRig == NULL)
@ -1387,7 +1379,7 @@ int adat_priv_set_result(RIG *pRig, char *pcResult)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcResult = \"%s\"\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p, pcResult = \"%s\"\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig, pcResult);
if (pRig == NULL)
@ -1433,7 +1425,7 @@ int adat_priv_clear_result(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1475,7 +1467,7 @@ int adat_get_single_cmd_result(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1506,7 +1498,7 @@ int adat_get_single_cmd_result(RIG *pRig)
nRC = adat_receive(pRig, acBuf);
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d acBuf ........ = 0x%08x\n",
"*** ADAT: %d acBuf ........ = %p\n",
gFnLevel, acBuf);
pcPos = acBuf;
@ -1545,11 +1537,11 @@ int adat_get_single_cmd_result(RIG *pRig)
pcPos += sizeof(char);
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d pcPos ........ = 0x%08x\n",
"*** ADAT: %d pcPos ........ = %p\n",
gFnLevel, pcPos);
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d pcBufEnd ..... = 0x%08x\n",
"*** ADAT: %d pcBufEnd ..... = %p\n",
gFnLevel, pcBufEnd);
rig_debug(RIG_DEBUG_TRACE,
@ -1557,7 +1549,7 @@ int adat_get_single_cmd_result(RIG *pRig)
gFnLevel, nBufLength);
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d pcPos2 ....... = 0x%08x\n",
"*** ADAT: %d pcPos2 ....... = %p\n",
gFnLevel, pcPos2);
trimwhitespace(acBuf2, strlen(pcPos), pcPos);
@ -1613,7 +1605,7 @@ int adat_cmd_recover_from_error(RIG *pRig, int nError)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1669,7 +1661,7 @@ int adat_cmd_fn_get_callsign(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1722,7 +1714,7 @@ int adat_cmd_fn_set_callsign(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1770,7 +1762,7 @@ int adat_cmd_fn_get_serial_nr(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1822,7 +1814,7 @@ int adat_cmd_fn_get_fw_version(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1875,7 +1867,7 @@ int adat_cmd_fn_get_hw_version(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1927,7 +1919,7 @@ int adat_cmd_fn_get_gui_fw_version(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -1980,7 +1972,7 @@ int adat_cmd_fn_get_id_code(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2032,7 +2024,7 @@ int adat_cmd_fn_get_options(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2084,7 +2076,7 @@ int adat_cmd_fn_get_mode(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2134,7 +2126,7 @@ int adat_cmd_fn_set_mode(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2196,7 +2188,7 @@ int adat_cmd_fn_get_freq(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2257,7 +2249,7 @@ int adat_cmd_fn_set_freq(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2312,7 +2304,7 @@ int adat_cmd_fn_set_vfo(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2379,7 +2371,7 @@ int adat_cmd_fn_get_ptt(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2434,7 +2426,7 @@ int adat_cmd_fn_set_ptt(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2515,7 +2507,7 @@ int adat_transaction(RIG *pRig,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2542,7 +2534,7 @@ int adat_transaction(RIG *pRig,
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d About to execute ADAT Command ... \n",
gFnLevel, __func__, __FILE__, __LINE__);
gFnLevel);
adat_print_cmd(pCmd);
// Execute Command
@ -2647,7 +2639,7 @@ adat_priv_data_ptr adat_new_priv_data(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig != NULL)
@ -2687,7 +2679,7 @@ adat_priv_data_ptr adat_new_priv_data(RIG *pRig)
}
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): EXIT. RC = %d, pPriv = 0x%x\n",
"*** ADAT: %d %s (%s:%d): EXIT. RC = %d, pPriv = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, nRC, pPriv);
gFnLevel--;
@ -2706,7 +2698,7 @@ void adat_del_priv_data(adat_priv_data_t **ppPriv)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: ppPrivData = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: ppPrivData = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, ppPriv);
if ((ppPriv != NULL) && (*ppPriv != NULL))
@ -2783,7 +2775,7 @@ int adat_init(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -2828,7 +2820,7 @@ int adat_cleanup(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
if (pRig == NULL)
@ -2864,7 +2856,7 @@ int adat_open(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -2906,7 +2898,7 @@ int adat_close(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -2945,7 +2937,7 @@ const char * adat_get_info(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
memset(acBuf, 0, 512);
@ -2990,7 +2982,7 @@ int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3028,7 +3020,7 @@ int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3066,7 +3058,7 @@ int adat_set_level(RIG *pRig, vfo_t vfo, setting_t level, value_t val)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3101,7 +3093,7 @@ int adat_get_level(RIG *pRig, vfo_t vfo, setting_t level, value_t *val)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3136,7 +3128,7 @@ int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3185,7 +3177,7 @@ int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3227,7 +3219,7 @@ int adat_get_vfo(RIG *pRig, vfo_t *vfo)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3265,7 +3257,7 @@ int adat_set_vfo(RIG *pRig, vfo_t vfo)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3306,7 +3298,7 @@ int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3344,7 +3336,7 @@ int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3402,7 +3394,7 @@ int adat_power2mW(RIG *pRig,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3440,7 +3432,7 @@ int adat_mW2power(RIG *pRig,
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3474,7 +3466,7 @@ int adat_get_powerstat(RIG *pRig, powerstat_t *status)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3522,7 +3514,7 @@ int adat_set_conf(RIG *pRig, token_t token, const char *val)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3566,7 +3558,7 @@ int adat_get_conf(RIG *pRig, token_t token, char *val)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3610,7 +3602,7 @@ int adat_reset(RIG *pRig, reset_t reset)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params
@ -3645,7 +3637,7 @@ int adat_handle_event(RIG *pRig)
gFnLevel++;
rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n",
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig);
// Check Params

16
alinco/alinco.c
Wyświetl plik

@ -358,9 +358,7 @@ int alinco_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_FM: amode = MD_FM; break;
case RIG_MODE_AM: amode = MD_AM; break;
default:
rig_debug(RIG_DEBUG_ERR,
"alinco_set_mode: unsupported mode %d\n",
mode);
rig_debug(RIG_DEBUG_ERR, "alinco_set_mode: unsupported mode %s\n", rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -651,7 +649,7 @@ int alinco_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return alinco_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %d\n", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %d\n", (int)func);
return -RIG_EINVAL;
}
@ -714,7 +712,7 @@ int alinco_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %d\n", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %d\n", (int)func);
return -RIG_EINVAL;
}
@ -860,7 +858,7 @@ int alinco_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return alinco_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %s\n", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -979,7 +977,7 @@ int alinco_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d\n", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %s\n", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1012,7 +1010,7 @@ int alinco_set_parm(RIG *rig, setting_t parm, value_t val)
return alinco_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_parm %d\n", parm);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_parm %d\n", (int)parm);
return -RIG_EINVAL;
}
@ -1230,8 +1228,6 @@ int alinco_get_mem(RIG *rig, vfo_t vfo, int *ch)
*/
DECLARE_INITRIG_BACKEND(alinco)
{
rig_debug(RIG_DEBUG_VERBOSE, "alinco: _init called\n");
rig_register(&dx77_caps);
return RIG_OK;

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

@ -87,7 +87,7 @@ int kpa_flushbuffer(AMP *amp)
{
struct amp_state *rs;
rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rs = &amp->state;
@ -214,7 +214,7 @@ int kpa_set_freq(AMP *amp, freq_t freq)
{
char responsebuf[KPABUFSZ];
rig_debug(RIG_DEBUG_VERBOSE, "%s called, freq=%ld\n", __func__, freq);
rig_debug(RIG_DEBUG_VERBOSE, "%s called, freq=%"PRIfreq"\n", __func__, freq);
if (!amp) { return -RIG_EINVAL; }
@ -237,8 +237,8 @@ int kpa_set_freq(AMP *amp, freq_t freq)
if (tfreq * 1000 != freq)
{
rig_debug(RIG_DEBUG_ERR,
"%s Error setting freq: ^FR freq!=freq2, %ld!=%ld '%s'\n", __func__,
freq, tfreq * 1000);
"%s Error setting freq: ^FR freq!=freq2, %f=%ld '%s'\n", __func__,
freq, tfreq * 1000, responsebuf);
return -RIG_EPROTO;
}
@ -265,12 +265,12 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
if (nargs != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
rig_debug(RIG_DEBUG_ERR, "%s: invalid value %s='%s'\n", __func__, cmd,
responsebuf);
return -RIG_EPROTO;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s antenna=%d\n", __func__, cmd, antenna);
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s, antenna=%d\n", __func__, cmd, antenna);
switch (level)
{
@ -341,7 +341,7 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
return -RIG_EPROTO;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dKHz,%dKHz\n", __func__, cmd,
rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dKHz,%dKHz\n", __func__,
int_value, int_value2);
//
@ -469,7 +469,7 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
}
}
rig_debug(RIG_DEBUG_ERR, "%s unknown fault=%s\n", __func__, cmd, responsebuf);
rig_debug(RIG_DEBUG_ERR, "%s unknown fault from %s\n", __func__, responsebuf);
struct kpa_priv_data *priv = amp->state.priv;
sprintf(priv->tmpbuf, "Unknown fault code=0x%02x", fault);
val->s = priv->tmpbuf;
@ -478,7 +478,7 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s unknown level=%s\n", __func__, cmd, level);
rig_debug(RIG_DEBUG_ERR, "%s unknown level=%s\n", __func__, rig_strlevel(level));
}
@ -582,7 +582,7 @@ int kpa_reset(AMP *amp, amp_reset_t reset)
if (retval != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s error setting RIG_POWER_STANDBY\n", __func__,
rig_debug(RIG_DEBUG_ERR, "%s: error setting RIG_POWER_STANDBY '%s'\n", __func__,
strerror(retval));
}

20
aor/aor.c
Wyświetl plik

@ -314,9 +314,9 @@ int format8k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
case RIG_PASSBAND_NOCHANGE: aormode = AR8K_AM; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported passband %d %d\n",
"%s: unsupported passband %s %d\n",
__FUNCTION__,
mode, width);
rig_strrmode(mode), (int)width);
return -RIG_EINVAL;
}
}
@ -340,16 +340,16 @@ int format8k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
case RIG_PASSBAND_NOCHANGE: aormode = AR8K_NFM; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported passband %d %d\n",
"%s: unsupported passband %s %d\n",
__FUNCTION__,
mode, width);
rig_strrmode(mode), (int)width);
return -RIG_EINVAL;
}
}
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%s'\n",
__FUNCTION__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -540,7 +540,7 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported aor_set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"Unsupported aor_set_level %d\n", (int)level);
return -RIG_EINVAL;
}
@ -570,7 +570,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvl_len = sprintf(lvlbuf, "AC" EOM);
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported %s %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"Unsupported %s %d\n", __FUNCTION__, (int)level);
return -RIG_EINVAL;
}
@ -651,7 +651,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported %s %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"Unsupported %s %d\n", __FUNCTION__, (int)level);
return -RIG_EINVAL;
}
@ -1182,7 +1182,7 @@ const char *aor_get_info(RIG *rig)
*/
DECLARE_INITRIG_BACKEND(aor)
{
rig_debug(RIG_DEBUG_VERBOSE, "aor: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&sr2200_caps);
rig_register(&ar2700_caps);

4
aor/ar2700.c
Wyświetl plik

@ -217,8 +217,8 @@ int format2700_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
case RIG_MODE_WFM: aormode = AR2700_WFM; break;
case RIG_MODE_FM: aormode = AR2700_NFM; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__FUNCTION__, rig_strrmode(mode));
return -RIG_EINVAL;
}

4
aor/ar3000.c
Wyświetl plik

@ -292,8 +292,8 @@ int ar3k_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_WFM: aormode = 'W'; break;
case RIG_MODE_FM: aormode = 'N'; break;
default:
rig_debug(RIG_DEBUG_ERR,"ar3k_set_mode: unsupported mode %d\n",
mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",__func__,
rig_strrmode(mode));
return -RIG_EINVAL;
}

6
aor/ar3030.c
Wyświetl plik

@ -383,7 +383,7 @@ int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
long lfreq;
sscanf(rfp+1,"%ld", &lfreq);
*freq = lfreq;
rig_debug(RIG_DEBUG_ERR,"%s: read lfreq=%d, freq=%.6f\n",__func__,lfreq,*freq);
rig_debug(RIG_DEBUG_ERR,"%s: read lfreq=%ld, freq=%.6f\n",__func__,lfreq,*freq);
return RIG_OK;
}
@ -420,8 +420,8 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
aormode = 'X';
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__,mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__FUNCTION__,rig_strrmode(mode));
return -RIG_EINVAL;
}

6
aor/ar5000.c
Wyświetl plik

@ -409,8 +409,8 @@ int format5k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
case RIG_MODE_SAL: aormode = AR5K_SAL; break;
case RIG_MODE_SAH: aormode = AR5K_SAH; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__FUNCTION__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -428,7 +428,7 @@ int format5k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
case s_kHz(220): aorwidth = '6'; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported width %d\n",
__FUNCTION__, width);
__FUNCTION__, (int)width);
return -RIG_EINVAL;
}

6
aor/ar7030p.c
Wyświetl plik

@ -598,7 +598,7 @@ static int ar7030p_set_mode( RIG * rig, vfo_t vfo, rmode_t mode,
}
rig_debug( RIG_DEBUG_VERBOSE, "%s: width %d ar_filter %d filterTab[%d] %d\n",
__func__, width, ar_filter, i, filterTab[i] );
__func__, (int)width, ar_filter, i, filterTab[i] );
}
}
@ -1362,7 +1362,7 @@ static int ar7030p_set_ts( RIG * rig, vfo_t vfo, shortfreq_t ts )
{
rc = execRoutine( rig, SET_ALL );
rig_debug( RIG_DEBUG_VERBOSE, "%s: chnstp %d (%d)\n", __func__, ts, v );
rig_debug( RIG_DEBUG_VERBOSE, "%s: chnstp %d (%d)\n", __func__, (int)ts, v );
}
rc = lockRx( rig, LOCK_0 );
@ -1398,7 +1398,7 @@ static int ar7030p_get_ts( RIG * rig, vfo_t vfo, shortfreq_t * ts )
x = (double) v;
*ts = (shortfreq_t) (x * HZ_PER_STEP);
rig_debug( RIG_DEBUG_VERBOSE, "%s: step= %d\n", __func__, *ts );
rig_debug( RIG_DEBUG_VERBOSE, "%s: step= %d\n", __func__, (int)*ts );
}
rc = lockRx( rig, LOCK_0 );

8
aor/ar7030p_utils.c
Wyświetl plik

@ -1242,8 +1242,8 @@ rmode_t modeToHamlib( const unsigned char mode )
break;
};
rig_debug( RIG_DEBUG_VERBOSE, "%s: Native %d, Hamlib %d\n",
__func__, mode, rc );
rig_debug( RIG_DEBUG_VERBOSE, "%s: Native %s, Hamlib %s\n",
__func__, rig_strrmode(mode), rig_strrmode(rc) );
return( rc );
}
@ -1293,8 +1293,8 @@ unsigned char modeToNative( const rmode_t mode )
break;
};
rig_debug( RIG_DEBUG_VERBOSE, "%s: Hamlib %d, native %d\n",
__func__, mode, rc );
rig_debug( RIG_DEBUG_VERBOSE, "%s: Hamlib %s, native %d\n",
__func__, rig_strrmode(mode), rc );
return( rc );
}

10
aor/sr2200.c
Wyświetl plik

@ -386,8 +386,8 @@ int sr2200_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
aormode = SR2200_WFM;
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__FUNCTION__,mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__FUNCTION__,rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -573,7 +573,7 @@ int sr2200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported aor_set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"Unsupported aor_set_level %s\n", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -609,7 +609,7 @@ int sr2200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvl_len = sprintf(lvlbuf, "AM" EOM);
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported %s %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported level %s\n", __FUNCTION__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -682,7 +682,7 @@ int sr2200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported %s %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported level %s\n", __FUNCTION__, rig_strlevel(level));
return -RIG_EINVAL;
}

41
barrett/barrett.c
Wyświetl plik

@ -207,10 +207,10 @@ const struct rig_caps barrett_caps = {
DECLARE_INITRIG_BACKEND(barrett)
{
rig_debug(RIG_DEBUG_VERBOSE, "barrett: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&barrett_caps);
rig_debug(RIG_DEBUG_VERBOSE, "barrett: _init back from rig_register\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init back from rig_register\n",__func__);
return RIG_OK;
}
@ -239,7 +239,7 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
retval = read_string(&rs->rigport, priv->ret_data, sizeof(priv->ret_data),
"\x11", 1);
rig_debug(RIG_DEBUG_VERBOSE, "%s: resultlen=%d\n", __FUNCTION__,
strlen(priv->ret_data));
(int)strlen(priv->ret_data));
if (retval < 0) {
return retval;
@ -275,10 +275,6 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
*p = 0;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: result = %04x\n", __FUNCTION__, result);
if (result != NULL) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: setting result\n", __FUNCTION__);
@ -307,7 +303,7 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
rig_debug(RIG_DEBUG_VERBOSE, "%s: returning result=%s\n", __FUNCTION__,
*result);
} else {
rig_debug(RIG_DEBUG_VERBOSE, "%s: no result requested=%s\n", __FUNCTION__);
rig_debug(RIG_DEBUG_VERBOSE, "%s: no result requested\n", __FUNCTION__);
}
return RIG_OK;
@ -380,14 +376,14 @@ int barrett_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
}
if (retval != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: invalid response=\n", __FUNCTION__, response);
rig_debug(RIG_DEBUG_ERR, "%s: invalid response=%s\n", __FUNCTION__, response);
return retval;
}
retval = sscanf(response, "%lg", freq);
if (retval != 1) {
rig_debug(RIG_DEBUG_ERR, "Unable to parse response\n");
rig_debug(RIG_DEBUG_ERR, "%s: Unable to parse response\n",__func__);
return -RIG_EPROTO;
}
@ -467,7 +463,7 @@ int barrett_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
retval = barrett_transaction(rig, cmd_buf, 0, &response);
if (retval < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: invalid response=\n", __FUNCTION__, response);
rig_debug(RIG_DEBUG_ERR, "%s: invalid response=%s\n", __FUNCTION__, response);
return retval;
}
@ -496,7 +492,7 @@ int barrett_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
retval = barrett_transaction(rig, "IP", 0, &response);
if (retval != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: error response?='%s'\n", response);
rig_debug(RIG_DEBUG_ERR, "%s: error response?='%s'\n", __func__, response);
return retval;
}
@ -505,7 +501,7 @@ int barrett_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
if (c == '1' || c == '0') {
*ptt = c - '0';
} else {
rig_debug(RIG_DEBUG_ERR, "%s: error response='%s'\n", response);
rig_debug(RIG_DEBUG_ERR, "%s: error response='%s'\n", __func__, response);
return -RIG_EPROTO;
}
@ -525,8 +521,8 @@ int barrett_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
//struct tt588_priv_data *priv = (struct tt588_priv_data *) rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%d width=%d\n", __FUNCTION__,
rig_strvfo(vfo), mode, width);
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%s width=%d\n", __FUNCTION__,
rig_strvfo(vfo), rig_strrmode(mode), (int)width);
switch (mode) {
case RIG_MODE_USB:
@ -550,7 +546,7 @@ int barrett_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n", __FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n", __FUNCTION__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -613,7 +609,7 @@ int barrett_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*width = 3000; // we'll default this to 3000 for now
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%s width=%d\n", __FUNCTION__,
rig_strvfo(vfo), rig_strrmode(*mode), *width);
rig_strvfo(vfo), rig_strrmode(*mode), (int)*width);
return RIG_OK;
}
@ -703,7 +699,7 @@ int barrett_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: invalid response=%s\n", __FUNCTION__,
level);
response);
return retval;
}
@ -721,12 +717,12 @@ int barrett_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __FUNCTION__, rig_strlevel(level));
return -RIG_EINVAL;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%d val=%d\n", __FUNCTION__,
rig_strvfo(vfo), level, *val);
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%s val=%s\n", __FUNCTION__,
rig_strvfo(vfo), rig_strlevel(level), response);
return RIG_OK;
}
@ -744,8 +740,7 @@ const char * barrett_get_info(RIG *rig)
int retval = barrett_transaction(rig, "IVF", 0, &response);
if (retval == RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: result=%s\n", __FUNCTION__, response,
strlen(response));
rig_debug(RIG_DEBUG_ERR, "%s: result=%s\n", __FUNCTION__, response);
} else {
rig_debug(RIG_DEBUG_VERBOSE, "Software Version %s\n", response);
}

2
cnctrk/cnctrk.c
Wyświetl plik

@ -83,7 +83,7 @@ const struct rot_caps cnctrk_rot_caps = {
DECLARE_INITROT_BACKEND(cnctrk)
{
rig_debug(RIG_DEBUG_VERBOSE, "cnctrk: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rot_register(&cnctrk_rot_caps);

2
dorji/dorji.c
Wyświetl plik

@ -37,7 +37,7 @@
*/
DECLARE_INITRIG_BACKEND(dorji)
{
rig_debug(RIG_DEBUG_VERBOSE, "dorji: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&dra818u_caps);
rig_register(&dra818v_caps);

8
dorji/dra818.c
Wyświetl plik

@ -127,7 +127,7 @@ static int dra818_setvolume(RIG *rig)
int dra818_init(RIG *rig)
{
rig_debug(RIG_DEBUG_VERBOSE, "dra818: dra818_init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: dra818_init called\n",__func__);
struct dra818_priv *priv = calloc(sizeof(*priv), 1);
if (!priv)
@ -158,7 +158,7 @@ int dra818_init(RIG *rig)
int dra818_cleanup(RIG *rig)
{
rig_debug(RIG_DEBUG_VERBOSE, "dra818: dra818_cleanup called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: dra818_cleanup called\n",__func__);
free(rig->state.priv);
@ -196,7 +196,7 @@ int dra818_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_debug(RIG_DEBUG_VERBOSE,
"dra818: requested freq = %"PRIfreq" Hz, set freq = %d Hz\n",
freq, sfreq);
freq, (int)sfreq);
if (vfo == RIG_VFO_RX) {
priv->rx_freq = sfreq;
@ -220,7 +220,7 @@ int dra818_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
priv->bw = 25000;
else
priv->bw = 12500;
rig_debug(RIG_DEBUG_VERBOSE, "dra818: bandwidth: %d\n", priv->bw);
rig_debug(RIG_DEBUG_VERBOSE, "dra818: bandwidth: %d\n", (int)priv->bw);
return dra818_setgroup(rig);
}

8
drake/drake.c
Wyświetl plik

@ -280,7 +280,7 @@ int drake_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
default:
rig_debug(RIG_DEBUG_ERR, "drake_set_mode: "
"unsupported mode %d\n", mode);
"unsupported mode %s\n", rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -861,7 +861,7 @@ int drake_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get func %d\n", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported get func %s\n", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -994,7 +994,7 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d\n", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %s\n", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1055,7 +1055,7 @@ const char *drake_get_info(RIG *rig)
*/
DECLARE_INITRIG_BACKEND(drake)
{
rig_debug(RIG_DEBUG_VERBOSE, "drake: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&r8a_caps);
rig_register(&r8b_caps);

12
dummy/amp_dummy.c
Wyświetl plik

@ -113,19 +113,19 @@ static int dummy_amp_reset(AMP *amp, amp_reset_t reset)
switch (reset)
{
case AMP_RESET_MEM:
rig_debug(RIG_DEBUG_VERBOSE, "Reset memory\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: Reset memory\n",__FUNCTION__);
break;
case AMP_RESET_FAULT:
rig_debug(RIG_DEBUG_VERBOSE, "Reset fault\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: Reset fault\n",__FUNCTION__);
break;
case AMP_RESET_AMP:
rig_debug(RIG_DEBUG_VERBOSE, "Reset amplifier\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: Reset amplifier\n",__FUNCTION__);
break;
default:
rig_debug(RIG_DEBUG_VERBOSE, "Reset unknown=%d\n", reset);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Reset unknown=%d\n",__FUNCTION__, reset);
return -RIG_EINVAL;
}
@ -225,7 +225,7 @@ static int dummy_amp_get_level(AMP *amp, setting_t level, value_t *val)
return RIG_OK;
default:
rig_debug(RIG_DEBUG_VERBOSE, "%s Unknownd AMP_LEVEL=%d\n", __func__, level);
rig_debug(RIG_DEBUG_VERBOSE, "%s Unknown AMP_LEVEL=%s\n", __func__, rig_strlevel(level));
}
rig_debug(RIG_DEBUG_VERBOSE, "%s flag=%d\n", __func__, flag);
@ -365,7 +365,7 @@ const struct amp_caps dummy_amp_caps =
DECLARE_INITAMP_BACKEND(dummy)
{
rig_debug(RIG_DEBUG_VERBOSE, "dummy: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__FUNCTION__);
amp_register(&dummy_amp_caps);
amp_register(&netampctl_caps);

11
dummy/dummy.c
Wyświetl plik

@ -381,11 +381,8 @@ static int dummy_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
struct dummy_priv_data *priv = (struct dummy_priv_data *)rig->state.priv;
channel_t *curr = priv->curr;
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s\n", __FUNCTION__, rig_strvfo(vfo),
vfo);
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s\n", __FUNCTION__, rig_strvfo(vfo));
*freq = curr->freq;
return RIG_OK;
}
@ -1714,7 +1711,7 @@ static int dummy_power2mW(RIG *rig, unsigned int *mwpower, float power,
{
rig_debug(RIG_DEBUG_TRACE, "%s: passed power = %f\n", __func__, power);
rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %i\n", __func__, mode);
rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %s\n", __func__, rig_strrmode(mode));
/* Pretend this is a 100W radio */
*mwpower = (power * 100000);
@ -1728,7 +1725,7 @@ static int dummy_mW2power(RIG *rig, float *power, unsigned int mwpower,
{
rig_debug(RIG_DEBUG_TRACE, "%s: passed mwpower = %i\n", __func__, mwpower);
rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %i\n", __func__, mode);
rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %s\n", __func__, rig_strrmode(mode));
/* Pretend this is a 100W radio */
if (mwpower > 100000)
@ -1952,7 +1949,7 @@ const struct rig_caps dummy_caps =
DECLARE_INITRIG_BACKEND(dummy)
{
rig_debug(RIG_DEBUG_VERBOSE, "dummy: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&dummy_caps);
rig_register(&netrigctl_caps);

24
dummy/flrig.c
Wyświetl plik

@ -238,7 +238,7 @@ static char *xml_build(char *cmd, char *value, char *xmlbuf, int xmllen)
// We want at least a 4K buf to play with
if (xmllen < 4096)
{
rig_debug(RIG_DEBUG_ERR, "%s: xmllen < 4096\n");
rig_debug(RIG_DEBUG_ERR, "%s: xmllen < 4096\n",__FUNCTION__);
return NULL;
}
@ -757,7 +757,7 @@ static int flrig_open(RIG *rig)
}
rig->state.mode_list = modes;
rig_debug(RIG_DEBUG_VERBOSE, "%s: hamlib modes=0x%08x\n", __FUNCTION__, modes);
rig_debug(RIG_DEBUG_VERBOSE, "%s: hamlib modes=%s\n", __FUNCTION__, rig_strrmode(modes));
return RIG_OK;
}
@ -862,8 +862,8 @@ static int flrig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (*freq == 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: freq==0??\nvalue=%s\nxml=%s\n", __FUNCTION__,
value, xml);
rig_debug(RIG_DEBUG_ERR, "%s: freq==0??\nvalue=%s\n", __FUNCTION__,
value);
return -(102 + RIG_EPROTO);
}
else
@ -1034,7 +1034,7 @@ static int flrig_set_split_mode(RIG *rig, vfo_t vfo, rmode_t mode,
{
int retval;
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s mode=%s width=%d\n",
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), width);
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), (int)width);
struct flrig_priv_data *priv = (struct flrig_priv_data *) rig->state.priv;
@ -1076,14 +1076,14 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
int retval;
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s mode=%s width=%d\n",
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), width);
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), (int)width);
struct flrig_priv_data *priv = (struct flrig_priv_data *) rig->state.priv;
// if ptt is on do not set mode
if (priv->ptt)
{
rig_debug(RIG_DEBUG_TRACE, "%s: returning because priv->ptt=%d\n", priv->ptt);
rig_debug(RIG_DEBUG_TRACE, "%s: returning because priv->ptt=%d\n", __func__,(int)priv->ptt);
return RIG_OK;
}
@ -1185,13 +1185,13 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
needBW = priv->curr_widthA != width;
rig_debug(RIG_DEBUG_TRACE, "%s: bw change on VFOA, curr width=%d needBW=%d\n",
__FUNCTION__, width, needBW);
__FUNCTION__, (int)width, needBW);
}
else if (vfo == RIG_VFO_B)
{
needBW = priv->curr_widthB != width;
rig_debug(RIG_DEBUG_TRACE, "%s: bw change on VFOB, curr width=%d needBW=%d\n",
__FUNCTION__, width, needBW);
__FUNCTION__, (int)width, needBW);
}
else
{
@ -1250,8 +1250,8 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
rig_debug(RIG_DEBUG_TRACE,
"%s: return modeA=%s, widthA=%d\n,modeB=%s, widthB=%d\n", __FUNCTION__,
rig_strrmode(priv->curr_modeA), priv->curr_widthA,
rig_strrmode(priv->curr_modeB), priv->curr_widthB);
rig_strrmode(priv->curr_modeA), (int)priv->curr_widthA,
rig_strrmode(priv->curr_modeB), (int)priv->curr_widthB);
return RIG_OK;
}
@ -1444,7 +1444,7 @@ static int flrig_set_vfo(RIG *rig, vfo_t vfo)
if (vfo == RIG_VFO_TX)
{
rig_debug(RIG_DEBUG_TRACE, "%s: RIG_VFO_TX used\n");
rig_debug(RIG_DEBUG_TRACE, "%s: RIG_VFO_TX used\n",__FUNCTION__);
vfo = RIG_VFO_B; // always TX on VFOB
}

2
dummy/netrigctl.c
Wyświetl plik

@ -108,7 +108,7 @@ static int netrigctl_vfostr(RIG *rig, char *vfostr, int len, vfo_t vfo)
{
if (len < 5)
{
rig_debug(RIG_DEBUG_ERR, "%s: len must be >=5, len=%d\n", len);
rig_debug(RIG_DEBUG_ERR, "%s: len must be >=5, len=%d\n", __func__, len);
return -RIG_EPROTO;
}

2
dummy/rot_dummy.c
Wyświetl plik

@ -282,7 +282,7 @@ const struct rot_caps dummy_rot_caps = {
DECLARE_INITROT_BACKEND(dummy)
{
rig_debug(RIG_DEBUG_VERBOSE, "dummy: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rot_register(&dummy_rot_caps);
rot_register(&netrotctl_caps);

12
dummy/trxmanager.c
Wyświetl plik

@ -319,7 +319,7 @@ static int trxmanager_open(RIG *rig) {
cmd = "FN;";
retval = write_block(&rs->rigport, cmd, strlen(cmd));
if (retval != RIG_OK) {
rig_debug(RIG_DEBUG_ERR,"%s FN; write failed=%s\n", __FUNCTION__);
rig_debug(RIG_DEBUG_ERR,"%s FN; write failed\n", __FUNCTION__);
}
retval = read_transaction(rig, response, sizeof(response));
if (retval != RIG_OK) {
@ -526,7 +526,7 @@ static int trxmanager_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
rig_debug(RIG_DEBUG_ERR, "%s: invalid response='%s'\n", __FUNCTION__, response);
return -RIG_EPROTO;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: IF response len='%d'\n", __FUNCTION__, strlen(response));
rig_debug(RIG_DEBUG_VERBOSE, "%s: IF response len=%d\n", __FUNCTION__, (int)strlen(response));
char cptt = response[28];
*ptt = cptt == '0' ? 0 : 1;
@ -541,7 +541,7 @@ static int trxmanager_set_split_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_
{
int retval;
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s mode=%s width=%d\n",
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), width);
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), (int)width);
retval = trxmanager_set_mode(rig,RIG_VFO_B,mode,width);
return retval;
}
@ -555,7 +555,7 @@ static int trxmanager_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t widt
int retval;
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s mode=%s width=%d\n",
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), width);
__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), (int)width);
struct rig_state *rs = &rig->state;
@ -732,7 +732,7 @@ static int trxmanager_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *wi
long iwidth = 0;
n = sscanf(response,"BW%ld;",&iwidth);
if (n != 1) {
rig_debug(RIG_DEBUG_ERR,"%s bandwidth scan failed 's'\n", __FUNCTION__,strtok(response,"\r\n"));
rig_debug(RIG_DEBUG_ERR,"%s bandwidth scan failed '%s'\n", __FUNCTION__,strtok(response,"\r\n"));
return -RIG_EPROTO;
}
*width=iwidth;
@ -756,7 +756,7 @@ static int trxmanager_set_vfo(RIG *rig, vfo_t vfo)
return -RIG_EINVAL;
}
if (vfo == RIG_VFO_TX) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: RIG_VFO_TX used\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: RIG_VFO_TX used\n",__func__);
vfo = RIG_VFO_B; // always TX on VFOB
}

4
easycomm/easycomm.c
Wyświetl plik

@ -273,7 +273,7 @@ static int easycomm_rot_get_conf(ROT *rot, token_t token, char *val) {
int retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_debug(RIG_DEBUG_TRACE, "%s: token = %d", __func__, token);
rig_debug(RIG_DEBUG_TRACE, "%s: token = %d", __func__, (int)token);
if (!rot)
return -RIG_EINVAL;
@ -332,7 +332,7 @@ static int easycomm_rot_set_conf(ROT *rot, token_t token, const char *val) {
int retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_debug(RIG_DEBUG_TRACE, "%s: token = %d", __func__, token);
rig_debug(RIG_DEBUG_TRACE, "%s: token = %d", __func__, (int)token);
if (!rot)
return -RIG_EINVAL;

16
elad/elad.c
Wyświetl plik

@ -340,7 +340,7 @@ int elad_transaction(RIG *rig, const char *cmdstr, char *data, size_t datasize)
*/
rig_debug(RIG_DEBUG_ERR, "%s: WRONG reply %c%c for command verification %c%c (datasize=%d)\n",
__func__, buffer[0], buffer[1]
, priv->verify_cmd[0], priv->verify_cmd[1], datasize);
, priv->verify_cmd[0], priv->verify_cmd[1], (int)datasize);
if (retry_read++ < rs->rigport.retry)
goto transaction_write;
@ -402,7 +402,7 @@ int elad_safe_transaction(RIG *rig, const char *cmd, char *buf,
{
rig_debug(RIG_DEBUG_ERR, "%s: wrong answer; len for cmd %s: "
"expected = %d, got %d\n",
__func__, cmd, expected, length);
__func__, cmd, (int)expected, (int)length);
err = -RIG_EPROTO;
usleep (rig->caps->timeout * 1000);
}
@ -708,7 +708,7 @@ int elad_set_vfo(RIG *rig, vfo_t vfo)
//if rig=ts2000 then check Satellite mode status
if(rig->caps->rig_model == RIG_MODEL_TS2000 && !priv->is_emulation) {
char retbuf[20];
rig_debug(RIG_DEBUG_VERBOSE, "Checking Satellite mode status\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: Checking Satellite mode status\n",__FUNCTION__);
snprintf(cmdbuf, sizeof (cmdbuf), "SA");
retval = elad_transaction(rig, cmdbuf, retbuf, 20);
@ -1749,7 +1749,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1959,7 +1959,7 @@ int elad_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -2033,7 +2033,7 @@ int elad_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return elad_transaction(rig, buf, NULL, 0);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %#x", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %s", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -2120,7 +2120,7 @@ int elad_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return get_elad_func(rig, "MX", status);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %#x", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %s", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -3313,7 +3313,7 @@ DECLARE_PROBERIG_BACKEND(elad)
* reply should be something like 'K2n;'
*/
if (id_len == 4 || !strcmp(idbuf, "K2")) {
rig_debug(RIG_DEBUG_VERBOSE, "probe_elad: found K2\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: found K2\n",__FUNCTION__);
if (cfunc)
(*cfunc)(port, RIG_MODEL_K2, data);
return RIG_MODEL_K2;

8
elad/fdm_duo.c
Wyświetl plik

@ -56,7 +56,7 @@ elad_fdm_duo_get_info (RIG * rig)
size_t firm_len = strlen (firmbuf);
if (firm_len != 5)
{
rig_debug (RIG_DEBUG_ERR, "elad_get_info: wrong answer len=%d\n", firm_len);
rig_debug (RIG_DEBUG_ERR, "elad_get_info: wrong answer len=%d\n", (int)firm_len);
return NULL;
}
switch (firmbuf[4])
@ -126,14 +126,14 @@ elad_fdm_duo_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
elad_val = 2;
break;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported agc value");
rig_debug (RIG_DEBUG_ERR, "%s: Unsupported agc value",__FUNCTION__);
return -RIG_EINVAL;
};
sprintf (levelbuf, "GT%03d", elad_val);
break;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug (RIG_DEBUG_ERR, "%s: Unsupported set_level %s", __FUNCTION__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -242,7 +242,7 @@ elad_fdm_duo_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
return -RIG_ENIMPL;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug (RIG_DEBUG_ERR, "Unsupported get_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}

2
ether6/ether6.c
Wyświetl plik

@ -289,7 +289,7 @@ const struct rot_caps ether6_rot_caps = {
DECLARE_INITROT_BACKEND(ether6)
{
rig_debug(RIG_DEBUG_VERBOSE, "ether6: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rot_register(&ether6_rot_caps);

6
icmarine/icm710.c
Wyświetl plik

@ -494,8 +494,8 @@ int icm710_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported mode %d\n",
__func__, mode);
"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -684,7 +684,7 @@ int icm710_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
*/
DECLARE_INITRIG_BACKEND(icm710)
{
rig_debug(RIG_DEBUG_VERBOSE, "icm710: icm710_init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: icm710_init called\n",__func__);
rig_register(&icm700pro_caps);
rig_register(&icm710_caps);

6
icmarine/icmarine.c
Wyświetl plik

@ -426,8 +426,8 @@ int icmarine_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_RTTY: pmode = MD_FSK; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported mode %d\n",
__func__, mode);
"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -674,7 +674,7 @@ int icmarine_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
*/
DECLARE_INITRIG_BACKEND(icmarine)
{
rig_debug(RIG_DEBUG_VERBOSE, "icmarine: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&icm700pro_caps);
rig_register(&icm710_caps);

2
icom/frame.c
Wyświetl plik

@ -347,7 +347,7 @@ int rig2icom_mode(RIG *rig, rmode_t mode, pbwidth_t width,
case RIG_MODE_DCR: icmode = S_DCR; break;
case RIG_MODE_DD: icmode = S_DD; break;
default:
rig_debug(RIG_DEBUG_ERR,"icom: Unsupported Hamlib mode %d\n",mode);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported Hamlib mode %s\n",__FUNCTION__,rig_strrmode(mode));
return -RIG_EINVAL;
}

6
icom/ic746.c
Wyświetl plik

@ -642,7 +642,7 @@ static int ic746pro_get_ext_parm(RIG *rig, token_t token, value_t *val)
ep_sc = S_MEM_RTTY_FL_PB;
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_ext_parm %d", token);
rig_debug(RIG_DEBUG_ERR,"Unsupported get_ext_parm %s", rig_strparm(token));
return -RIG_EINVAL;
}
@ -742,7 +742,7 @@ int ic746_set_parm(RIG *rig, setting_t parm, value_t val)
prmbuf[1] = val.i;
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_parm %d\n", parm);
rig_debug(RIG_DEBUG_ERR,"Unsupported set_parm %s\n", rig_strparm(parm));
return -RIG_EINVAL;
}
@ -782,7 +782,7 @@ int ic746_get_parm(RIG *rig, setting_t parm, value_t *val)
prm_sc = S_MEM_BEEP;
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %d", parm);
rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %s", rig_strparm(parm));
return -RIG_EINVAL;
}

2
icom/ic756.c
Wyświetl plik

@ -744,7 +744,7 @@ static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val)
ep_sc = S_MEM_RTTY_FL_PB;
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_ext_parm %d", token);
rig_debug(RIG_DEBUG_ERR,"Unsupported get_ext_parm %s", rig_strparm(token));
return -RIG_EINVAL;
}

39
icom/icom.c
Wyświetl plik

@ -533,7 +533,7 @@ int icom_init(RIG *rig)
priv->tx_vfo = RIG_VFO_NONE;
priv->rx_vfo = RIG_VFO_NONE;
priv->curr_vfo = RIG_VFO_NONE;
rig_debug(RIG_DEBUG_TRACE, "icom_init\n");
rig_debug(RIG_DEBUG_TRACE, "%s: done\n", __FUNCTION__);
return RIG_OK;
}
@ -586,7 +586,7 @@ int icom_rig_open(RIG *rig)
if (retval == RIG_OK)
{
rig_debug(RIG_DEBUG_VERBOSE, "USB echo on detected\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: USB echo on detected\n",__FUNCTION__);
return RIG_OK;
}
@ -595,7 +595,7 @@ int icom_rig_open(RIG *rig)
if (retval == RIG_OK)
{
rig_debug(RIG_DEBUG_VERBOSE, "USB echo off detected\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: USB echo off detected\n",__FUNCTION__);
return RIG_OK;
}
}
@ -720,7 +720,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
// Pick the appropriate VFO when VFO_TX is requested
if (vfo == RIG_VFO_TX)
{
rig_debug(RIG_DEBUG_TRACE,"%s: VFO_TX requested, vfo=%s\n",rig_strvfo(vfo));
rig_debug(RIG_DEBUG_TRACE,"%s: VFO_TX requested, vfo=%s\n",__FUNCTION__,rig_strvfo(vfo));
if (priv->split_on)
{
vfo = rig->state.vfo_list & RIG_VFO_B ? RIG_VFO_B : RIG_VFO_SUB;
@ -735,7 +735,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
// Pick the appropriate VFO when VFO_RX is requested
if (vfo == RIG_VFO_RX)
{
rig_debug(RIG_DEBUG_TRACE,"%s: VFO_RX requested, vfo=%s\n",rig_strvfo(vfo));
rig_debug(RIG_DEBUG_TRACE,"%s: VFO_RX requested, vfo=%s\n",__FUNCTION__,rig_strvfo(vfo));
vfo = rig->state.vfo_list & RIG_VFO_B ? RIG_VFO_A : RIG_VFO_MAIN;
}
@ -859,7 +859,7 @@ static int icom_set_it_new(RIG *rig, vfo_t vfo, shortfreq_t ts, int set_xit)
int ack_len;
int retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s: ts=%d\n", __func__, ts);
rig_debug(RIG_DEBUG_VERBOSE, "%s: ts=%d\n", __func__, (int)ts);
to_bcd(tsbuf, abs((int) ts), 4);
// set sign bit
@ -1403,7 +1403,7 @@ int icom_get_vfo(RIG *rig, vfo_t *vfo)
if (ack_len != 3)
{
rig_debug(RIG_DEBUG_ERR, "%s wrong frame len=%d\n", ack_len);
rig_debug(RIG_DEBUG_ERR, "%s wrong frame len=%d\n", __FUNCTION__, ack_len);
return -RIG_ERJCTED;
}
@ -1830,7 +1830,7 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -2059,7 +2059,7 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -3631,7 +3631,7 @@ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %d", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %s", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -3790,7 +3790,7 @@ int icom_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %d", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %s", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -3863,7 +3863,7 @@ int icom_set_parm(RIG *rig, setting_t parm, value_t val)
}
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_parm %d\n", parm);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_parm %s\n", rig_strparm(parm));
return -RIG_EINVAL;
}
}
@ -3886,7 +3886,7 @@ int icom_get_parm(RIG *rig, setting_t parm, value_t *val)
switch (parm)
{
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_parm %d", parm);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_parm %s", rig_strparm(parm));
return -RIG_EINVAL;
}
@ -4205,7 +4205,7 @@ int icom_set_powerstat(RIG *rig, powerstat_t status)
unsigned char fe_buf[200]; // for FE's to power up
int fe_len = 0;
rig_debug(RIG_DEBUG_VERBOSE, "%s called status=\n", __func__, status);
rig_debug(RIG_DEBUG_VERBOSE, "%s called status=%d\n", __func__, (int)status);
switch (status)
{
@ -4254,8 +4254,7 @@ int icom_set_powerstat(RIG *rig, powerstat_t status)
if (i == retry)
{
rig_debug(RIG_DEBUG_TRACE, "%s: Wait failed for get_powerstat\n", __func__,
i + 1);
rig_debug(RIG_DEBUG_TRACE, "%s: Wait failed for get_powerstat\n", __func__);
retval = -RIG_ETIMEOUT;
}
@ -4735,7 +4734,7 @@ int icom_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq,
rig_debug(RIG_DEBUG_TRACE, "%s: passed mwpower = %i\n", __func__, mwpower);
rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %i\n", __func__, mode);
rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %s\n", __func__, rig_strrmode(mode));
if (mwpower > 100000)
{
@ -4778,7 +4777,7 @@ int icom_decode_event(RIG *rig)
if (frm_len == -RIG_ETIMEOUT)
{
rig_debug(RIG_DEBUG_VERBOSE,
"icom: icom_decode got a timeout before the first character\n");
"%s: icom_decode got a timeout before the first character\n",__FUNCTION__);
}
if (frm_len < 0)
@ -4789,7 +4788,7 @@ int icom_decode_event(RIG *rig)
switch (buf[frm_len - 1])
{
case COL:
rig_debug(RIG_DEBUG_VERBOSE, "icom: icom_decode saw a collision\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: icom_decode saw a collision\n",__FUNCTION__);
/* Collision */
return -RIG_BUSBUSY;
@ -5308,7 +5307,7 @@ DECLARE_PROBERIG_BACKEND(icom)
*/
DECLARE_INITRIG_BACKEND(icom)
{
rig_debug(RIG_DEBUG_VERBOSE, "icom: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__FUNCTION__);
rig_register(&ic703_caps);
rig_register(&ic706_caps);

4
icom/icr75.c
Wyświetl plik

@ -462,7 +462,7 @@ int icr75_set_parm(RIG *rig, setting_t parm, value_t val)
to_bcd_be(prmbuf + 3, (long long) sec, 2);
return icom_set_raw(rig, C_CTL_MEM, S_MEM_MODE_SLCT, 4, prmbuf, 0, 0);
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_parm %d\n", parm);
rig_debug(RIG_DEBUG_ERR,"Unsupported set_parm %s\n", rig_strparm(parm));
return -RIG_EINVAL;
}
}
@ -505,7 +505,7 @@ int icr75_get_parm(RIG *rig, setting_t parm, value_t *val)
prmbuf[0] = S_PRM_TIME;
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %d", parm);
rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %s", rig_strparm(parm));
return -RIG_EINVAL;
}

14
icom/optoscan.c
Wyświetl plik

@ -260,9 +260,9 @@ int optoscan_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
digits[digitpos] = 0;
if (*length > 0) {
rig_debug(RIG_DEBUG_ERR, "optoscan_recv_dtmf: %d digits - %s\n", *length, digits);
rig_debug(RIG_DEBUG_ERR, "%s: %d digits - %s\n",__FUNCTION__, *length, digits);
} else {
rig_debug(RIG_DEBUG_ERR, "optoscan_recv_dtmf: no digits to read.\n");
rig_debug(RIG_DEBUG_ERR, "%s: no digits to read.\n",__FUNCTION__);
}
return RIG_OK;
@ -416,7 +416,7 @@ int optoscan_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -457,7 +457,7 @@ int optoscan_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %s", rig_strlevel(level));
return -RIG_EINVAL;
}
@ -630,14 +630,14 @@ static int optoscan_get_status_block(RIG *rig, struct optostat *status_block)
break;
default:
rig_debug(RIG_DEBUG_ERR, "optoscan_get_status_block: unknown rig model");
rig_debug(RIG_DEBUG_ERR, "%s: unknown rig model",__FUNCTION__);
return -RIG_ERJCTED;
break;
}
if (ack_len != expected_len) {
rig_debug(RIG_DEBUG_ERR, "optoscan_get_status_block: ack NG (%#.2x), "
"len=%d\n", ackbuf[0], ack_len);
rig_debug(RIG_DEBUG_ERR, "%s: ack NG (%#.2x), len=%d\n",__FUNCTION__,
ackbuf[0], ack_len);
return -RIG_ERJCTED;
}

3
icom/x108g.c
Wyświetl plik

@ -322,8 +322,7 @@ int x108g_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
/* X108G doesn't quite follow ICOM protocol -- returns 0x1c instead of 0xfb */
if (ack_len !=3 || ackbuf[0] != 0x1c) {
rig_debug(RIG_DEBUG_ERR,"x108g_set_ptt: ack NG (%#.2x), "
"len=%d, ptt=%d\n", ackbuf[0],ack_len);
rig_debug(RIG_DEBUG_ERR,"%s: ack NG (%#.2x), len=%d, ptt=%d\n",__FUNCTION__, ackbuf[0],ack_len,ptt);
return -RIG_ERJCTED;
}

8
include/hamlib/rig.h
Wyświetl plik

@ -2358,6 +2358,14 @@ rig_set_debug_time_stamp HAMLIB_PARAMS((int flag));
extern HAMLIB_EXPORT(int)
rig_need_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level));
#ifndef __cplusplus
#ifdef __GNUC__
// doing the debug macro with a dummy sprintf allows gcc to check the format string
#define rig_debug(debug_level,fmt,...) { char xxxbuf[16384];snprintf(xxxbuf,sizeof(xxxbuf),fmt,__VA_ARGS__);rig_debug(debug_level,fmt,##__VA_ARGS__); }
#endif
#endif
extern HAMLIB_EXPORT(void)
rig_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level,
const char *fmt, ...));

18
jrc/jrc.c
Wyświetl plik

@ -171,7 +171,7 @@ static int rig2jrc_mode(RIG *rig, rmode_t mode, pbwidth_t width,
case RIG_MODE_WFM: *jmode = MD_WFM; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported mode %d\n", __FUNCTION__, mode);
"%s: unsupported mode %s\n", __FUNCTION__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -427,7 +427,7 @@ int jrc_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_func %d\n", func);
rig_debug(RIG_DEBUG_ERR,"Unsupported set_func %s\n", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -542,7 +542,7 @@ int jrc_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return RIG_OK;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_func %d\n", func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_func %s\n", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -635,7 +635,7 @@ int jrc_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -886,7 +886,7 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_level %s\n",__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -928,7 +928,7 @@ int jrc_set_parm(RIG *rig, setting_t parm, value_t val)
return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_parm %d\n", parm);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
@ -988,7 +988,7 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %d\n", parm);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_parm %s\n", __func__,rig_strparm(parm));
return -RIG_EINVAL;
}
@ -1341,7 +1341,7 @@ int jrc_decode_event(RIG *rig)
int count;
char buf[BUFSZ];
rig_debug(RIG_DEBUG_VERBOSE, "jrc: jrc_decode called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: jrc_decode called\n",__func__);
rs = &rig->state;
@ -1389,7 +1389,7 @@ int jrc_decode_event(RIG *rig)
*/
DECLARE_INITRIG_BACKEND(jrc)
{
rig_debug(RIG_DEBUG_VERBOSE, "jrc: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&nrd535_caps);
rig_register(&nrd545_caps);

6
kachina/kachina.c
Wyświetl plik

@ -190,8 +190,8 @@ int kachina_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM: k_mode = M_AM; break;
default:
rig_debug(RIG_DEBUG_ERR,
"kachina_set_mode: unsupported mode %d\n",
mode);
"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -260,7 +260,7 @@ int kachina_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
*/
DECLARE_INITRIG_BACKEND(kachina)
{
rig_debug(RIG_DEBUG_VERBOSE, "kachina: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n",__func__);
rig_register(&k505dsp_caps);

18
kenwood/flex.c
Wyświetl plik

@ -60,18 +60,24 @@ int verify_flexradio_id(RIG *rig, char *id)
if (*idptr == ' ')
idptr++;
if (strcmp("904", idptr) == 0)
if (strcmp("904", idptr) == 0) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6700)\n", __func__, id);
else if (strcmp("905", idptr) == 0)
}
else if (strcmp("905", idptr) == 0) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6500)\n", __func__, id);
else if (strcmp("906", idptr) == 0)
}
else if (strcmp("906", idptr) == 0) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6500R)\n", __func__, id);
else if (strcmp("907", idptr) == 0)
}
else if (strcmp("907", idptr) == 0) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6300)\n", __func__, id);
else if (strcmp("908", idptr) == 0)
}
else if (strcmp("908", idptr) == 0) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6400)\n", __func__, id);
else if (strcmp("909", idptr) == 0)
}
else if (strcmp("909", idptr) == 0) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6600)\n", __func__, id);
}
else {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig (%s) is not a Flex 6000 Series\n", __func__, id);
return -RIG_EPROTO;

4
kenwood/flex6xxx.c
Wyświetl plik

@ -155,7 +155,7 @@ static int flex6k_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*width = dsp_bw_dig[index];
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d, setting default BW\n", __func__, *mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s, setting default BW\n", __func__, rig_strrmode(*mode));
*width = 3000;
break;
}
@ -188,7 +188,7 @@ static int flex6k_find_width(rmode_t mode, pbwidth_t width, int *ridx)
w_a = dsp_bw_dig;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n", __func__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}

28
kenwood/ic10.c
Wyświetl plik

@ -284,8 +284,8 @@ int ic10_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM : mode_letter = MD_AM; break;
case RIG_MODE_RTTY : mode_letter = MD_FSK; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__func__,mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -574,8 +574,8 @@ int ic10_set_channel(RIG *rig, const channel_t *chan)
case RIG_MODE_RTTY: md = MD_FSK; break;
case RIG_MODE_NONE: md = MD_NONE; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__func__,chan->mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__func__, rig_strrmode(chan->mode));
return -RIG_EINVAL;
}
@ -600,8 +600,8 @@ int ic10_set_channel(RIG *rig, const channel_t *chan)
case RIG_MODE_RTTY: md = MD_FSK; break;
case RIG_MODE_NONE: md = MD_NONE; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__func__,chan->tx_mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__func__,rig_strrmode(chan->tx_mode));
return -RIG_EINVAL;
}
@ -630,8 +630,8 @@ int ic10_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
switch (func) {
case RIG_FUNC_LOCK: cmdlen = sprintf(cmdbuf,"LK;"); break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_func %#x",
__func__,func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_func %s",
__func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -667,8 +667,8 @@ int ic10_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return -RIG_ETRUNC;
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_func %#x",
__func__,func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_func %s",
__func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -704,8 +704,8 @@ int ic10_set_parm(RIG *rig, setting_t parm, value_t val)
return ic10_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_parm %d\n",
__func__,parm);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_parm %s\n",
__func__, rig_strparm(parm));
return -RIG_EINVAL;
}
@ -745,8 +745,8 @@ int ic10_get_parm(RIG *rig, setting_t parm, value_t *val)
10*lvlbuf[7] + lvlbuf[8]; /* seconds */
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_parm %d\n",
__func__,parm);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_parm %s\n",
__func__, rig_strparm(parm));
return -RIG_EINVAL;
}

6
kenwood/k2.c
Wyświetl plik

@ -411,7 +411,7 @@ int k2_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
tmp[4] = '\0';
*width = atoi(tmp);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Mode: %d, Width: %04li\n", __func__, *mode, *width);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Mode: %s, Width: %d\n", __func__, rig_strrmode(*mode), (int)*width);
return RIG_OK;
}
@ -453,8 +453,8 @@ int k2_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val)
}
break;
default:
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported get_ext_level %d\n",
__func__, token);
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported get_ext_level %s\n",
__func__, rig_strlevel(token));
return -RIG_EINVAL;
}

4
kenwood/k3.c
Wyświetl plik

@ -1013,7 +1013,7 @@ int k3_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
case TOK_IF_NB:
return k3_set_nb_level(rig, -1, val.f / 21.0f);
default:
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported set_ext_level %d\n", __func__, token);
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported set_ext_level %s\n", __func__, rig_strlevel(token));
return -RIG_EINVAL;
}
}
@ -1069,7 +1069,7 @@ int k3_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val)
break;
}
default:
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported get_ext_level %d\n", __func__, token);
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported get_ext_level %s\n", __func__, rig_strlevel(token));
return -RIG_EINVAL;
}

21
kenwood/kenwood.c
Wyświetl plik

@ -540,9 +540,8 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf,
if (length != expected) /* worth retrying as some rigs
occasionally send short results */
{
rig_debug(RIG_DEBUG_ERR, "%s: wrong answer; len for cmd %s: "
"expected = %d, got %d\n",
__func__, cmd, expected, length);
rig_debug(RIG_DEBUG_ERR, "%s: wrong answer; len for cmd %s: expected = %d, got %d\n",
__func__, cmd, (int)expected, (int)length);
err = -RIG_EPROTO;
usleep(rig->caps->timeout * 1000);
}
@ -916,7 +915,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
if (rig->caps->rig_model == RIG_MODEL_TS2000 && !priv->is_emulation)
{
char retbuf[20];
rig_debug(RIG_DEBUG_VERBOSE, "Checking Satellite mode status\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: checking satellite mode status\n", __func__);
snprintf(cmdbuf, sizeof(cmdbuf), "SA");
retval = kenwood_transaction(rig, cmdbuf, retbuf, 20);
@ -926,7 +925,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
return retval;
}
rig_debug(RIG_DEBUG_VERBOSE, "Satellite mode status %s\n", retbuf);
rig_debug(RIG_DEBUG_VERBOSE, "%s: satellite mode status %s\n", __func__, retbuf);
//Satellite mode ON
if (retbuf[2] == '1')
@ -2249,7 +2248,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -2532,7 +2531,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -2658,7 +2657,7 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return kenwood_transaction(rig, buf, NULL, 0);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %#x", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %s", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -2790,7 +2789,7 @@ int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return get_kenwood_func(rig, "MX", status);
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %#x", func);
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %s", rig_strfunc(func));
return -RIG_EINVAL;
}
@ -3528,7 +3527,7 @@ int kenwood_set_powerstat(RIG *rig, powerstat_t status)
if (i == retry)
{
rig_debug(RIG_DEBUG_TRACE, "%s: timeout waiting for powerup\n", __func__,
rig_debug(RIG_DEBUG_TRACE, "%s: timeout waiting for powerup, try %d\n", __func__,
i + 1);
retval = -RIG_ETIMEOUT;
}
@ -4326,7 +4325,7 @@ DECLARE_PROBERIG_BACKEND(kenwood)
*/
if (id_len == 4 || !strcmp(idbuf, "K2"))
{
rig_debug(RIG_DEBUG_VERBOSE, "probe_kenwood: found K2\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: found K2\n", __func__);
if (cfunc)
{

50
kenwood/pihpsdr.c
Wyświetl plik

@ -742,7 +742,7 @@ int pihpsdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -770,7 +770,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvl_len = strlen (lvlbuf);
if ((lvl_len != 4)){ /*TS-2000 returns 4 chars for PA; */
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n",
__func__, lvl_len);
__func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -787,8 +787,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if ((lvl_len != 6)){ /* TS-2000 returns 6 chars for RA; */
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -806,8 +805,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -820,8 +818,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -834,8 +831,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -848,8 +844,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+3, "%d", &lvl);
@ -862,8 +857,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 15) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d answer=%s\n", lvl_len, lvlbuf);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d answer=%s\n", __func__, (int)lvl_len, lvlbuf);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+8, "%d", &lvl);
@ -876,8 +870,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+3, "%d", &lvl);
@ -890,8 +883,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -904,8 +896,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -922,8 +913,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 8) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -937,8 +927,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -955,8 +944,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -973,8 +961,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 7) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -987,8 +974,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"pihpsdr_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -1008,7 +994,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (( (lvl_len !=7)) || lvlbuf[1] != 'M') {
/* TS-2000 returns 8 bytes for S meter level */
rig_debug(RIG_DEBUG_ERR,"%s: wrong answer len=%d\n",
__func__, lvl_len);
__func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -1021,7 +1007,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

38
kenwood/th.c
Wyświetl plik

@ -328,7 +328,7 @@ th_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM: kmode = '1'; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode %d\n", __func__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
}
@ -541,8 +541,8 @@ th_get_vfo_char(RIG *rig, vfo_t *vfo, char *vfoch)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected answer length '%c'\n", __func__,
length);
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected answer length %d\n", __func__,
(int)length);
return -RIG_EPROTO;
break;
}
@ -888,7 +888,7 @@ th_get_kenwood_func(RIG *rig, const char *cmd, int *status)
int
th_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{
rig_debug(RIG_DEBUG_TRACE, "%s: called (0x%04x)\n", __func__, func);
rig_debug(RIG_DEBUG_TRACE, "%s: called %s\n", __func__, rig_strfunc(func));
switch (func)
{
@ -920,8 +920,8 @@ th_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return th_get_kenwood_func(rig, "BC", status);
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %#x\n",
__func__, func);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %s\n",
__func__, rig_strfunc(func));
return -RIG_EINVAL;
}
}
@ -960,7 +960,7 @@ static int th_set_kenwood_func(RIG *rig, const char *cmd, int status)
int
th_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
rig_debug(RIG_DEBUG_TRACE, "%s: called (0x%04x)\n", __func__, func);
rig_debug(RIG_DEBUG_TRACE, "%s: called %s\n", __func__, rig_strfunc(func));
switch (func)
{
@ -995,7 +995,7 @@ th_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return th_tburst(rig, vfo, status);
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %#x\n", __func__, func);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %s\n", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -1021,7 +1021,7 @@ th_get_parm(RIG *rig, setting_t parm, value_t *val)
char buf[16];
int ret, status;
rig_debug(RIG_DEBUG_TRACE, "%s: called (0x%04x)\n", __func__, parm);
rig_debug(RIG_DEBUG_TRACE, "%s: called %s\n", __func__, rig_strparm(parm));
switch (parm)
{
@ -1075,7 +1075,7 @@ th_get_parm(RIG *rig, setting_t parm, value_t *val)
return RIG_OK;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %#x\n", __func__, parm);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
@ -1117,7 +1117,7 @@ th_set_parm(RIG *rig, setting_t parm, value_t val)
}
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %#x\n", __func__, parm);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
@ -1311,7 +1311,7 @@ th_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1383,7 +1383,7 @@ int th_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
}
@ -1704,7 +1704,7 @@ th_get_info(RIG *rig)
if (firm_len < 3)
{
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s', len=%d\n",
__func__, firmbuf, firm_len);
__func__, firmbuf, (int)firm_len);
return NULL;
}
@ -1888,7 +1888,7 @@ int th_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
return RIG_OK;
default :
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s', len=%d\n",
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s'\n",
__func__, buf);
}
@ -2425,8 +2425,8 @@ int th_set_channel(RIG *rig, const channel_t *chan)
if (!priv->mode_table)
{
rig_debug(RIG_DEBUG_ERR, "%s: Buggy backend, no mode_table '%d'\n",
__func__, chan->mode);
rig_debug(RIG_DEBUG_ERR, "%s: buggy backend, no mode_table '%d'\n",
__func__, (int)chan->mode);
return -RIG_ENIMPL;
}
@ -2434,8 +2434,8 @@ int th_set_channel(RIG *rig, const channel_t *chan)
if (mode == -1)
{
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode value '%d'\n",
__func__, chan->mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode value '%d'\n",
__func__, (int)chan->mode);
return -RIG_EINVAL;
}

14
kenwood/thd72.c
Wyświetl plik

@ -240,8 +240,8 @@ static int thd72_get_vfo(RIG *rig, vfo_t *vfo)
}
else
{
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected answer length '%d'\n", __func__,
length);
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected answer length %d\n", __func__,
(int)length);
return -RIG_EPROTO;
}
@ -433,7 +433,7 @@ static int thd72_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int retval;
char buf[64], fbuf[11];
rig_debug(RIG_DEBUG_TRACE, "%s: called, vfo=%s, freq="PRIfreq"\n", __func__,
rig_debug(RIG_DEBUG_TRACE, "%s: called, vfo=%s, freq=%f\n", __func__,
rig_strvfo(vfo), freq);
@ -450,7 +450,7 @@ static int thd72_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
shortfreq_t ts = thd72tuningstep[tsindex];
rig_debug(RIG_DEBUG_VERBOSE, "%s: tsindex=%d, stepsize=%d\n", __func__, tsindex,
ts);
(int)ts);
freq = roundl(freq / ts) * ts;
sprintf(fbuf, "%010"PRIll, (int64_t)freq);
memcpy(buf + 5, fbuf, 10);
@ -475,7 +475,7 @@ static int thd72_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int tsindex = buf[16] - '0';
shortfreq_t ts = thd72tuningstep[tsindex];
rig_debug(RIG_DEBUG_VERBOSE, "%s: tsindex=%d, stepsize=%d\n", __func__, tsindex,
ts);
(int)ts);
sscanf(buf + 5, "%"SCNfreq, freq);
return RIG_OK;
}
@ -960,7 +960,7 @@ static int thd72_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return thd72_set_menu_item(rig, 13, lvl);
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1068,7 +1068,7 @@ static int thd72_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

20
kenwood/thd74.c
Wyświetl plik

@ -220,8 +220,8 @@ static int thd74_get_vfo(RIG *rig, vfo_t *vfo)
}
else
{
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected answer length '%c'\n", __func__,
length);
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected answer length %d\n", __func__,
(int)length);
return -RIG_EPROTO;
}
@ -232,7 +232,7 @@ static int thd74_get_vfo(RIG *rig, vfo_t *vfo)
case '1': *vfo = RIG_VFO_B; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO: %d\n", __func__, vfo);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO: %s\n", __func__, rig_strvfo(*vfo));
return -RIG_EVFO;
}
@ -368,7 +368,7 @@ static int thd74_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
*ts = thd74tuningstep[tsinx];
}
rig_debug(RIG_DEBUG_TRACE, "%s: stepsize is %d\n", __func__, *ts);
rig_debug(RIG_DEBUG_TRACE, "%s: stepsize is %d\n", __func__, (int)*ts);
return RIG_OK;
}
@ -387,8 +387,8 @@ static int thd74_round_freq(RIG *rig, vfo_t vfo, freq_t freq)
r = round((double)f / (double)ts);
r = ts * r;
rig_debug(RIG_DEBUG_TRACE, "%s: rounded %10d to %10d because stepsize:%d\n",
__func__, f, (int64_t)r, ts);
rig_debug(RIG_DEBUG_TRACE, "%s: rounded %"PRIll" to %"PRIll" because stepsize:%d\n",
__func__, f, (int64_t)r, (int)ts);
return (freq_t)r;
}
@ -494,7 +494,7 @@ int thd74_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_CWR: kmode = '9'; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Mode %d\n", __func__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
}
@ -883,7 +883,7 @@ static int thd74_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
rig_debug(RIG_DEBUG_TRACE, "%s: level: %ld\n", __func__, level);
rig_debug(RIG_DEBUG_TRACE, "%s: value.i: %lf\n", __func__, val.i);
rig_debug(RIG_DEBUG_TRACE, "%s: value.i: %d\n", __func__, val.i);
rig_debug(RIG_DEBUG_TRACE, "%s: value.f: %lf\n", __func__, val.f);
retval = thd74_vfoc(rig, vfo, &c);
@ -925,7 +925,7 @@ static int thd74_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return kenwood_simple_transaction(rig, cmd, 6);
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1039,7 +1039,7 @@ static int thd74_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

4
kenwood/thg71.c
Wyświetl plik

@ -215,7 +215,7 @@ int thg71_decode_event (RIG *rig)
return -RIG_ERJCTED;
}
rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"PRIfreq" Hz, mode %d)\n", __func__, freq);
rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"PRIfreq" Hz)\n", __func__, freq);
/* Callback execution */
if (rig->callbacks.vfo_event) {
@ -381,7 +381,7 @@ int thg71_get_vfo (RIG *rig, vfo_t *vfo)
*vfo=RIG_VFO_MEM;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO %d\n", __func__, vfo);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported VFO %s\n", __func__, rig_strvfo(*vfo));
return -RIG_EVFO;
}
return RIG_OK;

30
kenwood/tmd710.c
Wyświetl plik

@ -1175,7 +1175,7 @@ static int tmd710_get_mode_hamlib_values(int tmd710_mode, rmode_t *mode, pbwidth
*width = 4000;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Illegal value from radio '%ld'\n", __func__, tmd710_mode);
rig_debug(RIG_DEBUG_ERR, "%s: Illegal value from radio %d\n", __func__, tmd710_mode);
return -RIG_EINVAL;
}
@ -1214,7 +1214,7 @@ static int tmd710_get_mode_tmd710_value(rmode_t mode, int *tmd710_mode) {
} else if (mode == RIG_MODE_AM) {
*tmd710_mode = 2;
} else {
rig_debug(RIG_DEBUG_ERR, "%s: Illegal value from radio '%ld'\n", __func__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: Illegal value from radio %d\n", __func__, (int)mode);
return -RIG_EINVAL;
}
@ -1793,7 +1793,7 @@ int tmd710_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
retval = sscanf(buf, "BY %d,%d", &vfonum, &dcd_val);
if (retval != 2) {
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s', len=%d\n", __func__, buf);
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s'\n", __func__, buf);
return -RIG_EPROTO;
}
@ -1805,7 +1805,7 @@ int tmd710_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
*dcd = RIG_DCD_ON;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s', len=%d\n", __func__, buf);
rig_debug(RIG_DEBUG_ERR, "%s: unexpected reply '%s'\n", __func__, buf);
return -RIG_ERJCTED;
}
@ -1881,7 +1881,7 @@ int tmd710_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1915,7 +1915,7 @@ int tmd710_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return kenwood_transaction(rig, buf, ackbuf, sizeof(ackbuf));
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported Level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported Level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
}
@ -1980,7 +1980,7 @@ int tmd710_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
tmd710_fo fo_struct;
tmd710_mu mu_struct;
rig_debug(RIG_DEBUG_TRACE, "%s: called (0x%04x)\n", __func__, func);
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
switch (func) {
case RIG_FUNC_TONE:
@ -2031,7 +2031,7 @@ int tmd710_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
*status = (mu_struct.scan_resume == TMD710_SCAN_RESUME_TIME) ? 1 : 0;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %#x\n", __func__, func);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %s\n", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -2049,7 +2049,7 @@ int tmd710_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
tmd710_fo fo_struct;
tmd710_mu mu_struct;
rig_debug(RIG_DEBUG_TRACE, "%s: called (0x%04x)\n", __func__, func);
rig_debug(RIG_DEBUG_TRACE, "%s: called %s\n", __func__, rig_strfunc(func));
switch (func) {
case RIG_FUNC_TONE:
@ -2103,7 +2103,7 @@ int tmd710_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_TBURST:
return tmd710_tburst(rig, status);
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %#x\n", __func__, func);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported function %s\n", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -2127,7 +2127,7 @@ int tmd710_get_parm(RIG *rig, setting_t parm, value_t *val)
int retval;
tmd710_mu mu_struct;
rig_debug(RIG_DEBUG_TRACE, "%s: called (0x%04x)\n", __func__, parm);
rig_debug(RIG_DEBUG_TRACE, "%s: called %s\n", __func__, rig_strparm(parm));
retval = tmd710_pull_mu(rig, &mu_struct);
if (retval != RIG_OK) {
@ -2149,7 +2149,7 @@ int tmd710_get_parm(RIG *rig, setting_t parm, value_t *val)
val->f = ((float) mu_struct.brightness_level) / 8.0f;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %#x\n", __func__, parm);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
@ -2198,7 +2198,7 @@ int tmd710_set_parm(RIG *rig, setting_t parm, value_t val)
break;
}
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %#x\n", __func__, parm);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
@ -2226,7 +2226,7 @@ int tmd710_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val) {
val->i = mu_struct.ext_data_band;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported ext level %d\n", __func__, token);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported ext level %s\n", __func__, rig_strlevel(token));
return -RIG_EINVAL;
}
@ -2261,7 +2261,7 @@ int tmd710_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val) {
break;
}
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported ext level %d\n", __func__, token);
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported ext level %s\n", __func__, rig_strlevel(token));
return -RIG_EINVAL;
}

2
kenwood/tmv7.c
Wyświetl plik

@ -244,7 +244,7 @@ int tmv7_decode_event (RIG *rig)
return -RIG_ERJCTED;
}
rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"PRIfreq" Hz, mode %d)\n", __func__, freq);
rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"PRIfreq" Hz)\n", __func__, freq);
/* Callback execution */
if (rig->callbacks.vfo_event) {

4
kenwood/transfox.c
Wyświetl plik

@ -268,7 +268,7 @@ int transfox_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -315,7 +315,7 @@ int transfox_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %x", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

46
kenwood/ts2000.c
Wyświetl plik

@ -692,7 +692,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvl_len = strlen (lvlbuf);
if ((lvl_len != 4)){ /*TS-2000 returns 4 chars for PA; */
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n",
__func__, lvl_len);
__func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -709,8 +709,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if ((lvl_len != 6)){ /* TS-2000 returns 6 chars for RA; */
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -728,8 +727,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -742,8 +740,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -756,8 +753,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -770,8 +766,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+3, "%d", &lvl);
@ -784,8 +779,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 15) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d answer=%s\n", lvl_len, lvlbuf);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d answer=%s\n", __func__, (int)lvl_len, lvlbuf);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+8, "%d", &lvl);
@ -798,8 +792,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+3, "%d", &lvl);
@ -812,8 +805,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -826,8 +818,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -844,8 +835,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 8) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -870,8 +860,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -888,8 +877,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 7) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -902,8 +890,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 5) {
rig_debug(RIG_DEBUG_ERR,"ts2000_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf(lvlbuf+2, "%d", &lvl);
@ -922,8 +909,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvl_len = strlen (lvlbuf);
if (( (lvl_len !=7)) || lvlbuf[1] != 'M') {
/* TS-2000 returns 8 bytes for S meter level */
rig_debug(RIG_DEBUG_ERR,"%s: wrong answer len=%d\n",
__func__, lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: wrong answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -936,7 +922,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

10
kenwood/ts480.c
Wyświetl plik

@ -64,7 +64,7 @@ kenwood_ts480_get_info(RIG *rig)
if (firm_len != 5)
{
rig_debug(RIG_DEBUG_ERR, "kenwood_get_info: wrong answer len=%d\n", firm_len);
rig_debug(RIG_DEBUG_ERR, "%s: wrong answer len=%d\n", __func__, (int)firm_len);
return NULL;
}
@ -183,7 +183,7 @@ kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported agc value");
rig_debug(RIG_DEBUG_ERR, "%s: unsupported agc value", __func__);
return -RIG_EINVAL;
}
@ -208,7 +208,7 @@ kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported agc value");
rig_debug(RIG_DEBUG_ERR, "%s: unsupported agc value", __func__);
return -RIG_EINVAL;
}
@ -218,7 +218,7 @@ kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -447,7 +447,7 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

26
kenwood/ts570.c
Wyświetl plik

@ -60,8 +60,8 @@ static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
length = strlen (buf);
if (length != 3 || buf[1] != 'D')
{
rig_debug(RIG_DEBUG_ERR,"ts570_get_mode: unexpected MD answer, len=%d\n",
length);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected MD answer, len=%d\n",
__func__, (int)length);
return -RIG_ERJCTED;
}
@ -100,7 +100,7 @@ static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (length != 6 || buf[1] != 'W')
{
rig_debug(RIG_DEBUG_ERR,
"ts570_get_mode: unexpected FW answer, len=%d\n", length);
"%s: unexpected FW answer, len=%d\n", __func__, (int)length);
return -RIG_ERJCTED;
}
*width = atoi(&buf[2]);
@ -115,7 +115,7 @@ static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (length != 4 || buf[1] != 'L')
{
rig_debug(RIG_DEBUG_ERR,
"ts570_get_mode: unexpected SL answer, len=%d\n", length);
"%s: unexpected SL answer, len=%d\n", __func__, (int)length);
return -RIG_ERJCTED;
}
*width = 50 * atoi(&buf[2]);
@ -139,7 +139,7 @@ static char mode_to_char(rmode_t mode)
case RIG_MODE_RTTY: return(MD_FSK);
case RIG_MODE_RTTYR: return(MD_FSKR);
default:
rig_debug(RIG_DEBUG_WARN,"ts570_mode_to_char %s: unsupported mode %d\n", __func__,mode);
rig_debug(RIG_DEBUG_WARN,"%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
}
return(RIG_MODE_NONE);
}
@ -234,8 +234,7 @@ int ts570_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return retval;
fct_len = strlen (fctbuf);
if (fct_len != 3) {
rig_debug(RIG_DEBUG_ERR,"kenwood_get_func: "
"wrong answer len=%d\n", fct_len);
rig_debug(RIG_DEBUG_ERR,"%s: wrong answer len=%d\n", __func__, (int)fct_len);
return -RIG_ERJCTED;
}
@ -248,8 +247,7 @@ int ts570_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return retval;
fct_len = strlen (fctbuf);
if (fct_len != 5) {
rig_debug(RIG_DEBUG_ERR,"kenwood_get_func: "
"wrong answer len=%d\n", fct_len);
rig_debug(RIG_DEBUG_ERR,"%s: wrong answer len=%d\n", __func__, (int)fct_len);
return -RIG_ERJCTED;
}
@ -361,8 +359,7 @@ ts570_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
return retval;
ack_len = strlen (ackbuf);
if (3 != ack_len) {
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n",
__func__, ack_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)ack_len);
return -RIG_ERJCTED;
}
@ -372,9 +369,7 @@ ts570_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
} else {
for (i=0; i<levelint && i<MAXDBLSTSIZ; i++) {
if (rig->state.preamp[i] == 0) {
rig_debug(RIG_DEBUG_ERR,"%s: "
"unexpected att level %d\n",
__func__, levelint);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected att level %d\n", __func__, (int)levelint);
return -RIG_EPROTO;
}
}
@ -580,8 +575,7 @@ int ts570_get_xit(RIG *rig, vfo_t vfo, shortfreq_t * rit)
return retval;
size_t info_len = strlen (infobuf);
if (info_len != 37 || infobuf[1] != 'F') {
rig_debug(RIG_DEBUG_ERR,"kenwood_get_rit: wrong answer len=%d\n",
info_len);
rig_debug(RIG_DEBUG_ERR,"%s: wrong answer len=%d\n", __func__, (int)info_len);
return -RIG_ERJCTED;
}

2
kenwood/ts850.c
Wyświetl plik

@ -325,7 +325,7 @@ static char mode_to_char(rmode_t mode)
case RIG_MODE_RTTY: return(MD_FSK);
case RIG_MODE_RTTYR: return(MD_FSKR);
default:
rig_debug(RIG_DEBUG_WARN,"%s: unsupported mode %d\n", __func__,mode);
rig_debug(RIG_DEBUG_WARN,"%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
}
return(RIG_MODE_NONE);
}

24
kenwood/ts870s.c
Wyświetl plik

@ -72,8 +72,7 @@ static int ts870s_get_vfo(RIG *rig, vfo_t *vfo)
return retval;
vfo_len = strlen (vfobuf);
if (vfo_len != 3 || vfobuf[1] != 'R') {
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer %s, "
"len=%d\n",__func__,vfobuf, vfo_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer %s, len=%d\n", __func__, vfobuf, (int)vfo_len);
return -RIG_ERJCTED;
}
@ -104,7 +103,7 @@ static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (buf_len != 3 || buf[1] != 'D')
{
rig_debug(RIG_DEBUG_ERR,"%s: unexpected MD answer, len=%d\n",
__func__,buf_len);
__func__,(int)buf_len);
return -RIG_ERJCTED;
}
@ -132,7 +131,7 @@ static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (buf_len != 6 || buf[1] != 'W')
{
rig_debug(RIG_DEBUG_ERR,"%s: unexpected FW answer, len=%d\n",
__func__,buf_len);
__func__,(int)buf_len);
return -RIG_ERJCTED;
}
@ -149,7 +148,7 @@ static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (buf_len != 7 || buf[1] != 'S')
{
rig_debug(RIG_DEBUG_ERR,"%s: unexpected IS answer, len=%d\n",
__func__,buf_len);
__func__,(int)buf_len);
return -RIG_ERJCTED;
}
@ -176,8 +175,8 @@ static int ts870s_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_RTTY: kmode = MD_FSK; break;
case RIG_MODE_RTTYR: kmode = MD_FSKR; break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
__func__,mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -250,8 +249,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 6 || lvlbuf[1] != 'M') {
rig_debug(RIG_DEBUG_ERR,"ts870s_get_level: "
"wrong answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"ts870s_get_level: wrong answer len=%d\n", (int)lvl_len);
return -RIG_ERJCTED;
}
@ -324,8 +322,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return retval;
lvl_len = strlen (lvlbuf);
if (lvl_len != 4) {
rig_debug(RIG_DEBUG_ERR,"ts870s_get_level: "
"unexpected answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"%s: unexpected answer len=%d\n", __func__, (int)lvl_len);
return -RIG_ERJCTED;
}
@ -352,8 +349,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvl_len = strlen (lvlbuf);
if (lvl_len != 5 || lvlbuf[1] != 'C')
{
rig_debug(RIG_DEBUG_ERR,"ts870s_get_level: "
"wrong answer len=%d\n", lvl_len);
rig_debug(RIG_DEBUG_ERR,"ts870s_get_level: wrong answer len=%d\n", (int)lvl_len);
return -RIG_ERJCTED;
}
sscanf (lvlbuf + 2, "%d", &lvl);
@ -398,7 +394,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENAVAIL;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

2
kenwood/ts990s.c
Wyświetl plik

@ -623,7 +623,7 @@ int ts990s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

10
kenwood/xg3.c
Wyświetl plik

@ -243,7 +243,7 @@ int xg3_set_level(RIG * rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -308,7 +308,7 @@ int xg3_get_level(RIG * rig, vfo_t vfo, setting_t level, value_t * val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d", level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_level %s", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -523,7 +523,7 @@ int xg3_set_mem(RIG * rig, vfo_t vfo, int ch)
retval = kenwood_transaction(rig, cmdbuf, NULL, 0);
if (retval != RIG_OK)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s invalid set_mem cmd=%d\n", __func__,
rig_debug(RIG_DEBUG_VERBOSE, "%s invalid set_mem cmd=%s\n", __func__,
cmdbuf);
return -RIG_EINVAL;
}
@ -624,7 +624,7 @@ int xg3_set_parm(RIG *rig, setting_t parm, value_t val)
retval = kenwood_simple_transaction(rig, cmdbuf, 0);
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_parm %d\n", __func__,parm);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
return retval;
@ -651,7 +651,7 @@ int xg3_get_parm(RIG *rig, setting_t parm, value_t *val)
}
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_parm %d\n", __func__,parm);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}
return retval;

2
kit/elektor507.c
Wyświetl plik

@ -466,7 +466,7 @@ int elektor507_ftdi_write_data(RIG *rig, void *FTOutBuf, unsigned long BufferSiz
libusb_device_handle *udh = rig->state.rigport.handle;
int ret, actual_length;
rig_debug(RIG_DEBUG_TRACE, "%s called, %d bytes\n", __func__, BufferSize);
rig_debug(RIG_DEBUG_TRACE, "%s called, %lu bytes\n", __func__, BufferSize);
ret = libusb_bulk_transfer(udh, FTDI_IN_EP, FTOutBuf, BufferSize, &actual_length, FTDI_USB_WRITE_TIMEOUT);

12
kit/funcube.c
Wyświetl plik

@ -550,7 +550,7 @@ int funcube_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -603,7 +603,7 @@ int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -689,7 +689,7 @@ int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -722,7 +722,7 @@ int funcubepro_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -775,7 +775,7 @@ int funcubepro_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
au8BufOut[0] = REQUEST_GET_IF_GAIN;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -817,7 +817,7 @@ int funcubepro_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported level %d\n", __func__, level);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

4
kit/kit.c
Wyświetl plik

@ -38,7 +38,7 @@
*/
DECLARE_INITRIG_BACKEND(kit)
{
rig_debug(RIG_DEBUG_VERBOSE, "kit: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&elektor304_caps);
rig_register(&drt1_caps);
@ -76,7 +76,7 @@ DECLARE_INITRIG_BACKEND(kit)
*/
DECLARE_INITROT_BACKEND(kit)
{
rig_debug(RIG_DEBUG_VERBOSE, "kit: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rot_register(&pcrotor_caps);

6
kit/rs_hfiq.c
Wyświetl plik

@ -53,10 +53,12 @@ static int rshfiq_open(RIG *rig)
if( retval != RIG_OK)
return retval;
retval=ser_get_dtr(&rig->state.rigport, &flag);
if(retval == RIG_OK)
if(retval == RIG_OK) {
rig_debug(RIG_DEBUG_TRACE, "%s: DTR: %d\n", __func__,flag);
else
}
else {
rig_debug(RIG_DEBUG_TRACE, "%s: Could not get DTR\n", __func__);
}
if(flag == 0)
{
flag=1; // Set DTR

2
kit/si570avrusb.c
Wyświetl plik

@ -943,7 +943,7 @@ static int setBPF(RIG *rig, int enable)
if (nBytes < 0)
return -RIG_EIO;
rig_debug(RIG_DEBUG_TRACE, "Filter Bank 1:\n");
rig_debug(RIG_DEBUG_TRACE, "%s: Filter Bank 1:\n", __func__);
for (i = 0; i < (nBytes / 2) - 1; i++) {
rig_debug(RIG_DEBUG_TRACE, " CrossOver[%d] = %f\n",

5
lowe/lowe.c
Wyświetl plik

@ -143,8 +143,7 @@ int lowe_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_FAX: mode_sel = MD_FAX; break;
case RIG_MODE_AMS: mode_sel = MD_AMS; break;
default:
rig_debug(RIG_DEBUG_ERR,"lowe_set_mode: "
"unsupported mode %d\n", mode);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -314,7 +313,7 @@ DECLARE_PROBERIG_BACKEND(lowe)
*/
DECLARE_INITRIG_BACKEND(lowe)
{
rig_debug(RIG_DEBUG_VERBOSE, "lowe: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&hf235_caps);

3
meade/meade.c
Wyświetl plik

@ -252,7 +252,6 @@ static int meade_set_position(ROT *rot, azimuth_t az, elevation_t el)
/* So we just ignore commands while moving */
/* Should we return RIG_OK or an error though? */
meade_transaction(rot, ":D#", return_str, &return_str_size, sizeof(return_str));
rig_debug(RIG_DEBUG_VERBOSE,"%s: size=%d, str[0]=0x%02x\n",__func__, return_str_size, return_str[0]);
// LX200 return 0xff bytes and Autostart returns 0x7f
if(return_str_size > 0 && ((return_str[0] & 0x7f) == 0x7f)) {
rig_debug(RIG_DEBUG_WARN,"%s: rotor is moving...ignoring move\n",__func__);
@ -445,7 +444,7 @@ const struct rot_caps meade_caps = {
DECLARE_INITROT_BACKEND(meade)
{
rig_debug(RIG_DEBUG_VERBOSE, "meade: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rot_register(&meade_caps);

28
pcr/pcr.c
Wyświetl plik

@ -721,8 +721,8 @@ pcr_set_mode(RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
int buf_len, err;
int pcrmode, pcrfilter;
rig_debug(RIG_DEBUG_VERBOSE, "%s: mode = %d (%s), width = %d\n",
__func__, mode, rig_strrmode(mode), width);
rig_debug(RIG_DEBUG_VERBOSE, "%s: mode = %s, width = %d\n",
__func__, rig_strrmode(mode), (int)width);
/* XXX? */
if (mode == RIG_MODE_NONE)
@ -752,8 +752,8 @@ pcr_set_mode(RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
pcrmode = MD_FM;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__func__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -762,7 +762,7 @@ pcr_set_mode(RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
width = rig_passband_normal(rig, mode);
rig_debug(RIG_DEBUG_VERBOSE, "%s: will set to %d\n",
__func__, width);
__func__, (int)width);
switch (width) {
/* nop, pcrfilter already set
@ -785,12 +785,12 @@ pcr_set_mode(RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported width %d\n",
__func__, width);
__func__, (int)width);
return -RIG_EINVAL;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: filter set to %d (%c)\n",
__func__, width, pcrfilter);
__func__, (int)width, pcrfilter);
buf_len = sprintf((char *) buf, "K%c%010" PRIll "0%c0%c00",
is_sub_rcvr(rig, vfo) ? '1':'0',
@ -963,11 +963,11 @@ pcr_set_level(RIG * rig, vfo_t vfo, setting_t level, value_t val)
int err = -RIG_ENIMPL;
if (RIG_LEVEL_IS_FLOAT(level)) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %d, val = %f\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %lu, val = %f\n",
__func__, level, val.f);
}
else {
rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %d, val = %d\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %lu, val = %ul\n",
__func__, level, val.i);
}
@ -1099,8 +1099,8 @@ pcr_set_func(RIG * rig, vfo_t vfo, setting_t func, int status)
struct pcr_priv_data *priv = (struct pcr_priv_data *) rig->state.priv;
struct pcr_rcvr *rcvr = is_sub_rcvr(rig, vfo) ? &priv->sub_rcvr : &priv->main_rcvr;
rig_debug(RIG_DEBUG_VERBOSE, "%s: status = %ld, func = %d\n", __func__,
status, func);
rig_debug(RIG_DEBUG_VERBOSE, "%s: status = %d, func = %s\n", __func__,
status, rig_strfunc(func));
switch (func) {
case RIG_FUNC_NR: /* sets DSP noise reduction on or off */
@ -1182,7 +1182,7 @@ pcr_get_func(RIG * rig, vfo_t vfo, setting_t func, int *status)
int
pcr_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: tok = %d\n", __func__, token);
rig_debug(RIG_DEBUG_VERBOSE, "%s: tok = %s\n", __func__, rig_strlevel(token));
switch (token) {
@ -1195,7 +1195,7 @@ pcr_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
return pcr_set_diversity(rig, vfo, (0 == val.i) ? 0 : 2);
default:
rig_debug(RIG_DEBUG_VERBOSE, "%s: unknown token: %d\n", __func__, token);
rig_debug(RIG_DEBUG_VERBOSE, "%s: unknown token: %s\n", __func__, rig_strlevel(token));
return -RIG_EINVAL;
}
@ -1718,7 +1718,7 @@ int pcr_get_dcd(RIG * rig, vfo_t vfo, dcd_t *dcd)
DECLARE_INITRIG_BACKEND(pcr)
{
rig_debug(RIG_DEBUG_VERBOSE, "pcr: init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: init called\n", __func__);
rig_register(&pcr100_caps);
rig_register(&pcr1000_caps);

6
prm80/prm80.c
Wyświetl plik

@ -348,7 +348,7 @@ int prm80_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -383,7 +383,7 @@ int prm80_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return RIG_OK;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -414,7 +414,7 @@ const char * prm80_get_info(RIG *rig)
*/
DECLARE_INITRIG_BACKEND(prm80)
{
rig_debug(RIG_DEBUG_VERBOSE, "prm80: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&prm8060_caps);

2
prosistel/prosistel.c
Wyświetl plik

@ -287,7 +287,7 @@ const struct rot_caps prosistel_rot_caps =
DECLARE_INITROT_BACKEND(prosistel)
{
rig_debug(RIG_DEBUG_VERBOSE, "prosistel: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rot_register(&prosistel_rot_caps);

20
racal/ra37xx.c
Wyświetl plik

@ -322,8 +322,8 @@ int ra37xx_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_FM: widthtype = 3; ra_mode = MD_FM; break;
case RIG_MODE_RTTY: widthtype = 3; ra_mode = MD_FSK; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__FUNCTION__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -368,8 +368,8 @@ int ra37xx_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
case MD_FM: widthtype = 3; *mode = RIG_MODE_FM; break;
case MD_AM: widthtype = 3; *mode = RIG_MODE_AM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(*mode));
return -RIG_EPROTO;
}
@ -399,8 +399,8 @@ int ra37xx_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
sprintf(cmdbuf, "MUTE%d", status ? 1 : 0);
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %d\n",
__FUNCTION__, func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %s\n",
__func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -423,7 +423,7 @@ int ra37xx_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported %d\n", __FUNCTION__, func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %s\n", __FUNCTION__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -473,8 +473,8 @@ int ra37xx_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %d\n",
__FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -562,7 +562,7 @@ int ra37xx_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}

16
racal/racal.c
Wyświetl plik

@ -260,8 +260,8 @@ int racal_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AMS: ra_mode = MD_ISB; break; /* TBC */
case RIG_MODE_FM: ra_mode = MD_FM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -301,8 +301,8 @@ int racal_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
case MD_FM: *mode = RIG_MODE_FM; break;
case MD_AM: *mode = RIG_MODE_AM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(*mode));
return -RIG_EPROTO;
}
@ -350,8 +350,8 @@ int racal_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %d\n",
__FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -418,7 +418,7 @@ int racal_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -471,7 +471,7 @@ const char* racal_get_info(RIG *rig)
*/
DECLARE_INITRIG_BACKEND(racal)
{
rig_debug(RIG_DEBUG_VERBOSE, "racal: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&ra6790_caps);
rig_register(&ra3702_caps);

2
rft/rft.c
Wyświetl plik

@ -97,7 +97,7 @@ int rft_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
*/
DECLARE_INITRIG_BACKEND(rft)
{
rig_debug(RIG_DEBUG_VERBOSE, "rft: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&ekd500_caps);

2
rotorez/rotorez.c
Wyświetl plik

@ -735,7 +735,7 @@ static int rotorez_rot_set_conf(ROT *rot, token_t token, const char *val) {
int err;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_debug(RIG_DEBUG_TRACE, "%s: token = %d, *val = %c\n", __func__, token, *val);
rig_debug(RIG_DEBUG_TRACE, "%s: token = %d, *val = %c\n", __func__, (int)token, *val);
if (!rot)
return -RIG_EINVAL;

2
rs/gp2000.c
Wyświetl plik

@ -161,7 +161,7 @@ gp2000_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
int len, retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s, mode=%s, width=%d\n", __func__,
rig_strvfo(vfo), rig_strvfo(mode), width);
rig_strvfo(vfo), rig_strvfo(mode), (int)width);
switch (mode)
{

2
rs/rs.c
Wyświetl plik

@ -325,7 +325,7 @@ int rs_reset(RIG *rig, reset_t reset)
*/
DECLARE_INITRIG_BACKEND(rs)
{
rig_debug(RIG_DEBUG_VERBOSE, "rs: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&esmc_caps);
rig_register(&eb200_caps);

8
skanti/skanti.c
Wyświetl plik

@ -167,8 +167,8 @@ int skanti_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_RTTY: sk_mode = MD_RTTY EOM; break;
case RIG_MODE_AM: sk_mode = MD_AM EOM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -252,7 +252,7 @@ int skanti_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return skanti_transaction (rig, agc, strlen(agc), NULL, NULL);
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -291,7 +291,7 @@ int skanti_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
*/
DECLARE_INITRIG_BACKEND(skanti)
{
rig_debug(RIG_DEBUG_VERBOSE, "skanti: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&trp8000_caps);
rig_register(&trp8255_caps);

4
spid/spid.c
Wyświetl plik

@ -88,7 +88,7 @@ static int spid_get_conf(ROT *rot, token_t token, char *val)
{
struct spid_rot2prog_priv_data *priv = (struct spid_rot2prog_priv_data*)rot->state.priv;
rig_debug(RIG_DEBUG_TRACE, "%s called %d\n", __FUNCTION__, token);
rig_debug(RIG_DEBUG_TRACE, "%s called %d\n", __func__, (int)token);
if (rot->caps->rot_model != ROT_MODEL_SPID_ROT2PROG &&
rot->caps->rot_model != ROT_MODEL_SPID_MD01_ROT2PROG)
@ -111,7 +111,7 @@ static int spid_set_conf(ROT *rot, token_t token, const char *val)
{
struct spid_rot2prog_priv_data *priv = (struct spid_rot2prog_priv_data*)rot->state.priv;
rig_debug(RIG_DEBUG_TRACE, "%s called %d %s\n", __FUNCTION__, token, val);
rig_debug(RIG_DEBUG_TRACE, "%s: called %d=%s\n", __func__, (int)token, val);
if (rot->caps->rot_model != ROT_MODEL_SPID_ROT2PROG &&
rot->caps->rot_model != ROT_MODEL_SPID_MD01_ROT2PROG)

1
src/debug.c
Wyświetl plik

@ -160,6 +160,7 @@ char *date_strget(char *buf, int buflen)
* \param fmt
* \brief Default is debugging messages are done through stderr
*/
#undef rig_debug
void HAMLIB_API rig_debug(enum rig_debug_level_e debug_level,
const char *fmt, ...)
{

10
src/iofunc.c
Wyświetl plik

@ -516,7 +516,7 @@ int HAMLIB_API write_block(hamlib_port_t *p, const char *txbuffer, size_t count)
/* with sequential fast writes*/
}
rig_debug(RIG_DEBUG_TRACE, "%s(): TX %d bytes\n", __func__, count);
rig_debug(RIG_DEBUG_TRACE, "%s(): TX %d bytes\n", __func__, (int)count);
dump_hex((unsigned char *) txbuffer, count);
return RIG_OK;
@ -579,8 +579,8 @@ int HAMLIB_API read_block(hamlib_port_t *p, char *rxbuffer, size_t count)
rig_debug(RIG_DEBUG_WARN,
"%s(): Timed out %d.%d seconds after %d chars\n",
__func__,
elapsed_time.tv_sec,
elapsed_time.tv_usec,
(int)elapsed_time.tv_sec,
(int)elapsed_time.tv_usec,
total_count);
return -RIG_ETIMEOUT;
@ -716,8 +716,8 @@ int HAMLIB_API read_string(hamlib_port_t *p,
rig_debug(RIG_DEBUG_WARN,
"%s(): Timed out %d.%d seconds after %d chars\n",
__func__,
elapsed_time.tv_sec,
elapsed_time.tv_usec,
(int)elapsed_time.tv_sec,
(int)elapsed_time.tv_usec,
total_count);
return -RIG_ETIMEOUT;

4
src/network.c
Wyświetl plik

@ -310,9 +310,9 @@ void network_flush(hamlib_port_t *rp)
{
int len_read = 0;
rig_debug(RIG_DEBUG_WARN,
"%s: network data clear d: ret=%d, len=%ld/0x%lx, '%s'\n",
"%s: network data clear d: ret=%d, len=%d, '%s'\n",
__func__,
ret, len, len, buffer);
ret, len, buffer);
len_read = recv(rp->fd, buffer, len < NET_BUFFER_SIZE ? len : NET_BUFFER_SIZE,
0);

2
src/parallel.c
Wyświetl plik

@ -693,7 +693,7 @@ int par_ptt_get(hamlib_port_t *p, ptt_t *pttx)
default:
rig_debug(RIG_DEBUG_ERR,
"Unsupported PTT type %d\n",
"%s: unsupported PTT type %d\n",
__func__,
p->type.ptt);
return -RIG_ENAVAIL;

2
src/rotator.c
Wyświetl plik

@ -647,7 +647,7 @@ int HAMLIB_API rot_get_position(ROT *rot,
if (rs->south_zero) {
*azimuth += *azimuth >=180 ? -180: 180;
rot_debug(RIG_DEBUG_VERBOSE,"%s: south adj to az=%.2f\n", __func__, azimuth);
rot_debug(RIG_DEBUG_VERBOSE,"%s: south adj to az=%.2f\n", __func__, *azimuth);
}
return RIG_OK;
}

4
src/usb_port.c
Wyświetl plik

@ -200,7 +200,7 @@ static libusb_device_handle *find_and_open_device(const hamlib_port_t *port)
libusb_free_device_list(devs, 1);
rig_debug(RIG_DEBUG_VERBOSE, " -> found\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s", " -> found\n");
return udh;
}
@ -208,7 +208,7 @@ static libusb_device_handle *find_and_open_device(const hamlib_port_t *port)
libusb_free_device_list(devs, 1);
rig_debug(RIG_DEBUG_VERBOSE, " -> not found\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s", " -> not found\n");
return NULL; /* not found */
}

2
tapr/tapr.c
Wyświetl plik

@ -110,7 +110,7 @@ int tapr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/
DECLARE_INITRIG_BACKEND(tapr)
{
rig_debug(RIG_DEBUG_VERBOSE, "tapr: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&dsp10_caps);

16
tentec/jupiter.c
Wyświetl plik

@ -582,8 +582,8 @@ int tt538_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM: ttmode = TT538_AM; break;
case RIG_MODE_FM: ttmode = TT538_FM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -812,8 +812,8 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %d\n",
__FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -868,8 +868,8 @@ int tt538_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %d\n",
__FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
retval = tt538_transaction (rig, cmdbuf, cmd_len, NULL,NULL);
@ -923,7 +923,7 @@ int tt538_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return RIG_OK;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_func %#x", func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_func %s", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
}
@ -996,7 +996,7 @@ int tt538_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_func %#x", func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_func %s", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}

20
tentec/omnivii.c
Wyświetl plik

@ -626,10 +626,10 @@ int tt588_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
case 36: *width = 250; break;
case 37: *width = 200; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unexpected bandwidth '%c'\n", __FUNCTION__, respbuf[1]);
rig_debug(RIG_DEBUG_ERR, "%s: unexpected bandwidth '%c'\n", __func__, respbuf[1]);
return -RIG_EPROTO;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%d width=%d\n", __FUNCTION__, rig_strvfo(vfo),*mode,*width);
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%s width=%d\n", __func__, rig_strvfo(vfo),rig_strrmode(*mode),(int)*width);
return RIG_OK;
}
@ -657,7 +657,7 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
struct tt588_priv_data *priv = (struct tt588_priv_data *) rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%d width=%d\n", __FUNCTION__, rig_strvfo(vfo),mode,width);
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%s width=%d\n", __FUNCTION__, rig_strvfo(vfo),rig_strrmode(mode),(int)width);
if(check_vfo(vfo)==FALSE) {
rig_debug(RIG_DEBUG_ERR,"%s: unsupported VFO %s\n", __FUNCTION__, rig_strvfo(vfo));
return -RIG_EINVAL;
@ -682,7 +682,7 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM: ttmode = TT588_AM; break;
case RIG_MODE_FM: ttmode = TT588_FM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n", __FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -909,10 +909,10 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
#endif
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%d val=%d\n", __FUNCTION__, rig_strvfo(vfo),level,*val);
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%s\n", __func__, rig_strvfo(vfo), rig_strlevel(level));
return RIG_OK;
}
@ -926,7 +926,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
int retval, cmd_len,ii;
unsigned char cmdbuf[16], agcmode;
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%d val=%d\n", __FUNCTION__, rig_strvfo(vfo),level,val);
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%s\n", __FUNCTION__, rig_strvfo(vfo),rig_strlevel(level));
if(check_vfo(vfo)==FALSE) {
rig_debug(RIG_DEBUG_ERR,"%s: unsupported VFO %s\n", __FUNCTION__, rig_strvfo(vfo));
return -RIG_EINVAL;
@ -993,7 +993,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %d\n", __FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1163,7 +1163,7 @@ int tt588_get_xit(RIG * rig, vfo_t vfo, shortfreq_t *xit)
if (respbuf[0] != 'L' || respbuf[4] != 0x0d)
return -RIG_EPROTO;
*xit = (respbuf[2]*(short)256) | respbuf[3];
rig_debug(RIG_DEBUG_VERBOSE,"%s: rit=%d\n", __FUNCTION__,*xit);
rig_debug(RIG_DEBUG_VERBOSE,"%s: rit=%d\n", __func__,(int)*xit);
return RIG_OK;
}
@ -1178,7 +1178,7 @@ static int set_rit_xit(RIG * rig, vfo_t vfo, shortfreq_t rit, int which)
int retval, cmd_len;
char cmdbuf[16];
rig_debug(RIG_DEBUG_VERBOSE, "%s: rit=%d\n", __FUNCTION__, rit);
rig_debug(RIG_DEBUG_VERBOSE, "%s: rit=%d\n", __FUNCTION__, (int)rit);
if(check_vfo(vfo)==FALSE) {
rig_debug(RIG_DEBUG_ERR,"%s: unsupported VFO %s\n", __FUNCTION__, rig_strvfo(vfo));
return -RIG_EINVAL;

22
tentec/orion.c
Wyświetl plik

@ -136,7 +136,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
if (!data || !data_len) {
/* If it's not a 'write' to rig or a Morse command, there must be data. */
if ((*cmd != '*') && (*cmd != '/')) {
rig_debug(RIG_DEBUG_ERR,"cmd reject 1\n");
rig_debug(RIG_DEBUG_ERR,"%s: cmd reject 1\n", __func__);
return -RIG_ERJCTED;
}
return RIG_OK; /* normal exit if write, but no read */
@ -148,7 +148,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
*data_len = read_string(&rs->rigport, data, *data_len,
EOM, strlen(EOM));
if (!strncmp(data,"Z!",2)) { // command unrecognized??
rig_debug(RIG_DEBUG_ERR,"cmd reject 2\n");
rig_debug(RIG_DEBUG_ERR,"%s: cmd reject 2\n", __func__);
return -RIG_ERJCTED; // what is a better error return?
}
/* XX and ?V are oddball commands. Thanks, Ten-Tec! */
@ -159,7 +159,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
return RIG_OK; // ditto
}
if (cmd[0] != '?') { // was this a read cmd?
rig_debug(RIG_DEBUG_ERR,"cmd reject 3\n");
rig_debug(RIG_DEBUG_ERR,"%s: cmd reject 3\n", __func__);
return -RIG_ERJCTED; // No, but it should have been!
}
else { // Yes, it was a 'read', phew!
@ -570,8 +570,8 @@ int tt565_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_FM: ttmode = TT565_FM; break;
case RIG_MODE_RTTY: ttmode = TT565_RTTY; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -1090,8 +1090,8 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %d\n",
__FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1465,8 +1465,8 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %d\n",
__FUNCTION__, level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1652,7 +1652,7 @@ int tt565_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_func %#x", func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_func %s", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
retval = tt565_transaction(rig, fcmdbuf, fcmdlen, NULL, NULL);
@ -1718,7 +1718,7 @@ int tt565_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
return RIG_OK;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_func %#x", func);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_func %s", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
fresplen = sizeof(frespbuf);

2
tentec/paragon.c
Wyświetl plik

@ -547,7 +547,7 @@ int tt585_set_parm(RIG *rig, setting_t parm, value_t val)
/* TODO: RIG_PARM_TIME */
default:
rig_debug (RIG_DEBUG_ERR, "%s: unsupported parm %#x\n", __func__, parm);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported parm %s\n", __func__, rig_strparm(parm));
return -RIG_EINVAL;
}

16
tentec/rx331.c
Wyświetl plik

@ -428,8 +428,8 @@ int rx331_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_DSB: dmode = RX331_ISB; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported mode %d\n",
__func__, mode);
"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -566,8 +566,8 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_level %d\n",
__func__, level);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -627,8 +627,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RX331_AGC_PROG: val->i = RIG_AGC_USER; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s:Unsupported get_level %d\n",
__func__, level);
"%s:Unsupported get_level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
break;
@ -764,8 +764,8 @@ int rx331_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_level %d\n",
__func__, level);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}

12
tentec/rx340.c
Wyświetl plik

@ -340,8 +340,8 @@ int rx340_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_DSB: dmode = RX340_ISB; break;
default:
rig_debug(RIG_DEBUG_ERR,
"%s: unsupported mode %d\n",
__func__, mode);
"%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -460,8 +460,8 @@ int rx340_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_level %d\n",
__func__, level);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -510,8 +510,8 @@ int rx340_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENIMPL;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_level %d\n",
__func__, level);
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported get_level %s\n",
__func__, rig_strlevel(level));
return -RIG_EINVAL;
}

14
tentec/tentec.c
Wyświetl plik

@ -187,7 +187,7 @@ static void tentec_tuning_factor_calc(RIG *rig)
case RIG_MODE_USB:
mcor=1; break;
default:
rig_debug(RIG_DEBUG_BUG, "tentec_tuning_factor_calc: invalid mode!\n");
rig_debug(RIG_DEBUG_BUG, "%s: invalid mode %s\n", __func__, rig_strrmode(priv->mode));
mcor=1; break;
}
tfreq = priv->freq / (freq_t)Hz(1);
@ -267,8 +267,7 @@ int tentec_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_FM: ttmode = TT_FM; break;
default:
rig_debug(RIG_DEBUG_ERR,
"tentec_set_mode: unsupported mode %d\n",
mode);
"%s: unsupported mode %s\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -288,8 +287,7 @@ int tentec_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
if (tentec_filters[ttfilter] != width) {
rig_debug(RIG_DEBUG_ERR,
"tentec_set_mode: unsupported width %d\n",
width);
"%s: unsupported width %d\n", __func__, (int)width);
return -RIG_EINVAL;
}
priv->width = width;
@ -397,7 +395,7 @@ int tentec_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported set_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -456,7 +454,7 @@ int tentec_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d\n", level);
rig_debug(RIG_DEBUG_ERR,"%s: unsupported get_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -493,7 +491,7 @@ const char *tentec_get_info(RIG *rig)
*/
DECLARE_INITRIG_BACKEND(tentec)
{
rig_debug(RIG_DEBUG_VERBOSE, "tentec: _init called\n");
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&tt550_caps);
rig_register(&tt516_caps);

4
tentec/tentec2.c
Wyświetl plik

@ -332,8 +332,8 @@ int tentec2_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_AM: ttmode = TT_AM; break;
case RIG_MODE_FM: ttmode = TT_FM; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %d\n",
__FUNCTION__, mode);
rig_debug(RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}

38
tentec/tt550.c
Wyświetl plik

@ -700,8 +700,8 @@ tt550_set_rx_mode (RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
ttmode = TT_FM;
break;
default:
rig_debug (RIG_DEBUG_ERR, "tt550_set_rxmode: unsupported mode %d\n",
mode);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -722,8 +722,8 @@ tt550_set_rx_mode (RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
if (tt550_filters[ttfilter] != width)
{
rig_debug (RIG_DEBUG_ERR, "tt550_set_mode: unsupported width %d\n",
width);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported width %d\n",
__func__, (int)width);
return -RIG_EINVAL;
}
@ -797,8 +797,8 @@ tt550_set_tx_mode (RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
ttmode = TT_FM;
break;
default:
rig_debug (RIG_DEBUG_ERR, "tt550_set_mode: unsupported tx mode %d\n",
mode);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported tx mode %s\n",
__func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
@ -829,7 +829,7 @@ tt550_set_tx_mode (RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (tt550_tx_filters[ttfilter] != width)
{
rig_debug (RIG_DEBUG_ERR,
"tt550_set_mode: unsupported tx width %d,%d\n", width,
"%s: unsupported tx width %d,%d\n", __func__, (int)width,
ttfilter);
return -RIG_EINVAL;
@ -1081,7 +1081,7 @@ tt550_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
return retval;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported set_level %d\n", level);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported set_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1212,7 +1212,7 @@ tt550_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
break;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported get_level %d\n", level);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported get_level %s\n", __func__, rig_strlevel(level));
return -RIG_EINVAL;
}
@ -1362,7 +1362,7 @@ tt550_set_func (RIG * rig, vfo_t vfo, setting_t func, int status)
return RIG_OK;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported set_func %#x", func);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported set_func %s", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -1396,7 +1396,7 @@ tt550_get_func (RIG * rig, vfo_t vfo, setting_t func, int *status)
break;
default:
rig_debug (RIG_DEBUG_ERR, "Unsupported get_func %#x", func);
rig_debug (RIG_DEBUG_ERR, "%s: unsupported get_func %s", __func__, rig_strfunc(func));
return -RIG_EINVAL;
}
@ -1416,8 +1416,8 @@ tt550_set_tuning_step (RIG * rig, vfo_t vfo, shortfreq_t stepsize)
rs = &rig->state;
priv = (struct tt550_priv_data *) rs->priv;
rig_debug (RIG_DEBUG_VERBOSE, "tt550: tt550_set_tuning_step - %d\n",
stepsize);
rig_debug (RIG_DEBUG_VERBOSE, "%s: tt550_set_tuning_step - %d\n",
__func__, (int)stepsize);
priv->stepsize = stepsize;
@ -1437,8 +1437,8 @@ tt550_get_tuning_step (RIG * rig, vfo_t vfo, shortfreq_t * stepsize)
rs = &rig->state;
priv = (struct tt550_priv_data *) rs->priv;
rig_debug (RIG_DEBUG_VERBOSE, "tt550: tt550_get_tuning_step - %d\n",
priv->stepsize);
rig_debug (RIG_DEBUG_VERBOSE, "%s: tt550_get_tuning_step - %d\n",
__func__, (int)priv->stepsize);
*stepsize = priv->stepsize;
@ -1556,7 +1556,7 @@ tt550_decode_event (RIG * rig)
// char key;
rig_debug (RIG_DEBUG_VERBOSE, "tt550: tt550_decode_event called\n");
rig_debug (RIG_DEBUG_VERBOSE, "%s/tt: tt550_decode_event called\n", __func__);
rs = &rig->state;
priv = (struct tt550_priv_data *) rs->priv;
@ -1567,11 +1567,11 @@ tt550_decode_event (RIG * rig)
if (data_len == -RIG_ETIMEOUT) {
rig_debug (RIG_DEBUG_VERBOSE,
"tt550: tt550_decode got a timeout before the first character\n");
"%s: tt550_decode got a timeout before the first character\n", __func__);
return RIG_OK;
}
rig_debug (RIG_DEBUG_VERBOSE, "tt550: tt550_decode %x\n", &buf);
rig_debug (RIG_DEBUG_VERBOSE, "%s: tt550_decode %p\n", __func__, &buf);
/*
* The first byte must be either 'U' for keypad operations
@ -1593,7 +1593,7 @@ tt550_decode_event (RIG * rig)
movement = movement | buf[2];
// key = buf[3];
rig_debug (RIG_DEBUG_VERBOSE,
"tt550: Step Direction = %d\n", movement);
"%s: Step Direction = %d\n", __func__, movement);
if (movement > 0)
priv->rx_freq += priv->stepsize;
if (movement < 0)

2
tests/ampctl.c
Wyświetl plik

@ -273,7 +273,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "ampctl, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE,
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
/*

2
tests/ampctl_parse.c
Wyświetl plik

@ -361,7 +361,7 @@ static int scanfc(FILE *fin, const char *format, void *p)
}
rig_debug(RIG_DEBUG_ERR, "fscanf: %s\n", strerror(errno));
rig_debug(RIG_DEBUG_ERR, "fscanf: parsing '%s' with '%s'\n", p, format);
rig_debug(RIG_DEBUG_ERR, "fscanf: parsing '%s' with '%s'\n", (char*)p, format);
}
return ret;

4
tests/ampctld.c
Wyświetl plik

@ -293,7 +293,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE,
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
my_amp = amp_init(my_model);
@ -483,7 +483,7 @@ int main(int argc, char *argv[])
if (NULL == result)
{
rig_debug(RIG_DEBUG_ERR, "bind error - no available interface\n");
rig_debug(RIG_DEBUG_ERR, "%s: bind error - no available interface\n", __func__);
exit(1);
}

2
tests/rigctl.c
Wyświetl plik

@ -421,7 +421,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigctl, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE,
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
/*

2
tests/rigctl_parse.c
Wyświetl plik

@ -486,7 +486,7 @@ static int scanfc(FILE *fin, const char *format, void *p)
rig_debug(RIG_DEBUG_ERR, "fscanf: %s\n", strerror(errno));
rig_debug(RIG_DEBUG_ERR,
"fscanf: parsing '%s' with '%s'\n",
p,
(char*)p,
format);
}

18
tests/rigctlcom.c
Wyświetl plik

@ -441,7 +441,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "%s, %s\n", "rigctlcom", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE,
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
if (argc == 1)
@ -670,7 +670,7 @@ static int write_block2(void *func,
if (retval != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s: %s\n", func, rigerror(retval));
rig_debug(RIG_DEBUG_ERR, "%s: %s\n", __func__, rigerror(retval));
}
return retval;
@ -990,7 +990,7 @@ static int handle_ts2000(void *arg)
if (n != 2)
{
rig_debug(RIG_DEBUG_ERR, "%s: error parsing preamp cmd '%s'\n", __func__, arg);
rig_debug(RIG_DEBUG_ERR, "%s: error parsing preamp cmd '%s'\n", __func__, (char*)arg);
}
int retval = rig_set_func(my_rig, RIG_VFO_A, RIG_FUNC_AIP, valA);
@ -1171,7 +1171,7 @@ static int handle_ts2000(void *arg)
if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: af level cmd parse failed: %s\n", __func__, arg);
rig_debug(RIG_DEBUG_ERR, "%s: af level cmd parse failed: %s\n", __func__, (char*)arg);
return -RIG_EPROTO;
}
@ -1219,7 +1219,7 @@ static int handle_ts2000(void *arg)
if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: speech level cmd parse failed: %s\n", __func__,
arg);
(char*)arg);
return -RIG_EPROTO;
}
@ -1272,7 +1272,7 @@ static int handle_ts2000(void *arg)
if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: AGC cmd parse failed: %s\n", __func__, arg);
rig_debug(RIG_DEBUG_ERR, "%s: AGC cmd parse failed: %s\n", __func__, (char*)arg);
return -RIG_EPROTO;
}
@ -1319,7 +1319,7 @@ static int handle_ts2000(void *arg)
if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: squelch cmd parse failed: %s\n", __func__, arg);
rig_debug(RIG_DEBUG_ERR, "%s: squelch cmd parse failed: %s\n", __func__, (char*)arg);
return -RIG_EPROTO;
}
@ -1370,7 +1370,7 @@ static int handle_ts2000(void *arg)
if (n != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: error parsing '%s'\n", __func__, arg);
rig_debug(RIG_DEBUG_ERR, "%s: error parsing '%s'\n", __func__, (char*)arg);
return -RIG_EPROTO;
}
@ -1500,7 +1500,7 @@ static int handle_ts2000(void *arg)
rig_debug(RIG_DEBUG_ERR,
"*********************************\n%s: unknown cmd='%s'\n",
__func__,
arg);
(char*)arg);
return -RIG_EINVAL;
}

12
tests/rigctld.c
Wyświetl plik

@ -149,10 +149,10 @@ static void sync_callback (int lock)
static pthread_mutex_t client_lock = PTHREAD_MUTEX_INITIALIZER;
if (lock) {
pthread_mutex_lock (&client_lock);
rig_debug (RIG_DEBUG_VERBOSE, "client lock engaged\n");
rig_debug (RIG_DEBUG_VERBOSE, "%s: client lock engaged\n", __func__);
}
else {
rig_debug (RIG_DEBUG_VERBOSE, "client lock disengaged\n");
rig_debug (RIG_DEBUG_VERBOSE, "%s: client lock disengaged\n", __func__);
pthread_mutex_unlock (&client_lock);
}
#endif
@ -485,7 +485,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigctld, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE,
rig_debug(RIG_DEBUG_VERBOSE,"%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
my_rig = rig_init(my_model);
@ -704,13 +704,13 @@ int main(int argc, char *argv[])
if (NULL == result)
{
rig_debug(RIG_DEBUG_ERR, "bind error - no available interface\n");
rig_debug(RIG_DEBUG_ERR, "%s: bind error - no available interface\n", __func__);
exit(1);
}
if (listen(sock_listen, 4) < 0)
{
handle_error(RIG_DEBUG_ERR, "listening");
handle_error(RIG_DEBUG_ERR, "listeningn");
exit(1);
}
@ -780,7 +780,7 @@ int main(int argc, char *argv[])
timeout.tv_usec = 0;
retcode = select (sock_listen + 1, &set, NULL, NULL, &timeout);
if (-1 == retcode) {
rig_debug (RIG_DEBUG_ERR, "select\n");
rig_debug (RIG_DEBUG_ERR, "%s: select\n", __func__);
}
else if (!retcode) {
if (ctrl_c) {

Some files were not shown because too many files have changed in this diff Show More