diff --git a/adat/adat.c b/adat/adat.c index cf024f1d4..e75452b8c 100644 --- a/adat/adat.c +++ b/adat/adat.c @@ -63,7 +63,7 @@ * */ #if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP)) -# include "hl_sleep.h" +# include "hl_sleep.h" #endif // --------------------------------------------------------------------------- @@ -92,7 +92,8 @@ static int gFnLevel = 0; // ADAT MODES -static adat_mode_list_t the_adat_mode_list = { +static adat_mode_list_t the_adat_mode_list = +{ ADAT_NR_MODES, { @@ -148,7 +149,8 @@ static adat_mode_list_t the_adat_mode_list = { // ADAT VFOS -static adat_vfo_list_t the_adat_vfo_list = { +static adat_vfo_list_t the_adat_vfo_list = +{ ADAT_NR_VFOS, { @@ -178,7 +180,8 @@ static adat_vfo_list_t the_adat_vfo_list = { // -- NIL -- (Marks the end of a cmd list) #if 0 -static adat_cmd_def_t adat_cmd_nil = { +static adat_cmd_def_t adat_cmd_nil = +{ ADAT_CMD_DEF_NIL, ADAT_CMD_KIND_WITHOUT_RESULT, NULL, @@ -191,7 +194,8 @@ static adat_cmd_def_t adat_cmd_nil = { #endif // -- ADAT SPECIAL: DISPLAY OFF -- -static adat_cmd_def_t adat_cmd_display_off = { +static adat_cmd_def_t adat_cmd_display_off = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITHOUT_RESULT, NULL, @@ -204,7 +208,8 @@ static adat_cmd_def_t adat_cmd_display_off = { // -- ADAT SPECIAL: DISPLAY ON -- -static adat_cmd_def_t adat_cmd_display_on = { +static adat_cmd_def_t adat_cmd_display_on = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITHOUT_RESULT, NULL, @@ -219,7 +224,8 @@ static adat_cmd_def_t adat_cmd_display_on = { // -- ADAT SPECIAL: GET SERIAL NR -- -static adat_cmd_def_t adat_cmd_get_serial_nr = { +static adat_cmd_def_t adat_cmd_get_serial_nr = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_serial_nr, @@ -232,7 +238,8 @@ static adat_cmd_def_t adat_cmd_get_serial_nr = { // -- ADAT SPECIAL: GET FIRMWARE VERSION -- -static adat_cmd_def_t adat_cmd_get_fw_version = { +static adat_cmd_def_t adat_cmd_get_fw_version = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_fw_version, @@ -246,7 +253,8 @@ static adat_cmd_def_t adat_cmd_get_fw_version = { // -- ADAT SPECIAL: GET HARDWARE VERSION -- -static adat_cmd_def_t adat_cmd_get_hw_version = { +static adat_cmd_def_t adat_cmd_get_hw_version = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_hw_version, @@ -259,7 +267,8 @@ static adat_cmd_def_t adat_cmd_get_hw_version = { // -- ADAT SPECIAL: GET FIRMWARE VERSION -- -static adat_cmd_def_t adat_cmd_get_id_code = { +static adat_cmd_def_t adat_cmd_get_id_code = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_id_code, @@ -272,7 +281,8 @@ static adat_cmd_def_t adat_cmd_get_id_code = { // -- ADAT SPECIAL: GET GUI FIRMWARE VERSION -- -static adat_cmd_def_t adat_cmd_get_gui_fw_version = { +static adat_cmd_def_t adat_cmd_get_gui_fw_version = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_gui_fw_version, @@ -285,7 +295,8 @@ static adat_cmd_def_t adat_cmd_get_gui_fw_version = { // -- ADAT SPECIAL: GET OPTIONS -- -static adat_cmd_def_t adat_cmd_get_options = { +static adat_cmd_def_t adat_cmd_get_options = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_options, @@ -298,7 +309,8 @@ static adat_cmd_def_t adat_cmd_get_options = { // -- ADAT SPECIAL: GET CALLSIGN -- -static adat_cmd_def_t adat_cmd_get_callsign = { +static adat_cmd_def_t adat_cmd_get_callsign = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITH_RESULT, adat_cmd_fn_get_callsign, @@ -311,7 +323,8 @@ static adat_cmd_def_t adat_cmd_get_callsign = { // -- ADAT SPECIAL: SET CALLSIGN -- -static adat_cmd_def_t adat_cmd_set_callsign = { +static adat_cmd_def_t adat_cmd_set_callsign = +{ ADAT_CMD_DEF_ADAT_SPECIAL, ADAT_CMD_KIND_WITHOUT_RESULT, adat_cmd_fn_set_callsign, @@ -326,7 +339,8 @@ static adat_cmd_def_t adat_cmd_set_callsign = { // -- GET FREQ -- -static adat_cmd_def_t adat_cmd_get_freq = { +static adat_cmd_def_t adat_cmd_get_freq = +{ ADAT_CMD_DEF_GET_FREQ, ADAT_CMD_KIND_WITH_RESULT, @@ -338,7 +352,8 @@ static adat_cmd_def_t adat_cmd_get_freq = { } }; -static adat_cmd_list_t adat_cmd_list_get_freq = { +static adat_cmd_list_t adat_cmd_list_get_freq = +{ 2, { &adat_cmd_display_off, @@ -348,7 +363,8 @@ static adat_cmd_list_t adat_cmd_list_get_freq = { // -- SET FREQ -- -static adat_cmd_def_t adat_cmd_set_freq = { +static adat_cmd_def_t adat_cmd_set_freq = +{ ADAT_CMD_DEF_SET_FREQ, ADAT_CMD_KIND_WITHOUT_RESULT, @@ -360,7 +376,8 @@ static adat_cmd_def_t adat_cmd_set_freq = { } }; -static adat_cmd_list_t adat_cmd_list_set_freq = { +static adat_cmd_list_t adat_cmd_list_set_freq = +{ 3, { &adat_cmd_display_off, @@ -370,7 +387,8 @@ static adat_cmd_list_t adat_cmd_list_set_freq = { }; // -- GET VFO -- -static adat_cmd_list_t adat_cmd_list_get_vfo = { +static adat_cmd_list_t adat_cmd_list_get_vfo = +{ 2, { &adat_cmd_display_off, @@ -380,7 +398,8 @@ static adat_cmd_list_t adat_cmd_list_get_vfo = { // -- GET MODE -- -static adat_cmd_def_t adat_cmd_get_mode = { +static adat_cmd_def_t adat_cmd_get_mode = +{ ADAT_CMD_DEF_GET_MODE, ADAT_CMD_KIND_WITH_RESULT, @@ -392,7 +411,8 @@ static adat_cmd_def_t adat_cmd_get_mode = { } }; -static adat_cmd_list_t adat_cmd_list_get_mode = { +static adat_cmd_list_t adat_cmd_list_get_mode = +{ 2, { &adat_cmd_display_off, @@ -402,7 +422,8 @@ static adat_cmd_list_t adat_cmd_list_get_mode = { // -- SET VFO -- -static adat_cmd_def_t adat_cmd_set_vfo = { +static adat_cmd_def_t adat_cmd_set_vfo = +{ ADAT_CMD_DEF_SET_VFO, ADAT_CMD_KIND_WITHOUT_RESULT, @@ -415,7 +436,8 @@ static adat_cmd_def_t adat_cmd_set_vfo = { } }; -static adat_cmd_list_t adat_cmd_list_set_vfo = { +static adat_cmd_list_t adat_cmd_list_set_vfo = +{ 2, { &adat_cmd_display_off, @@ -426,7 +448,8 @@ static adat_cmd_list_t adat_cmd_list_set_vfo = { // -- SET MODE -- -static adat_cmd_def_t adat_cmd_set_mode = { +static adat_cmd_def_t adat_cmd_set_mode = +{ ADAT_CMD_DEF_SET_MODE, ADAT_CMD_KIND_WITHOUT_RESULT, @@ -438,7 +461,8 @@ static adat_cmd_def_t adat_cmd_set_mode = { } }; -static adat_cmd_list_t adat_cmd_list_set_mode = { +static adat_cmd_list_t adat_cmd_list_set_mode = +{ 3, { &adat_cmd_display_off, @@ -449,7 +473,8 @@ static adat_cmd_list_t adat_cmd_list_set_mode = { // -- SET PTT -- -static adat_cmd_def_t adat_cmd_set_ptt = { +static adat_cmd_def_t adat_cmd_set_ptt = +{ ADAT_CMD_DEF_SET_PTT, ADAT_CMD_KIND_WITHOUT_RESULT, @@ -461,7 +486,8 @@ static adat_cmd_def_t adat_cmd_set_ptt = { } }; -static adat_cmd_list_t adat_cmd_list_set_ptt = { +static adat_cmd_list_t adat_cmd_list_set_ptt = +{ 2, { &adat_cmd_set_ptt, @@ -471,7 +497,8 @@ static adat_cmd_list_t adat_cmd_list_set_ptt = { // -- GET PTT -- -static adat_cmd_def_t adat_cmd_get_ptt = { +static adat_cmd_def_t adat_cmd_get_ptt = +{ ADAT_CMD_DEF_GET_PTT, ADAT_CMD_KIND_WITH_RESULT, @@ -483,7 +510,8 @@ static adat_cmd_def_t adat_cmd_get_ptt = { } }; -static adat_cmd_list_t adat_cmd_list_get_ptt = { +static adat_cmd_list_t adat_cmd_list_get_ptt = +{ 2, { &adat_cmd_display_off, @@ -493,7 +521,8 @@ static adat_cmd_list_t adat_cmd_list_get_ptt = { // -- GET POWER STATUS -- -static adat_cmd_list_t adat_cmd_list_get_powerstatus = { +static adat_cmd_list_t adat_cmd_list_get_powerstatus = +{ 1, { &adat_cmd_get_id_code @@ -502,7 +531,8 @@ static adat_cmd_list_t adat_cmd_list_get_powerstatus = { // -- GET INFO -- -static adat_cmd_list_t adat_cmd_list_get_info = { +static adat_cmd_list_t adat_cmd_list_get_info = +{ 7, { &adat_cmd_get_serial_nr, @@ -517,7 +547,8 @@ static adat_cmd_list_t adat_cmd_list_get_info = { // -- OPEN ADAT -- -static adat_cmd_list_t adat_cmd_list_open_adat = { +static adat_cmd_list_t adat_cmd_list_open_adat = +{ 8, { &adat_cmd_display_off, @@ -533,7 +564,8 @@ static adat_cmd_list_t adat_cmd_list_open_adat = { // -- CLOSE ADAT -- -static adat_cmd_list_t adat_cmd_list_close_adat = { +static adat_cmd_list_t adat_cmd_list_close_adat = +{ 1, { &adat_cmd_display_on @@ -543,13 +575,15 @@ static adat_cmd_list_t adat_cmd_list_close_adat = { // -- ADAT SPECIAL: RECOVER FROM ERROR -- -static adat_cmd_list_t adat_cmd_list_recover_from_error = { +static adat_cmd_list_t adat_cmd_list_recover_from_error = +{ 1, { &adat_cmd_display_on } }; + // --------------------------------------------------------------------------- // IMPLEMEMTATION // --------------------------------------------------------------------------- @@ -559,7 +593,6 @@ static adat_cmd_list_t adat_cmd_list_recover_from_error = { // http://stackoverflow.com/questions/122616/how-do-i-trim-leading-trailing-whitespace-in-a-standard-way // --------------------------------------------------------------------------- // Status: RELEASED - size_t trimwhitespace(char *out, size_t len, const char *str) { char *end = NULL; @@ -571,17 +604,20 @@ size_t trimwhitespace(char *out, size_t len, const char *str) "*** ADAT: %d %s (%s:%d): ENTRY. In -> \"%s\", %d.\n", gFnLevel, __func__, __FILE__, __LINE__, str, len); - if (len == 0) { + if (len == 0) + { gFnLevel--; return 0; } // Trim leading space - while (isspace((int)*str)) { + while (isspace((int)*str)) + { str++; } - if (*str == 0) { // All spaces? + if (*str == 0) // All spaces? + { out = NULL; gFnLevel--; return 1; @@ -590,7 +626,8 @@ size_t trimwhitespace(char *out, size_t len, const char *str) // Trim trailing space end = (char *)(str + strlen(str) - 1); - while (end > str && isspace((int)*end)) { + while (end > str && isspace((int)*end)) + { *end = '\0'; end--; } @@ -613,11 +650,11 @@ size_t trimwhitespace(char *out, size_t len, const char *str) return out_size; } + // --------------------------------------------------------------------------- // adat_print_cmd // --------------------------------------------------------------------------- // Status: RELEASED - int adat_print_cmd(adat_cmd_def_ptr pCmd) { int nRC = RIG_OK; @@ -643,7 +680,8 @@ int adat_print_cmd(adat_cmd_def_ptr pCmd) "*** -> Command FN Ptr = 0x%08x\n", pCmd->pfCmdFn); - while (nI < pCmd->nNrCmdStrs) { + while (nI < pCmd->nNrCmdStrs) + { rig_debug(RIG_DEBUG_TRACE, "*** -> Command String %d = \"%s\"\n", nI, pCmd->pacCmdStrs[ nI ]); @@ -652,12 +690,12 @@ int adat_print_cmd(adat_cmd_def_ptr pCmd) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %s (%s:%d): EXIT. Return Code = %d\n", - __func__, __FILE__, __LINE__, - nRC); + __func__, __FILE__, __LINE__, nRC); return nRC; } + // --------------------------------------------------------------------------- // adat_parse_freq // --------------------------------------------------------------------------- @@ -666,7 +704,6 @@ int adat_print_cmd(adat_cmd_def_ptr pCmd) // Can be used to parse strings with VFO nr and without VFO nr in it: // "1 123.456kHz" => nMode = ADAT_FREQ_PARSE_MODE_WITH_VFO // "800Hz" => nMode = ADAT_FREQ_PARSE_MODE_WITHOUT_VFO - int adat_parse_freq(char *pcStr, adat_freq_parse_mode_t nMode, int *nVFO, @@ -677,16 +714,17 @@ int adat_parse_freq(char *pcStr, gFnLevel++; rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + gFnLevel, __func__, __FILE__, __LINE__, pcStr); - if (pcStr != NULL) { + if (pcStr != NULL) + { int _nVFO = 0; freq_t _nFreq = 0; char *pcEnd = NULL; - if (nMode == ADAT_FREQ_PARSE_MODE_WITH_VFO) { + if (nMode == ADAT_FREQ_PARSE_MODE_WITH_VFO) + { // Get VFO from response string _nVFO = strtol(pcStr, &pcEnd, 10); @@ -694,12 +732,15 @@ int adat_parse_freq(char *pcStr, // Save VFO *nVFO = _nVFO; - } else { + } + else + { pcEnd = pcStr; } if ((_nVFO != 0) // VFO = 0 -> Current VFO not active. - || (nMode == ADAT_FREQ_PARSE_MODE_WITHOUT_VFO)) { + || (nMode == ADAT_FREQ_PARSE_MODE_WITHOUT_VFO)) + { char acValueBuf[ ADAT_BUFSZ + 1 ]; char acUnitBuf[ ADAT_BUFSZ + 1 ]; int nI = 0; @@ -711,7 +752,8 @@ int adat_parse_freq(char *pcStr, // Get Freq Value from response string while ((isalpha((int)*pcEnd) == 0) - || (*pcEnd == '.')) { + || (*pcEnd == '.')) + { acValueBuf[ nI++ ] = *pcEnd; pcEnd += sizeof(char); } @@ -726,7 +768,8 @@ int adat_parse_freq(char *pcStr, nI = 0; - while (isalpha((int)*pcEnd) != 0) { + while (isalpha((int)*pcEnd) != 0) + { acUnitBuf[ nI++ ] = *pcEnd; pcEnd += sizeof(char); } @@ -739,24 +782,36 @@ int adat_parse_freq(char *pcStr, if (!strncmp(acUnitBuf, ADAT_FREQ_UNIT_HZ, - ADAT_FREQ_UNIT_HZ_LEN)) { + ADAT_FREQ_UNIT_HZ_LEN)) + { _nFreq = Hz(dTmpFreq); - } else { + } + else + { if (!strncmp(acUnitBuf, ADAT_FREQ_UNIT_KHZ, - ADAT_FREQ_UNIT_KHZ_LEN)) { + ADAT_FREQ_UNIT_KHZ_LEN)) + { _nFreq = kHz(dTmpFreq); - } else { + } + else + { if (!strncmp(acUnitBuf, ADAT_FREQ_UNIT_MHZ, - ADAT_FREQ_UNIT_MHZ_LEN)) { + ADAT_FREQ_UNIT_MHZ_LEN)) + { _nFreq = MHz(dTmpFreq); - } else { + } + else + { if (!strncmp(acUnitBuf, ADAT_FREQ_UNIT_GHZ, - ADAT_FREQ_UNIT_GHZ_LEN)) { + ADAT_FREQ_UNIT_GHZ_LEN)) + { _nFreq = GHz(dTmpFreq); - } else { + } + else + { _nFreq = 0; nRC = -RIG_EINVAL; } @@ -769,7 +824,9 @@ int adat_parse_freq(char *pcStr, *nFreq = _nFreq; } - } else { + } + else + { // If input string is NULL set Freq and VFO also to NULL *nFreq = 0; @@ -780,18 +837,17 @@ int adat_parse_freq(char *pcStr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, nVFO = %d, nFreq = %f\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nVFO, *nFreq); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nVFO, *nFreq); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_parse_mode // --------------------------------------------------------------------------- // Status: RELEASED - int adat_parse_mode(char *pcStr, rmode_t *nRIGMode, char *pcADATMode) @@ -802,23 +858,29 @@ int adat_parse_mode(char *pcStr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + gFnLevel, __func__, __FILE__, __LINE__, pcStr); - if (pcStr != NULL) { + if (pcStr != NULL) + { int nI = 0; int nFini = 0; - while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) { + while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) + { if (!strcmp(pcStr, - the_adat_mode_list.adat_modes[ nI ].pcADATModeStr)) { + the_adat_mode_list.adat_modes[ nI ].pcADATModeStr)) + { *nRIGMode = the_adat_mode_list.adat_modes[ nI ].nRIGMode; nFini = 1; // Done. - } else { + } + else + { nI++; } } - } else { + } + else + { // If input string is NULL ... *nRIGMode = RIG_MODE_NONE; @@ -829,18 +891,17 @@ 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, *nRIGMode); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_mode_rnr2anr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_mode_rnr2anr(rmode_t nRIGMode, int *nADATMode) { @@ -852,19 +913,23 @@ int adat_mode_rnr2anr(rmode_t nRIGMode, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGMode); + gFnLevel, __func__, __FILE__, __LINE__, nRIGMode); - while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) { - if (the_adat_mode_list.adat_modes[ nI ].nRIGMode == nRIGMode) { + while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) + { + if (the_adat_mode_list.adat_modes[ nI ].nRIGMode == nRIGMode) + { *nADATMode = the_adat_mode_list.adat_modes[ nI ].nADATMode; nFini = 1; // Done. - } else { + } + else + { nI++; } } - if (nFini == 0) { + if (nFini == 0) + { // No valid Mode given nRC = -RIG_EINVAL; @@ -874,18 +939,17 @@ int adat_mode_rnr2anr(rmode_t nRIGMode, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, ADAT Mode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nADATMode); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nADATMode); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_mode_anr2rnr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_mode_anr2rnr(int nADATMode, rmode_t *nRIGMode) { @@ -897,19 +961,23 @@ int adat_mode_anr2rnr(int nADATMode, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGMode); + gFnLevel, __func__, __FILE__, __LINE__, nRIGMode); - while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) { - if (the_adat_mode_list.adat_modes[ nI ].nADATMode == nADATMode) { + while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) + { + if (the_adat_mode_list.adat_modes[ nI ].nADATMode == nADATMode) + { *nRIGMode = the_adat_mode_list.adat_modes[ nI ].nRIGMode; - nFini = 1; // Done. - } else { + nFini = 1; // Done. + } + else + { nI++; } } - if (nFini == 0) { + if (nFini == 0) + { // No valid Mode given nRC = -RIG_EINVAL; @@ -919,18 +987,17 @@ int adat_mode_anr2rnr(int nADATMode, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, RIG Mode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nRIGMode); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nRIGMode); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_parse_vfo // --------------------------------------------------------------------------- // Status: RELEASED - int adat_parse_vfo(char *pcStr, vfo_t *nRIGVFONr, int *nADATVFONr) @@ -941,28 +1008,35 @@ int adat_parse_vfo(char *pcStr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + gFnLevel, __func__, __FILE__, __LINE__, pcStr); - if (pcStr != NULL) { + if (pcStr != NULL) + { int nI = 0; int nFini = 0; - while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) { + while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) + { if (!strcmp(pcStr, - the_adat_vfo_list.adat_vfos[ nI ].pcADATVFOStr)) { + the_adat_vfo_list.adat_vfos[ nI ].pcADATVFOStr)) + { *nRIGVFONr = the_adat_vfo_list.adat_vfos[ nI ].nRIGVFONr; *nADATVFONr = the_adat_vfo_list.adat_vfos[ nI ].nADATVFONr; - nFini = 1; // Done. - } else { + nFini = 1; // Done. + } + else + { nI++; } } - if (nFini == 0) { + if (nFini == 0) + { nRC = -RIG_EINVAL; } - } else { + } + else + { // If input string is NULL ... *nRIGVFONr = RIG_VFO_NONE; @@ -973,18 +1047,17 @@ int adat_parse_vfo(char *pcStr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, RIG VFO Nr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nRIGVFONr); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nRIGVFONr); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_vfo_rnr2anr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_vfo_rnr2anr(vfo_t nRIGVFONr, int *nADATVFONr) { @@ -996,19 +1069,23 @@ int adat_vfo_rnr2anr(vfo_t nRIGVFONr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGVFONr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGVFONr); + gFnLevel, __func__, __FILE__, __LINE__, nRIGVFONr); - while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) { - if (the_adat_vfo_list.adat_vfos[ nI ].nRIGVFONr == nRIGVFONr) { + while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) + { + if (the_adat_vfo_list.adat_vfos[ nI ].nRIGVFONr == nRIGVFONr) + { *nADATVFONr = the_adat_vfo_list.adat_vfos[ nI ].nADATVFONr; - nFini = 1; // Done. - } else { + nFini = 1; // Done. + } + else + { nI++; } } - if (nFini == 0) { + if (nFini == 0) + { // No valid Mode given nRC = -RIG_EINVAL; @@ -1018,18 +1095,17 @@ int adat_vfo_rnr2anr(vfo_t nRIGVFONr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, ADAT VFO Nr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nADATVFONr); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nADATVFONr); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_vfo_anr2rnr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_vfo_anr2rnr(int nADATVFONr, vfo_t *nRIGVFONr) { @@ -1041,19 +1117,23 @@ int adat_vfo_anr2rnr(int nADATVFONr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: nADATVFONr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nADATVFONr); + gFnLevel, __func__, __FILE__, __LINE__, nADATVFONr); - while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) { - if (the_adat_vfo_list.adat_vfos[ nI ].nADATVFONr == nADATVFONr) { + while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) + { + if (the_adat_vfo_list.adat_vfos[ nI ].nADATVFONr == nADATVFONr) + { *nRIGVFONr = the_adat_vfo_list.adat_vfos[ nI ].nRIGVFONr; nFini = 1; // Done. - } else { + } + else + { nI++; } } - if (nFini == 0) { + if (nFini == 0) + { // No valid ADAT VFO Nr given nRC = -RIG_EINVAL; @@ -1063,18 +1143,17 @@ int adat_vfo_anr2rnr(int nADATVFONr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, RIG VFO Nr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nRIGVFONr); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nRIGVFONr); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_parse_ptt // --------------------------------------------------------------------------- // Status: RELEASED - int adat_parse_ptt(char *pcStr, int *nADATPTTStatus) { @@ -1084,12 +1163,14 @@ int adat_parse_ptt(char *pcStr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + gFnLevel, __func__, __FILE__, __LINE__, pcStr); - if ((pcStr != NULL) && (strlen(pcStr) > 0)) { + if ((pcStr != NULL) && (strlen(pcStr) > 0)) + { *nADATPTTStatus = strtol(pcStr, NULL, 10); - } else { + } + else + { // If input string is NULL ... *nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; @@ -1100,18 +1181,17 @@ int adat_parse_ptt(char *pcStr, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_ptt_rnr2anr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_ptt_rnr2anr(ptt_t nRIGPTTStatus, int *nADATPTTStatus) { @@ -1121,11 +1201,10 @@ int adat_ptt_rnr2anr(ptt_t nRIGPTTStatus, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGPTTStatus = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGPTTStatus); + gFnLevel, __func__, __FILE__, __LINE__, nRIGPTTStatus); - - switch (nRIGPTTStatus) { + switch (nRIGPTTStatus) + { case ADAT_PTT_STATUS_RNR_ON: *nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; break; @@ -1143,18 +1222,17 @@ int adat_ptt_rnr2anr(ptt_t nRIGPTTStatus, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, ADAT PTT Status = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nADATPTTStatus); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nADATPTTStatus); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_ptt_anr2rnr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_ptt_anr2rnr(int nADATPTTStatus, ptt_t *nRIGPTTStatus) { @@ -1164,10 +1242,10 @@ int adat_ptt_anr2rnr(int nADATPTTStatus, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: nADATPTTStatus = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nADATPTTStatus); + gFnLevel, __func__, __FILE__, __LINE__, nADATPTTStatus); - switch (nADATPTTStatus) { + switch (nADATPTTStatus) + { case ADAT_PTT_STATUS_ANR_ON: *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_ON; break; @@ -1185,18 +1263,17 @@ int adat_ptt_anr2rnr(int nADATPTTStatus, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, RIG PTT Status = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nRIGPTTStatus); + gFnLevel, __func__, __FILE__, __LINE__, nRC, *nRIGPTTStatus); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_send // --------------------------------------------------------------------------- // Status: RELEASED - int adat_send(RIG *pRig, char *pcData) { @@ -1207,8 +1284,7 @@ int adat_send(RIG *pRig, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcData = %s\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig, pcData); + gFnLevel, __func__, __FILE__, __LINE__, pRig, pcData); serial_flush(&pRigState->rigport); @@ -1216,19 +1292,18 @@ int adat_send(RIG *pRig, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_receive // --------------------------------------------------------------------------- // Status: RELEASED - int adat_receive(RIG *pRig, char *pcData) { @@ -1239,30 +1314,29 @@ int adat_receive(RIG *pRig, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); nRC = read_string(&pRigState->rigport, pcData, ADAT_RESPSZ, ADAT_EOL, 1); - if (nRC > 0) { + if (nRC > 0) + { nRC = RIG_OK; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_priv_set_cmd // --------------------------------------------------------------------------- // Status: RELEASED - int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind) { int nRC = RIG_OK; @@ -1271,15 +1345,18 @@ int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcCmd = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig, pcCmd); + gFnLevel, __func__, __FILE__, __LINE__, pRig, pcCmd); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - if (pPriv->pcCmd != NULL) { + if (pPriv->pcCmd != NULL) + { free(pPriv->pcCmd); } @@ -1291,19 +1368,18 @@ int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_priv_set_result // --------------------------------------------------------------------------- // Status: RELEASED - int adat_priv_set_result(RIG *pRig, char *pcResult) { int nRC = RIG_OK; @@ -1312,15 +1388,18 @@ int adat_priv_set_result(RIG *pRig, char *pcResult) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcResult = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig, pcResult); + gFnLevel, __func__, __FILE__, __LINE__, pRig, pcResult); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - if (pPriv->pcResult != NULL) { + if (pPriv->pcResult != NULL) + { free(pPriv->pcResult); } @@ -1335,19 +1414,18 @@ int adat_priv_set_result(RIG *pRig, char *pcResult) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_priv_clear_result // --------------------------------------------------------------------------- // Status: RELEASED - int adat_priv_clear_result(RIG *pRig) { int nRC = RIG_OK; @@ -1356,15 +1434,18 @@ int adat_priv_clear_result(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - if (pPriv->pcResult != NULL) { + if (pPriv->pcResult != NULL) + { free(pPriv->pcResult); } @@ -1375,19 +1456,18 @@ int adat_priv_clear_result(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_get_single_cmd_result // --------------------------------------------------------------------------- // Status: RELEASED - int adat_get_single_cmd_result(RIG *pRig) { int nRC = RIG_OK; @@ -1396,19 +1476,22 @@ int adat_get_single_cmd_result(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; struct rig_state *pRigState = &pRig->state; nRC = adat_send(pRig, pPriv->pcCmd); if ((nRC == RIG_OK) - && (pPriv->nCmdKind == ADAT_CMD_KIND_WITH_RESULT)) { + && (pPriv->nCmdKind == ADAT_CMD_KIND_WITH_RESULT)) + { char acBuf[ ADAT_RESPSZ + 1 ]; char acBuf2[ ADAT_RESPSZ + 1 ]; @@ -1428,33 +1511,37 @@ int adat_get_single_cmd_result(RIG *pRig) pcPos = acBuf; - if ((nRC == RIG_OK) && (pcPos != NULL)) { + if ((nRC == RIG_OK) && (pcPos != NULL)) + { int nLength = 0; - if (*pcPos == '\0') { // Adjust for 00 byte at beginning ... - pcPos++; // No, please don't ask me why this + if (*pcPos == '\0') // Adjust for 00 byte at beginning ... + { + pcPos++; // No, please don't ask me why this happens ... ;-) } - // happens ... ;-) - nBufLength = strlen(pcPos); pcBufEnd = pcPos + nBufLength - 1; pcResult = pcPos; // Save position - if (pcPos < pcBufEnd) { + if (pcPos < pcBufEnd) + { nLength = strlen(pcPos); - if (nLength > 0) { + if (nLength > 0) + { char *pcPos2 = strchr(pcPos, (char) 0x0d); - if (pcPos2 != NULL) { + if (pcPos2 != NULL) + { *pcPos2 = '\0'; // Truncate \0d\0a } pcPos = strchr(pcPos, ' '); - if ((pcPos != NULL) && (pcPos < pcBufEnd)) { + if ((pcPos != NULL) && (pcPos < pcBufEnd)) + { pcPos += sizeof(char); rig_debug(RIG_DEBUG_TRACE, @@ -1476,16 +1563,23 @@ int adat_get_single_cmd_result(RIG *pRig) trimwhitespace(acBuf2, strlen(pcPos), pcPos); pcResult = acBuf2; } - } else { + } + else + { nRC = -RIG_EINVAL; } - } else { + } + else + { nRC = -RIG_EINVAL; } - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { adat_priv_set_result(pRig, pcResult); - } else { + } + else + { adat_priv_clear_result(pRig); } } @@ -1500,19 +1594,18 @@ int adat_get_single_cmd_result(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_recover_from_error // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_recover_from_error(RIG *pRig, int nError) { int nRC = RIG_OK; @@ -1521,19 +1614,22 @@ int adat_cmd_recover_from_error(RIG *pRig, int nError) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; // Recover from communication error if ((nError == RIG_ETIMEOUT) || (nError == RIG_EPROTO) - || (nError == RIG_EIO)) { + || (nError == RIG_EIO)) + { rig_close(pRig); sleep(ADAT_SLEEP_AFTER_RIG_CLOSE); @@ -1554,19 +1650,18 @@ int adat_cmd_recover_from_error(RIG *pRig, int nError) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_callsign // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_callsign(RIG *pRig) { int nRC = RIG_OK; @@ -1575,22 +1670,26 @@ int adat_cmd_fn_get_callsign(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_CALLSIGN, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcCallsign = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1604,19 +1703,18 @@ int adat_cmd_fn_get_callsign(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_set_callsign // --------------------------------------------------------------------------- // Status: IN WORK - int adat_cmd_fn_set_callsign(RIG *pRig) { int nRC = RIG_OK; @@ -1625,12 +1723,14 @@ int adat_cmd_fn_set_callsign(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { char acBuf[ ADAT_BUFSZ + 1 ]; memset(acBuf, 0, ADAT_BUFSZ + 1); @@ -1641,7 +1741,8 @@ int adat_cmd_fn_set_callsign(RIG *pRig) nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); } } @@ -1650,8 +1751,7 @@ int adat_cmd_fn_set_callsign(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; @@ -1663,7 +1763,6 @@ int adat_cmd_fn_set_callsign(RIG *pRig) // adat_cmd_fn_get_serial_nr // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_serial_nr(RIG *pRig) { int nRC = RIG_OK; @@ -1672,22 +1771,26 @@ int adat_cmd_fn_get_serial_nr(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_SERIAL_NR, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcSerialNr = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1701,18 +1804,17 @@ int adat_cmd_fn_get_serial_nr(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_fw_version // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_fw_version(RIG *pRig) { int nRC = RIG_OK; @@ -1721,22 +1823,26 @@ int adat_cmd_fn_get_fw_version(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_FW_VERSION, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcFWVersion = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1750,19 +1856,18 @@ int adat_cmd_fn_get_fw_version(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_hw_version // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_hw_version(RIG *pRig) { int nRC = RIG_OK; @@ -1771,22 +1876,26 @@ int adat_cmd_fn_get_hw_version(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_HW_VERSION, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcHWVersion = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1800,18 +1909,17 @@ int adat_cmd_fn_get_hw_version(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_gui_fw_version // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_gui_fw_version(RIG *pRig) { int nRC = RIG_OK; @@ -1820,22 +1928,26 @@ int adat_cmd_fn_get_gui_fw_version(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_GUI_FW_VERSION, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcGUIFWVersion = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1849,19 +1961,18 @@ int adat_cmd_fn_get_gui_fw_version(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_id_code // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_id_code(RIG *pRig) { int nRC = RIG_OK; @@ -1870,22 +1981,26 @@ int adat_cmd_fn_get_id_code(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_ID_CODE, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcIDCode = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1899,18 +2014,17 @@ int adat_cmd_fn_get_id_code(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_options // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_options(RIG *pRig) { int nRC = RIG_OK; @@ -1919,22 +2033,26 @@ int adat_cmd_fn_get_options(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_OPTIONS, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { pPriv->pcOptions = strdup(pPriv->pcResult); rig_debug(RIG_DEBUG_TRACE, @@ -1948,18 +2066,17 @@ int adat_cmd_fn_get_options(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_mode // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_mode(RIG *pRig) { int nRC = RIG_OK; @@ -1968,22 +2085,26 @@ int adat_cmd_fn_get_mode(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_MODE, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_parse_mode(pPriv->pcResult, &(pPriv->nRIGMode), pPriv->acADATMode); @@ -1995,18 +2116,17 @@ int adat_cmd_fn_get_mode(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_set_mode // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_set_mode(RIG *pRig) { int nRC = RIG_OK; @@ -2015,19 +2135,22 @@ int adat_cmd_fn_set_mode(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; // Translate Mode from RIG Mode Nr to ADAT Mode Nr nRC = adat_mode_rnr2anr(pPriv->nRIGMode, &(pPriv->nADATMode)); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { // Prepare Command char acBuf[ ADAT_BUFSZ + 1 ]; @@ -2043,7 +2166,8 @@ int adat_cmd_fn_set_mode(RIG *pRig) // Execute Command - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); } } @@ -2053,19 +2177,18 @@ int adat_cmd_fn_set_mode(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_freq // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_freq(RIG *pRig) { int nRC = RIG_OK; @@ -2074,22 +2197,26 @@ int adat_cmd_fn_get_freq(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_FREQ, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_parse_freq(pPriv->pcResult, ADAT_FREQ_PARSE_MODE_WITH_VFO, &(pPriv->nCurrentVFO), @@ -2099,7 +2226,8 @@ int adat_cmd_fn_get_freq(RIG *pRig) "*** ADAT: %d pPriv->nCurrentVFO = %d, Freq [Hz] = %f\n", gFnLevel, pPriv->nCurrentVFO, pPriv->nFreq); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_vfo_anr2rnr(pPriv->nCurrentVFO, &(pPriv->nRIGVFONr)); } @@ -2111,18 +2239,17 @@ int adat_cmd_fn_get_freq(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_set_freq // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_set_freq(RIG *pRig) { int nRC = RIG_OK; @@ -2131,12 +2258,14 @@ int adat_cmd_fn_set_freq(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; char acBuf[ ADAT_BUFSZ + 1 ]; @@ -2151,7 +2280,8 @@ int adat_cmd_fn_set_freq(RIG *pRig) nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); } } @@ -2160,13 +2290,13 @@ int adat_cmd_fn_set_freq(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_set_vfo // --------------------------------------------------------------------------- @@ -2175,7 +2305,6 @@ int adat_cmd_fn_set_freq(RIG *pRig) // Setting a VFO on an ADAT is actually two steps: // 1. Switching on that VFO // 2. Setting this VFO as the main VFO - int adat_cmd_fn_set_vfo(RIG *pRig) { int nRC = RIG_OK; @@ -2184,12 +2313,14 @@ int adat_cmd_fn_set_vfo(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; char acBuf[ ADAT_BUFSZ + 1 ]; @@ -2203,10 +2334,12 @@ int adat_cmd_fn_set_vfo(RIG *pRig) nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { memset(acBuf, 0, ADAT_BUFSZ + 1); snprintf(acBuf, ADAT_BUFSZ, ADAT_CMD_DEF_STRING_SET_VFO_AS_MAIN_VFO, @@ -2216,7 +2349,8 @@ int adat_cmd_fn_set_vfo(RIG *pRig) nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); } } @@ -2227,18 +2361,17 @@ int adat_cmd_fn_set_vfo(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_get_ptt // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_get_ptt(RIG *pRig) { int nRC = RIG_OK; @@ -2247,26 +2380,31 @@ int adat_cmd_fn_get_ptt(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_priv_set_cmd(pRig, ADAT_CMD_DEF_STRING_GET_PTT, ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_parse_ptt(pPriv->pcResult, &(pPriv->nADATPTTStatus)); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_ptt_anr2rnr(pPriv->nADATPTTStatus, &(pPriv->nRIGPTTStatus)); } @@ -2278,18 +2416,17 @@ int adat_cmd_fn_get_ptt(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_cmd_fn_set_ptt // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cmd_fn_set_ptt(RIG *pRig) { int nRC = RIG_OK; @@ -2298,12 +2435,14 @@ int adat_cmd_fn_set_ptt(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; char acBuf[ ADAT_BUFSZ + 1 ]; char *pcPTTStr = NULL; @@ -2312,7 +2451,8 @@ int adat_cmd_fn_set_ptt(RIG *pRig) // Switch PTT - switch (pPriv->nOpCode) { + switch (pPriv->nOpCode) + { case ADAT_OPCODE_PTT_SWITCH_ON: pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; @@ -2333,14 +2473,16 @@ int adat_cmd_fn_set_ptt(RIG *pRig) break; } - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { snprintf(acBuf, ADAT_BUFSZ, ADAT_CMD_DEF_STRING_SET_PTT, pcPTTStr, ADAT_EOM); nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_get_single_cmd_result(pRig); } } @@ -2350,15 +2492,13 @@ int adat_cmd_fn_set_ptt(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } - // --------------------------------------------------------------------------- // adat_transaction // --------------------------------------------------------------------------- @@ -2366,7 +2506,6 @@ int adat_cmd_fn_set_ptt(RIG *pRig) // adat_transaction is a generalized command processor able to execute // commands of type adat_cmd_def_t . - int adat_transaction(RIG *pRig, adat_cmd_list_ptr pCmdList) { @@ -2377,26 +2516,29 @@ int adat_transaction(RIG *pRig, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { int nI = 0; adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): Nr of commands = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - pCmdList->nNrCmds); + gFnLevel, __func__, __FILE__, __LINE__, pCmdList->nNrCmds); - while ((nRC == RIG_OK) && (nFini == 0) && (nI < pCmdList->nNrCmds)) { + while ((nRC == RIG_OK) && (nFini == 0) && (nI < pCmdList->nNrCmds)) + { adat_cmd_def_ptr pCmd = NULL; pCmd = pCmdList->adat_cmds[ nI ]; - if ((pCmd != NULL) && (pCmd->nCmdId != ADAT_CMD_DEF_NIL)) { + if ((pCmd != NULL) && (pCmd->nCmdId != ADAT_CMD_DEF_NIL)) + { rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d About to execute ADAT Command ... \n", @@ -2405,12 +2547,15 @@ int adat_transaction(RIG *pRig, // Execute Command - if (pCmd->pfCmdFn != NULL) { + if (pCmd->pfCmdFn != NULL) + { rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d Calling function via fn ptr ... \n", gFnLevel); nRC = pCmd->pfCmdFn(pRig); - } else { + } + else + { rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d Sending command string ... \n", gFnLevel); @@ -2419,19 +2564,23 @@ int adat_transaction(RIG *pRig, // { int nJ = 0; - if (pCmd->nNrCmdStrs > 0) { + if (pCmd->nNrCmdStrs > 0) + { rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d pacCmdStrs[%d] = %s\n", gFnLevel, nJ, pCmd->pacCmdStrs[ nJ ]); while ((nJ < pCmd->nNrCmdStrs) && (nRC == RIG_OK) - && (pCmd->pacCmdStrs[ nJ ] != NULL)) { + && (pCmd->pacCmdStrs[ nJ ] != NULL)) + { nRC = adat_send(pRig, pCmd->pacCmdStrs[ nJ ]); - if (nRC == RIG_OK) { - if (pCmd->nCmdKind == ADAT_CMD_KIND_WITH_RESULT) { + if (nRC == RIG_OK) + { + if (pCmd->nCmdKind == ADAT_CMD_KIND_WITH_RESULT) + { char acBuf[ ADAT_RESPSZ + 1 ]; memset(acBuf, 0, ADAT_RESPSZ + 1); @@ -2440,7 +2589,8 @@ int adat_transaction(RIG *pRig, while ((nRC == RIG_OK) && (strncmp(acBuf, ADAT_BOM, - strlen(ADAT_BOM)) != 0)) { + strlen(ADAT_BOM)) != 0)) + { nRC = adat_receive(pRig, acBuf); } @@ -2456,12 +2606,15 @@ int adat_transaction(RIG *pRig, // } } - if (nRC != RIG_OK) { + if (nRC != RIG_OK) + { (void) adat_cmd_recover_from_error(pRig, nRC); } nI++; - } else { + } + else + { nFini = 1; } @@ -2475,18 +2628,17 @@ int adat_transaction(RIG *pRig, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // adat_new_priv_data // --------------------------------------------------------------------------- // Status: RELEASED - adat_priv_data_ptr adat_new_priv_data(RIG *pRig) { int nRC = 0; @@ -2496,15 +2648,16 @@ adat_priv_data_ptr adat_new_priv_data(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig != NULL) { + if (pRig != NULL) + { // Init Priv Data pPriv = (adat_priv_data_ptr) calloc(sizeof(adat_priv_data_t), 1); - if (pPriv != NULL) { + if (pPriv != NULL) + { char acBuf[ ADAT_BUFSZ + 1 ]; memset(acBuf, 0, ADAT_BUFSZ + 1); @@ -2512,7 +2665,8 @@ adat_priv_data_ptr adat_new_priv_data(RIG *pRig) #if 0 nRC = adat_get_conf(pRig, TOKEN_ADAT_PRODUCT_NAME, acBuf); - if (nRC == 0) { + if (nRC == 0) + { pPriv->pcProductName = strdup(acBuf); pRig->state.priv = (void *) pPriv; @@ -2521,27 +2675,30 @@ adat_priv_data_ptr adat_new_priv_data(RIG *pRig) #else pRig->state.priv = (void *) pPriv; #endif - } else { + } + else + { nRC = -RIG_ENOMEM; } - } else { + } + else + { nRC = -RIG_EARG; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. RC = %d, pPriv = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, pPriv); + gFnLevel, __func__, __FILE__, __LINE__, nRC, pPriv); gFnLevel--; return pPriv; } + // --------------------------------------------------------------------------- // adat_del_priv_data // --------------------------------------------------------------------------- // Status: RELEASED - void adat_del_priv_data(adat_priv_data_t **ppPriv) { int nRC = 0; @@ -2550,41 +2707,49 @@ void adat_del_priv_data(adat_priv_data_t **ppPriv) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: ppPrivData = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - ppPriv); + gFnLevel, __func__, __FILE__, __LINE__, ppPriv); - if ((ppPriv != NULL) && (*ppPriv != NULL)) { + if ((ppPriv != NULL) && (*ppPriv != NULL)) + { // Delete / Free Priv Data - if ((*ppPriv)->pcProductName != NULL) { + if ((*ppPriv)->pcProductName != NULL) + { free((*ppPriv)->pcProductName); } - if ((*ppPriv)->pcSerialNr != NULL) { + if ((*ppPriv)->pcSerialNr != NULL) + { free((*ppPriv)->pcSerialNr); } - if ((*ppPriv)->pcHWVersion != NULL) { + if ((*ppPriv)->pcHWVersion != NULL) + { free((*ppPriv)->pcHWVersion); } - if ((*ppPriv)->pcFWVersion != NULL) { + if ((*ppPriv)->pcFWVersion != NULL) + { free((*ppPriv)->pcFWVersion); } - if ((*ppPriv)->pcGUIFWVersion != NULL) { + if ((*ppPriv)->pcGUIFWVersion != NULL) + { free((*ppPriv)->pcGUIFWVersion); } - if ((*ppPriv)->pcOptions != NULL) { + if ((*ppPriv)->pcOptions != NULL) + { free((*ppPriv)->pcOptions); } - if ((*ppPriv)->pcIDCode != NULL) { + if ((*ppPriv)->pcIDCode != NULL) + { free((*ppPriv)->pcIDCode); } - if ((*ppPriv)->pcCallsign != NULL) { + if ((*ppPriv)->pcCallsign != NULL) + { free((*ppPriv)->pcCallsign); } @@ -2592,24 +2757,25 @@ void adat_del_priv_data(adat_priv_data_t **ppPriv) free((*ppPriv)); *ppPriv = NULL; - } else { + } + else + { nRC = -RIG_EARG; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. RC = %d.\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return; -}; +} + // --------------------------------------------------------------------------- // Function adat_init // --------------------------------------------------------------------------- // Status: RELEASED - int adat_init(RIG *pRig) { int nRC = RIG_OK; @@ -2618,21 +2784,24 @@ int adat_init(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = NULL; // Get new Priv Data pPriv = adat_new_priv_data(pRig); - if (pPriv == NULL) { + if (pPriv == NULL) + { nRC = -RIG_ENOMEM; } } @@ -2641,18 +2810,17 @@ int adat_init(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_cleanup // --------------------------------------------------------------------------- // Status: RELEASED - int adat_cleanup(RIG *pRig) { int nRC = RIG_OK; @@ -2661,13 +2829,16 @@ int adat_cleanup(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { - if (pRig->state.priv != NULL) { + } + else + { + if (pRig->state.priv != NULL) + { adat_del_priv_data((adat_priv_data_t **) & (pRig->state.priv)); pRig->state.priv = NULL; } @@ -2675,18 +2846,17 @@ int adat_cleanup(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_open // --------------------------------------------------------------------------- // Status: RELEASED - int adat_open(RIG *pRig) { int nRC = RIG_OK; @@ -2695,14 +2865,16 @@ int adat_open(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { // grace period for the radio to be there sleep(ADAT_SLEEP_AFTER_RIG_OPEN); @@ -2716,18 +2888,17 @@ int adat_open(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_close // --------------------------------------------------------------------------- // Status: RELEASED - int adat_close(RIG *pRig) { int nRC = RIG_OK; @@ -2736,14 +2907,16 @@ int adat_close(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { // Now switch to interactive mode nRC = adat_transaction(pRig, &adat_cmd_list_close_adat); @@ -2753,19 +2926,18 @@ int adat_close(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_info // --------------------------------------------------------------------------- // Status: RELEASED - -const char *adat_get_info(RIG *pRig) +const char * adat_get_info(RIG *pRig) { int nRC = RIG_OK; static char acBuf[ 512 ]; @@ -2774,15 +2946,16 @@ const char *adat_get_info(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); memset(acBuf, 0, 512); - if (pRig != NULL) { + if (pRig != NULL) + { nRC = adat_transaction(pRig, &adat_cmd_list_get_info); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; snprintf(acBuf, 512, @@ -2799,18 +2972,17 @@ const char *adat_get_info(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Value ='%s'\n", - gFnLevel, __func__, __FILE__, __LINE__, - acBuf); + gFnLevel, __func__, __FILE__, __LINE__, acBuf); gFnLevel--; return acBuf; } + // --------------------------------------------------------------------------- // Function adat_set_freq // --------------------------------------------------------------------------- // Status: RELEASED - int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq) { int nRC = RIG_OK; @@ -2819,14 +2991,16 @@ int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; pPriv->nFreq = freq; @@ -2836,18 +3010,17 @@ int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_freq // --------------------------------------------------------------------------- // Status: RELEASED - int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq) { int nRC = RIG_OK; @@ -2856,14 +3029,16 @@ int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_transaction(pRig, &adat_cmd_list_get_freq); @@ -2873,18 +3048,17 @@ int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_set_level // --------------------------------------------------------------------------- // Status: IN WORK - int adat_set_level(RIG *pRig, vfo_t vfo, setting_t level, value_t val) { int nRC = RIG_OK; @@ -2893,32 +3067,33 @@ int adat_set_level(RIG *pRig, vfo_t vfo, setting_t level, value_t val) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_level // --------------------------------------------------------------------------- // Status: IN WORK - int adat_get_level(RIG *pRig, vfo_t vfo, setting_t level, value_t *val) { int nRC = RIG_OK; @@ -2927,32 +3102,33 @@ int adat_get_level(RIG *pRig, vfo_t vfo, setting_t level, value_t *val) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_set_mode // --------------------------------------------------------------------------- // Status: RELEASED - int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width) { int nRC = RIG_OK; @@ -2961,21 +3137,25 @@ int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; pPriv->nRIGMode = mode; nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO)); - if (width != RIG_PASSBAND_NOCHANGE) { - if (width == RIG_PASSBAND_NORMAL) { + if (width != RIG_PASSBAND_NOCHANGE) + { + if (width == RIG_PASSBAND_NORMAL) + { width = rig_passband_normal(pRig, mode); } @@ -2987,18 +3167,17 @@ int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_mode // --------------------------------------------------------------------------- // Status: RELEASED - int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { int nRC = RIG_OK; @@ -3007,19 +3186,22 @@ int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_transaction(pRig, &adat_cmd_list_get_mode); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { *mode = pPriv->nRIGMode; *width = pPriv->nWidth; } @@ -3027,18 +3209,17 @@ int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_vfo // --------------------------------------------------------------------------- // Status: RELEASED - int adat_get_vfo(RIG *pRig, vfo_t *vfo) { int nRC = RIG_OK; @@ -3047,14 +3228,16 @@ int adat_get_vfo(RIG *pRig, vfo_t *vfo) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_transaction(pRig, &adat_cmd_list_get_vfo); @@ -3064,18 +3247,17 @@ int adat_get_vfo(RIG *pRig, vfo_t *vfo) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_set_vfo // --------------------------------------------------------------------------- // Status: RELEASED - int adat_set_vfo(RIG *pRig, vfo_t vfo) { int nRC = RIG_OK; @@ -3084,37 +3266,39 @@ int adat_set_vfo(RIG *pRig, vfo_t vfo) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO)); - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_transaction(pRig, &adat_cmd_list_set_vfo); } } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_ptt // --------------------------------------------------------------------------- // Status: RELEASED - int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt) { int nRC = RIG_OK; @@ -3123,14 +3307,16 @@ int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_transaction(pRig, &adat_cmd_list_get_ptt); @@ -3140,18 +3326,17 @@ int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_set_ptt // --------------------------------------------------------------------------- // Status: RELEASED - int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt) { int nRC = RIG_OK; @@ -3160,17 +3345,20 @@ int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - switch (ptt) { + switch (ptt) + { case RIG_PTT_ON: pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_ON; break; @@ -3184,27 +3372,30 @@ int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt) break; } - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { nRC = adat_transaction(pRig, &adat_cmd_list_set_ptt); } } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_power2mW // --------------------------------------------------------------------------- // Status: RELEASED - -int adat_power2mW(RIG *pRig, unsigned int *mwpower, float power, - freq_t freq, rmode_t mode) +int adat_power2mW(RIG *pRig, + unsigned int *mwpower, + float power, + freq_t freq, + rmode_t mode) { int nRC = RIG_OK; @@ -3212,33 +3403,37 @@ int adat_power2mW(RIG *pRig, unsigned int *mwpower, float power, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if ((pRig == NULL) || (mwpower == NULL)) { + if ((pRig == NULL) || (mwpower == NULL)) + { nRC = -RIG_EARG; - } else { + } + else + { *mwpower = power * ADAT_MAX_POWER_IN_mW; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_mW2power // --------------------------------------------------------------------------- // Status: RELEASED - -int adat_mW2power(RIG *pRig, float *power, unsigned int mwpower, - freq_t freq, rmode_t mode) +int adat_mW2power(RIG *pRig, + float *power, + unsigned int mwpower, + freq_t freq, + rmode_t mode) { int nRC = RIG_OK; @@ -3246,31 +3441,32 @@ int adat_mW2power(RIG *pRig, float *power, unsigned int mwpower, rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if ((pRig == NULL) || (power == NULL)) { + if ((pRig == NULL) || (power == NULL)) + { nRC = -RIG_EARG; - } else { + } + else + { *power = mwpower / ((float)ADAT_MAX_POWER_IN_mW); } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_powerstat // --------------------------------------------------------------------------- // Status: RELEASED - int adat_get_powerstat(RIG *pRig, powerstat_t *status) { int nRC = RIG_OK; @@ -3279,23 +3475,28 @@ int adat_get_powerstat(RIG *pRig, powerstat_t *status) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; nRC = adat_transaction(pRig, &adat_cmd_list_get_powerstatus); // nRC < 0 -> Power is off. - if (nRC == RIG_OK) { + if (nRC == RIG_OK) + { *status = RIG_POWER_ON; - } else { + } + else + { *status = RIG_POWER_OFF; nRC = RIG_OK; } @@ -3303,8 +3504,7 @@ int adat_get_powerstat(RIG *pRig, powerstat_t *status) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; @@ -3315,7 +3515,6 @@ int adat_get_powerstat(RIG *pRig, powerstat_t *status) // Function adat_set_conf // --------------------------------------------------------------------------- // Status: IN WORK - int adat_set_conf(RIG *pRig, token_t token, const char *val) { int nRC = RIG_OK; @@ -3324,17 +3523,20 @@ int adat_set_conf(RIG *pRig, token_t token, const char *val) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - switch (token) { + switch (token) + { case TOKEN_ADAT_PRODUCT_NAME: pPriv->pcProductName = strdup(val); break; @@ -3346,18 +3548,17 @@ int adat_set_conf(RIG *pRig, token_t token, const char *val) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_get_conf // --------------------------------------------------------------------------- // Status: IN WORK - int adat_get_conf(RIG *pRig, token_t token, char *val) { int nRC = RIG_OK; @@ -3366,17 +3567,20 @@ int adat_get_conf(RIG *pRig, token_t token, char *val) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - switch (token) { + switch (token) + { case TOKEN_ADAT_PRODUCT_NAME: val = pPriv->pcProductName; break; @@ -3388,18 +3592,17 @@ int adat_get_conf(RIG *pRig, token_t token, char *val) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_reset // --------------------------------------------------------------------------- // Status: IN WORK - int adat_reset(RIG *pRig, reset_t reset) { int nRC = RIG_OK; @@ -3408,32 +3611,33 @@ int adat_reset(RIG *pRig, reset_t reset) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; } rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // Function adat_handle_event // --------------------------------------------------------------------------- // Status: IN WORK - int adat_handle_event(RIG *pRig) { int nRC = RIG_OK; @@ -3442,14 +3646,16 @@ int adat_handle_event(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + gFnLevel, __func__, __FILE__, __LINE__, pRig); // Check Params - if (pRig == NULL) { + if (pRig == NULL) + { nRC = -RIG_EARG; - } else { + } + else + { //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; char acBuf[ ADAT_RESPSZ + 1 ]; @@ -3463,8 +3669,7 @@ int adat_handle_event(RIG *pRig) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; @@ -3475,7 +3680,6 @@ int adat_handle_event(RIG *pRig) // initrigs_adat is called by rig_backend_load // --------------------------------------------------------------------------- // Status: RELEASED - DECLARE_INITRIG_BACKEND(adat) { int nRC = RIG_OK; @@ -3494,19 +3698,18 @@ DECLARE_INITRIG_BACKEND(adat) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); #endif gFnLevel--; return nRC; } + // --------------------------------------------------------------------------- // proberig_adat // --------------------------------------------------------------------------- // Status: UNTESTED - DECLARE_PROBERIG_BACKEND(adat) { int nRC = RIG_OK; @@ -3517,11 +3720,13 @@ DECLARE_PROBERIG_BACKEND(adat) "*** ADAT: %d %s (%s:%d): ENTRY.\n", gFnLevel, __func__, __FILE__, __LINE__); - if (!port) { + if (!port) + { return RIG_MODEL_NONE; } - if (port->type.rig != RIG_PORT_SERIAL) { + if (port->type.rig != RIG_PORT_SERIAL) + { return RIG_MODEL_NONE; } @@ -3532,9 +3737,12 @@ DECLARE_PROBERIG_BACKEND(adat) nRC = serial_open(port); - if (nRC != RIG_OK) { + if (nRC != RIG_OK) + { nRC = RIG_MODEL_NONE; - } else { + } + else + { char acBuf[ ADAT_RESPSZ + 1 ]; int nRead = 0; @@ -3546,9 +3754,12 @@ DECLARE_PROBERIG_BACKEND(adat) nRead = read_string(port, acBuf, ADAT_RESPSZ, ADAT_EOM, 1); close(port->fd); - if ((nRC != RIG_OK || nRead < 0)) { + if ((nRC != RIG_OK || nRead < 0)) + { nRC = RIG_MODEL_NONE; - } else { + } + else + { rig_debug(RIG_DEBUG_VERBOSE, "ADAT: %d Received ID = %s.", gFnLevel, acBuf); @@ -3558,8 +3769,7 @@ DECLARE_PROBERIG_BACKEND(adat) rig_debug(RIG_DEBUG_TRACE, "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + gFnLevel, __func__, __FILE__, __LINE__, nRC); gFnLevel--; return nRC; diff --git a/adat/adat.h b/adat/adat.h index 6df5d09bc..842060406 100644 --- a/adat/adat.h +++ b/adat/adat.h @@ -329,7 +329,8 @@ // ADAT PRIVATE DATA // --------------------------------------------------------------------------- -typedef struct _adat_priv_data { +typedef struct _adat_priv_data +{ int nOpCode; char *pcProductName; // Future use (USB direct I/O) @@ -397,14 +398,16 @@ typedef unsigned long long adat_cmd_id_t; // Bit mask for commands. Each command // executed by adat_transaction(). The last value as returned by the // commands will be set as overall command result. -typedef enum { +typedef enum +{ ADAT_CMD_KIND_WITH_RESULT = 0, // After sending a command to the ADAT, // a result has to be read. ADAT_CMD_KIND_WITHOUT_RESULT = 1 } adat_cmd_kind_t; -typedef struct _adat_cmd_def_t { +typedef struct _adat_cmd_def_t +{ adat_cmd_id_t nCmdId; // Bit indicating this cmd adat_cmd_kind_t nCmdKind; // Defines if result expected @@ -417,14 +420,16 @@ typedef struct _adat_cmd_def_t { } adat_cmd_def_t, * adat_cmd_def_ptr; -typedef struct _adat_cmd_table_t { +typedef struct _adat_cmd_table_t +{ int nNrCmds; adat_cmd_def_ptr adat_cmds[]; } adat_cmd_table_t, * adat_cmd_table_ptr; -typedef struct _adat_cmd_list_t { +typedef struct _adat_cmd_list_t +{ int nNrCmds; adat_cmd_def_ptr adat_cmds[]; @@ -435,7 +440,8 @@ typedef struct _adat_cmd_list_t { // OTHER ADAT DATA TYPES // --------------------------------------------------------------------------- -typedef enum { +typedef enum +{ ADAT_FREQ_PARSE_MODE_WITH_VFO = 0, ADAT_FREQ_PARSE_MODE_WITHOUT_VFO = 1 @@ -443,7 +449,8 @@ typedef enum { // ADAT MODE DEFINITION -typedef struct _adat_mode_def { +typedef struct _adat_mode_def +{ char *pcADATModeStr; rmode_t nRIGMode; int nADATMode; @@ -451,7 +458,8 @@ typedef struct _adat_mode_def { } adat_mode_def_t, * adat_mode_def_ptr; -typedef struct _adat_mode_list { +typedef struct _adat_mode_list +{ int nNrModes; adat_mode_def_t adat_modes[ ADAT_NR_MODES ]; @@ -461,7 +469,8 @@ typedef struct _adat_mode_list { // ADAT VFO DEFINITION -typedef struct _adat_vfo_def { +typedef struct _adat_vfo_def +{ char *pcADATVFOStr; vfo_t nRIGVFONr; int nADATVFONr; @@ -469,7 +478,8 @@ typedef struct _adat_vfo_def { } adat_vfo_def_t, * adat_vfo_def_ptr; -typedef struct _adat_vfo_list { +typedef struct _adat_vfo_list +{ int nNrVFOs; adat_vfo_def_t adat_vfos[ ADAT_NR_VFOS ]; diff --git a/adat/adt_200a.c b/adat/adt_200a.c index da5d02abf..635f0b513 100644 --- a/adat/adt_200a.c +++ b/adat/adt_200a.c @@ -53,7 +53,8 @@ // ADT-200A HAMLIB CAPS / DESCRIPTION // --------------------------------------------------------------------------- -const struct rig_caps adt_200a_caps = { +const struct rig_caps adt_200a_caps = +{ .rig_model = RIG_MODEL_ADT_200A, .model_name = "ADT-200A", .mfg_name = "ADAT www.adat.ch", diff --git a/adat/adt_200a.h b/adat/adt_200a.h index 403fc8f50..cb0270e6f 100644 --- a/adat/adt_200a.h +++ b/adat/adt_200a.h @@ -55,46 +55,46 @@ // ADT-200A CAPS DEFINITIONS // --------------------------------------------------------------------------- -#define ADT_200A_GET_LEVEL \ - ( \ - RIG_LEVEL_PREAMP | \ - RIG_LEVEL_ATT | \ - RIG_LEVEL_AF | \ - RIG_LEVEL_NR | \ - RIG_LEVEL_CWPITCH | \ - RIG_LEVEL_RFPOWER | \ - RIG_LEVEL_MICGAIN | \ - RIG_LEVEL_KEYSPD | \ - RIG_LEVEL_METER | \ - RIG_LEVEL_BKIN_DLYMS | \ - RIG_LEVEL_RAWSTR | \ - RIG_LEVEL_SWR | \ - RIG_LEVEL_ALC ) +#define ADT_200A_GET_LEVEL \ + ( \ + RIG_LEVEL_PREAMP | \ + RIG_LEVEL_ATT | \ + RIG_LEVEL_AF | \ + RIG_LEVEL_NR | \ + RIG_LEVEL_CWPITCH | \ + RIG_LEVEL_RFPOWER | \ + RIG_LEVEL_MICGAIN | \ + RIG_LEVEL_KEYSPD | \ + RIG_LEVEL_METER | \ + RIG_LEVEL_BKIN_DLYMS | \ + RIG_LEVEL_RAWSTR | \ + RIG_LEVEL_SWR | \ + RIG_LEVEL_ALC ) -#define ADT_200A_SET_LEVEL \ - ( \ - RIG_LEVEL_PREAMP | \ - RIG_LEVEL_ATT | \ - RIG_LEVEL_AF | \ - RIG_LEVEL_NR | \ - RIG_LEVEL_CWPITCH | \ - RIG_LEVEL_RFPOWER | \ - RIG_LEVEL_MICGAIN | \ - RIG_LEVEL_KEYSPD | \ - RIG_LEVEL_METER | \ - RIG_LEVEL_BKIN_DLYMS | \ - RIG_LEVEL_ALC ) +#define ADT_200A_SET_LEVEL \ + ( \ + RIG_LEVEL_PREAMP | \ + RIG_LEVEL_ATT | \ + RIG_LEVEL_AF | \ + RIG_LEVEL_NR | \ + RIG_LEVEL_CWPITCH | \ + RIG_LEVEL_RFPOWER | \ + RIG_LEVEL_MICGAIN | \ + RIG_LEVEL_KEYSPD | \ + RIG_LEVEL_METER | \ + RIG_LEVEL_BKIN_DLYMS | \ + RIG_LEVEL_ALC ) -#define ADT_200A_MODES \ - ( \ - RIG_MODE_AM | \ - RIG_MODE_CW | \ - RIG_MODE_USB | \ - RIG_MODE_LSB | \ - RIG_MODE_FM | \ - RIG_MODE_CWR | \ - RIG_MODE_SAL | \ - RIG_MODE_SAH ) +#define ADT_200A_MODES \ + ( \ + RIG_MODE_AM | \ + RIG_MODE_CW | \ + RIG_MODE_USB | \ + RIG_MODE_LSB | \ + RIG_MODE_FM | \ + RIG_MODE_CWR | \ + RIG_MODE_SAL | \ + RIG_MODE_SAH ) // ADT-200A VFO #defines