diff --git a/adat/adat.c b/adat/adat.c index 90434387f..cf024f1d4 100644 --- a/adat/adat.c +++ b/adat/adat.c @@ -23,7 +23,7 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif // --------------------------------------------------------------------------- @@ -42,7 +42,7 @@ // HAMLIB INCLUDES // --------------------------------------------------------------------------- -#include "hamlib/rig.h" +#include #include "token.h" #include "serial.h" #include "misc.h" @@ -77,7 +77,7 @@ // --------------------------------------------------------------------------- #if !defined(NDEDBUG) -# define ADAT_DEBUG 1 +# define ADAT_DEBUG 1 #endif #undef ADAT_DEBUG // manual override ... @@ -93,83 +93,83 @@ static int gFnLevel = 0; // ADAT MODES static adat_mode_list_t the_adat_mode_list = { - ADAT_NR_MODES, + ADAT_NR_MODES, - { - { - ADAT_MODE_STR_CW_R, - ADAT_MODE_RNR_CW_R, - ADAT_MODE_ANR_CW_R - }, + { + { + ADAT_MODE_STR_CW_R, + ADAT_MODE_RNR_CW_R, + ADAT_MODE_ANR_CW_R + }, - { - ADAT_MODE_STR_CW, - ADAT_MODE_RNR_CW, - ADAT_MODE_ANR_CW - }, + { + ADAT_MODE_STR_CW, + ADAT_MODE_RNR_CW, + ADAT_MODE_ANR_CW + }, - { - ADAT_MODE_STR_LSB, - ADAT_MODE_RNR_LSB, - ADAT_MODE_ANR_LSB - }, + { + ADAT_MODE_STR_LSB, + ADAT_MODE_RNR_LSB, + ADAT_MODE_ANR_LSB + }, - { - ADAT_MODE_STR_USB, - ADAT_MODE_RNR_USB, - ADAT_MODE_ANR_USB - }, + { + ADAT_MODE_STR_USB, + ADAT_MODE_RNR_USB, + ADAT_MODE_ANR_USB + }, - { - ADAT_MODE_STR_AM, - ADAT_MODE_RNR_AM, - ADAT_MODE_ANR_AM - }, + { + ADAT_MODE_STR_AM, + ADAT_MODE_RNR_AM, + ADAT_MODE_ANR_AM + }, - { - ADAT_MODE_STR_AM_SL, - ADAT_MODE_RNR_AM_SL, - ADAT_MODE_ANR_AM_SL - }, + { + ADAT_MODE_STR_AM_SL, + ADAT_MODE_RNR_AM_SL, + ADAT_MODE_ANR_AM_SL + }, - { - ADAT_MODE_STR_AM_SU, - ADAT_MODE_RNR_AM_SU, - ADAT_MODE_ANR_AM_SU - }, + { + ADAT_MODE_STR_AM_SU, + ADAT_MODE_RNR_AM_SU, + ADAT_MODE_ANR_AM_SU + }, - { - ADAT_MODE_STR_FM, - ADAT_MODE_RNR_FM, - ADAT_MODE_ANR_FM - } - } + { + ADAT_MODE_STR_FM, + ADAT_MODE_RNR_FM, + ADAT_MODE_ANR_FM + } + } }; // ADAT VFOS static adat_vfo_list_t the_adat_vfo_list = { - ADAT_NR_VFOS, + ADAT_NR_VFOS, - { - { - ADAT_VFO_STR_A, - ADAT_VFO_RNR_A, - ADAT_VFO_ANR_A - }, + { + { + ADAT_VFO_STR_A, + ADAT_VFO_RNR_A, + ADAT_VFO_ANR_A + }, - { - ADAT_VFO_STR_B, - ADAT_VFO_RNR_B, - ADAT_VFO_ANR_B - }, + { + ADAT_VFO_STR_B, + ADAT_VFO_RNR_B, + ADAT_VFO_ANR_B + }, - { - ADAT_VFO_STR_C, - ADAT_VFO_RNR_C, - ADAT_VFO_ANR_C - } - } + { + ADAT_VFO_STR_C, + ADAT_VFO_RNR_C, + ADAT_VFO_ANR_C + } + } }; // --------------------------------------------------------------------------- @@ -179,40 +179,40 @@ 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 = { - ADAT_CMD_DEF_NIL, - ADAT_CMD_KIND_WITHOUT_RESULT, - NULL, + ADAT_CMD_DEF_NIL, + ADAT_CMD_KIND_WITHOUT_RESULT, + NULL, - 0, - { - NULL - } + 0, + { + NULL + } }; #endif // -- ADAT SPECIAL: DISPLAY OFF -- static adat_cmd_def_t adat_cmd_display_off = { - ADAT_CMD_DEF_ADAT_SPECIAL, - ADAT_CMD_KIND_WITHOUT_RESULT, - NULL, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITHOUT_RESULT, + NULL, - 1, - { - ADAT_CMD_DEF_STRING_DISPLAY_OFF - } + 1, + { + ADAT_CMD_DEF_STRING_DISPLAY_OFF + } }; // -- ADAT SPECIAL: DISPLAY ON -- static adat_cmd_def_t adat_cmd_display_on = { - ADAT_CMD_DEF_ADAT_SPECIAL, - ADAT_CMD_KIND_WITHOUT_RESULT, - NULL, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITHOUT_RESULT, + NULL, - 1, - { - ADAT_CMD_DEF_STRING_DISPLAY_ON - } + 1, + { + ADAT_CMD_DEF_STRING_DISPLAY_ON + } }; // -- ADAT SPECIAL: SELECT VFO -- @@ -220,106 +220,106 @@ static adat_cmd_def_t adat_cmd_display_on = { // -- ADAT SPECIAL: 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_serial_nr, - 1, - { - ADAT_CMD_DEF_STRING_GET_SERIAL_NR - } + 1, + { + ADAT_CMD_DEF_STRING_GET_SERIAL_NR + } }; // -- ADAT SPECIAL: GET FIRMWARE 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_fw_version, - 1, - { - ADAT_CMD_DEF_STRING_GET_FW_VERSION - } + 1, + { + ADAT_CMD_DEF_STRING_GET_FW_VERSION + } }; // -- ADAT SPECIAL: GET HARDWARE 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_hw_version, - 1, - { - ADAT_CMD_DEF_STRING_GET_HW_VERSION - } + 1, + { + ADAT_CMD_DEF_STRING_GET_HW_VERSION + } }; // -- ADAT SPECIAL: GET FIRMWARE VERSION -- 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_id_code, - 1, - { - ADAT_CMD_DEF_STRING_GET_ID_CODE - } + 1, + { + ADAT_CMD_DEF_STRING_GET_ID_CODE + } }; // -- ADAT SPECIAL: GET GUI FIRMWARE 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_gui_fw_version, - 1, - { - ADAT_CMD_DEF_STRING_GET_GUI_FW_VERSION - } + 1, + { + ADAT_CMD_DEF_STRING_GET_GUI_FW_VERSION + } }; // -- ADAT SPECIAL: 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_options, - 1, - { - ADAT_CMD_DEF_STRING_GET_OPTIONS - } + 1, + { + ADAT_CMD_DEF_STRING_GET_OPTIONS + } }; // -- ADAT SPECIAL: 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITH_RESULT, + adat_cmd_fn_get_callsign, - 1, - { - ADAT_CMD_DEF_STRING_GET_CALLSIGN - } + 1, + { + ADAT_CMD_DEF_STRING_GET_CALLSIGN + } }; // -- ADAT SPECIAL: 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, + ADAT_CMD_DEF_ADAT_SPECIAL, + ADAT_CMD_KIND_WITHOUT_RESULT, + adat_cmd_fn_set_callsign, - 1, - { - ADAT_CMD_DEF_STRING_SET_CALLSIGN - } + 1, + { + ADAT_CMD_DEF_STRING_SET_CALLSIGN + } }; // -- HAMLIB DEFINED COMMANDS -- @@ -327,227 +327,227 @@ static adat_cmd_def_t adat_cmd_set_callsign = { // -- GET FREQ -- static adat_cmd_def_t adat_cmd_get_freq = { - ADAT_CMD_DEF_GET_FREQ, - ADAT_CMD_KIND_WITH_RESULT, + ADAT_CMD_DEF_GET_FREQ, + ADAT_CMD_KIND_WITH_RESULT, - adat_cmd_fn_get_freq, + adat_cmd_fn_get_freq, - 1, - { - ADAT_CMD_DEF_STRING_GET_FREQ - } + 1, + { + ADAT_CMD_DEF_STRING_GET_FREQ + } }; static adat_cmd_list_t adat_cmd_list_get_freq = { - 2, - { - &adat_cmd_display_off, - &adat_cmd_get_freq - } + 2, + { + &adat_cmd_display_off, + &adat_cmd_get_freq + } }; // -- SET FREQ -- static adat_cmd_def_t adat_cmd_set_freq = { - ADAT_CMD_DEF_SET_FREQ, - ADAT_CMD_KIND_WITHOUT_RESULT, + ADAT_CMD_DEF_SET_FREQ, + ADAT_CMD_KIND_WITHOUT_RESULT, - adat_cmd_fn_set_freq, + adat_cmd_fn_set_freq, - 1, - { - ADAT_CMD_DEF_STRING_SET_FREQ - } + 1, + { + ADAT_CMD_DEF_STRING_SET_FREQ + } }; static adat_cmd_list_t adat_cmd_list_set_freq = { - 3, - { - &adat_cmd_display_off, - &adat_cmd_set_freq, - &adat_cmd_get_freq, - } + 3, + { + &adat_cmd_display_off, + &adat_cmd_set_freq, + &adat_cmd_get_freq, + } }; // -- GET VFO -- static adat_cmd_list_t adat_cmd_list_get_vfo = { - 2, - { - &adat_cmd_display_off, - &adat_cmd_get_freq, - } + 2, + { + &adat_cmd_display_off, + &adat_cmd_get_freq, + } }; // -- GET MODE -- static adat_cmd_def_t adat_cmd_get_mode = { - ADAT_CMD_DEF_GET_MODE, - ADAT_CMD_KIND_WITH_RESULT, + ADAT_CMD_DEF_GET_MODE, + ADAT_CMD_KIND_WITH_RESULT, - adat_cmd_fn_get_mode, + adat_cmd_fn_get_mode, - 1, - { - ADAT_CMD_DEF_STRING_GET_MODE - } + 1, + { + ADAT_CMD_DEF_STRING_GET_MODE + } }; static adat_cmd_list_t adat_cmd_list_get_mode = { - 2, - { - &adat_cmd_display_off, - &adat_cmd_get_mode - } + 2, + { + &adat_cmd_display_off, + &adat_cmd_get_mode + } }; // -- SET VFO -- static adat_cmd_def_t adat_cmd_set_vfo = { - ADAT_CMD_DEF_SET_VFO, - ADAT_CMD_KIND_WITHOUT_RESULT, + ADAT_CMD_DEF_SET_VFO, + ADAT_CMD_KIND_WITHOUT_RESULT, - adat_cmd_fn_set_vfo, + adat_cmd_fn_set_vfo, - 2, - { - ADAT_CMD_DEF_STRING_SWITCH_ON_VFO, - ADAT_CMD_DEF_STRING_SET_VFO_AS_MAIN_VFO - } + 2, + { + ADAT_CMD_DEF_STRING_SWITCH_ON_VFO, + ADAT_CMD_DEF_STRING_SET_VFO_AS_MAIN_VFO + } }; static adat_cmd_list_t adat_cmd_list_set_vfo = { - 2, - { - &adat_cmd_display_off, - &adat_cmd_set_vfo - } + 2, + { + &adat_cmd_display_off, + &adat_cmd_set_vfo + } }; // -- SET MODE -- static adat_cmd_def_t adat_cmd_set_mode = { - ADAT_CMD_DEF_SET_MODE, - ADAT_CMD_KIND_WITHOUT_RESULT, + ADAT_CMD_DEF_SET_MODE, + ADAT_CMD_KIND_WITHOUT_RESULT, - adat_cmd_fn_set_mode, + adat_cmd_fn_set_mode, - 1, - { - ADAT_CMD_DEF_STRING_SET_MODE - } + 1, + { + ADAT_CMD_DEF_STRING_SET_MODE + } }; static adat_cmd_list_t adat_cmd_list_set_mode = { - 3, - { - &adat_cmd_display_off, - &adat_cmd_set_vfo, - &adat_cmd_set_mode, - } + 3, + { + &adat_cmd_display_off, + &adat_cmd_set_vfo, + &adat_cmd_set_mode, + } }; // -- SET PTT -- static adat_cmd_def_t adat_cmd_set_ptt = { - ADAT_CMD_DEF_SET_PTT, - ADAT_CMD_KIND_WITHOUT_RESULT, + ADAT_CMD_DEF_SET_PTT, + ADAT_CMD_KIND_WITHOUT_RESULT, - adat_cmd_fn_set_ptt, + adat_cmd_fn_set_ptt, - 1, - { - ADAT_CMD_DEF_STRING_SET_PTT - } + 1, + { + ADAT_CMD_DEF_STRING_SET_PTT + } }; static adat_cmd_list_t adat_cmd_list_set_ptt = { - 2, - { - &adat_cmd_set_ptt, - &adat_cmd_display_off - } + 2, + { + &adat_cmd_set_ptt, + &adat_cmd_display_off + } }; // -- GET PTT -- static adat_cmd_def_t adat_cmd_get_ptt = { - ADAT_CMD_DEF_GET_PTT, - ADAT_CMD_KIND_WITH_RESULT, + ADAT_CMD_DEF_GET_PTT, + ADAT_CMD_KIND_WITH_RESULT, - adat_cmd_fn_get_ptt, + adat_cmd_fn_get_ptt, - 1, - { - ADAT_CMD_DEF_STRING_GET_PTT - } + 1, + { + ADAT_CMD_DEF_STRING_GET_PTT + } }; static adat_cmd_list_t adat_cmd_list_get_ptt = { - 2, - { - &adat_cmd_display_off, - &adat_cmd_get_ptt - } + 2, + { + &adat_cmd_display_off, + &adat_cmd_get_ptt + } }; // -- GET POWER STATUS -- static adat_cmd_list_t adat_cmd_list_get_powerstatus = { - 1, - { - &adat_cmd_get_id_code - } + 1, + { + &adat_cmd_get_id_code + } }; // -- GET INFO -- static adat_cmd_list_t adat_cmd_list_get_info = { - 7, - { - &adat_cmd_get_serial_nr, - &adat_cmd_get_id_code, - &adat_cmd_get_fw_version, - &adat_cmd_get_gui_fw_version, - &adat_cmd_get_hw_version, - &adat_cmd_get_options, - &adat_cmd_get_callsign - } + 7, + { + &adat_cmd_get_serial_nr, + &adat_cmd_get_id_code, + &adat_cmd_get_fw_version, + &adat_cmd_get_gui_fw_version, + &adat_cmd_get_hw_version, + &adat_cmd_get_options, + &adat_cmd_get_callsign + } }; // -- OPEN ADAT -- static adat_cmd_list_t adat_cmd_list_open_adat = { - 8, - { - &adat_cmd_display_off, - &adat_cmd_get_serial_nr, - &adat_cmd_get_id_code, - &adat_cmd_get_fw_version, - &adat_cmd_get_gui_fw_version, - &adat_cmd_get_hw_version, - &adat_cmd_get_options, - &adat_cmd_set_callsign - } + 8, + { + &adat_cmd_display_off, + &adat_cmd_get_serial_nr, + &adat_cmd_get_id_code, + &adat_cmd_get_fw_version, + &adat_cmd_get_gui_fw_version, + &adat_cmd_get_hw_version, + &adat_cmd_get_options, + &adat_cmd_set_callsign + } }; // -- CLOSE ADAT -- static adat_cmd_list_t adat_cmd_list_close_adat = { - 1, - { - &adat_cmd_display_on - } + 1, + { + &adat_cmd_display_on + } }; // -- ADAT SPECIAL: RECOVER FROM ERROR -- static adat_cmd_list_t adat_cmd_list_recover_from_error = { - 1, - { - &adat_cmd_display_on - } + 1, + { + &adat_cmd_display_on + } }; // --------------------------------------------------------------------------- @@ -562,53 +562,55 @@ static adat_cmd_list_t adat_cmd_list_recover_from_error = { size_t trimwhitespace(char *out, size_t len, const char *str) { - char *end = NULL; - size_t out_size = 0; + char *end = NULL; + size_t out_size = 0; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. In -> \"%s\", %d.\n", - gFnLevel, __func__, __FILE__, __LINE__, str, len); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. In -> \"%s\", %d.\n", + gFnLevel, __func__, __FILE__, __LINE__, str, len); - if (len == 0) { - gFnLevel--; - return 0; - } + if (len == 0) { + gFnLevel--; + return 0; + } - // Trim leading space - while (isspace((int)*str)) str++; + // Trim leading space + while (isspace((int)*str)) { + str++; + } - if (*str == 0) { // All spaces? - out = NULL; - gFnLevel--; - return 1; - } + if (*str == 0) { // All spaces? + out = NULL; + gFnLevel--; + return 1; + } - // Trim trailing space - end = (char *)(str + strlen(str) - 1); + // Trim trailing space + end = (char *)(str + strlen(str) - 1); - while (end > str && isspace((int)*end)) { - *end = '\0'; - end--; - } + while (end > str && isspace((int)*end)) { + *end = '\0'; + end--; + } - end++; + end++; - // Set output size to minimum of trimmed string length and buffer size minus 1 - //out_size = (end - str) < len-1 ? (end - str) : len - 1; - out_size = strlen(str); + // Set output size to minimum of trimmed string length and buffer size minus 1 + //out_size = (end - str) < len-1 ? (end - str) : len - 1; + out_size = strlen(str); - // Copy trimmed string and add null terminator - memcpy(out, str, out_size); - out[out_size] = 0; + // Copy trimmed string and add null terminator + memcpy(out, str, out_size); + out[out_size] = 0; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Out -> \"%s\", %d.\n", - gFnLevel, __func__, __FILE__, __LINE__, out, out_size); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Out -> \"%s\", %d.\n", + gFnLevel, __func__, __FILE__, __LINE__, out, out_size); + gFnLevel--; - return out_size; + return out_size; } // --------------------------------------------------------------------------- @@ -618,42 +620,42 @@ size_t trimwhitespace(char *out, size_t len, const char *str) int adat_print_cmd(adat_cmd_def_ptr pCmd) { - int nRC = RIG_OK; + int nRC = RIG_OK; - int nI = 0; + int nI = 0; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %s (%s:%d): ENTRY.\n", - __func__, __FILE__, __LINE__); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %s (%s:%d): ENTRY.\n", + __func__, __FILE__, __LINE__); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT COMMAND:\n"); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT COMMAND:\n"); - rig_debug(RIG_DEBUG_TRACE, - "*** -> Command ID = %"PRIll"\n", - pCmd->nCmdId); + rig_debug(RIG_DEBUG_TRACE, + "*** -> Command ID = %"PRIll"\n", + pCmd->nCmdId); - rig_debug(RIG_DEBUG_TRACE, - "*** -> Command kind = %d\n", - pCmd->nCmdKind); + rig_debug(RIG_DEBUG_TRACE, + "*** -> Command kind = %d\n", + pCmd->nCmdKind); - rig_debug(RIG_DEBUG_TRACE, - "*** -> Command FN Ptr = 0x%08x\n", - pCmd->pfCmdFn); + rig_debug(RIG_DEBUG_TRACE, + "*** -> Command FN Ptr = 0x%08x\n", + pCmd->pfCmdFn); - while (nI < pCmd->nNrCmdStrs) { - rig_debug(RIG_DEBUG_TRACE, - "*** -> Command String %d = \"%s\"\n", - nI, pCmd->pacCmdStrs[ nI ]); - nI++; - } + while (nI < pCmd->nNrCmdStrs) { + rig_debug(RIG_DEBUG_TRACE, + "*** -> Command String %d = \"%s\"\n", + nI, pCmd->pacCmdStrs[ nI ]); + nI++; + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %s (%s:%d): EXIT. Return Code = %d\n", - __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %s (%s:%d): EXIT. Return Code = %d\n", + __func__, __FILE__, __LINE__, + nRC); - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -666,123 +668,123 @@ int adat_print_cmd(adat_cmd_def_ptr pCmd) // "800Hz" => nMode = ADAT_FREQ_PARSE_MODE_WITHOUT_VFO int adat_parse_freq(char *pcStr, - adat_freq_parse_mode_t nMode, - int *nVFO, - freq_t *nFreq) + adat_freq_parse_mode_t nMode, + int *nVFO, + freq_t *nFreq) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + gFnLevel++; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", + gFnLevel, __func__, __FILE__, __LINE__, + pcStr); - if (pcStr != NULL) { - int _nVFO = 0; - freq_t _nFreq = 0; + if (pcStr != NULL) { + int _nVFO = 0; + freq_t _nFreq = 0; - char *pcEnd = NULL; + char *pcEnd = NULL; - if (nMode == ADAT_FREQ_PARSE_MODE_WITH_VFO) { - // Get VFO from response string + if (nMode == ADAT_FREQ_PARSE_MODE_WITH_VFO) { + // Get VFO from response string - _nVFO = strtol(pcStr, &pcEnd, 10); + _nVFO = strtol(pcStr, &pcEnd, 10); - // Save VFO + // Save VFO - *nVFO = _nVFO; - } else { - pcEnd = pcStr; - } + *nVFO = _nVFO; + } else { + pcEnd = pcStr; + } - if ((_nVFO != 0) || // VFO = 0 -> Current VFO not active. - (nMode == ADAT_FREQ_PARSE_MODE_WITHOUT_VFO)) { - char acValueBuf[ ADAT_BUFSZ + 1 ]; - char acUnitBuf[ ADAT_BUFSZ + 1 ]; - int nI = 0; - double dTmpFreq = 0.0; + if ((_nVFO != 0) // VFO = 0 -> Current VFO not active. + || (nMode == ADAT_FREQ_PARSE_MODE_WITHOUT_VFO)) { + char acValueBuf[ ADAT_BUFSZ + 1 ]; + char acUnitBuf[ ADAT_BUFSZ + 1 ]; + int nI = 0; + double dTmpFreq = 0.0; - memset(acValueBuf, 0, ADAT_BUFSZ + 1); - memset(acUnitBuf, 0, ADAT_BUFSZ + 1); + memset(acValueBuf, 0, ADAT_BUFSZ + 1); + memset(acUnitBuf, 0, ADAT_BUFSZ + 1); - // Get Freq Value from response string + // Get Freq Value from response string - while ((isalpha((int)*pcEnd) == 0) || - (*pcEnd == '.')) { - acValueBuf[ nI++ ] = *pcEnd; - pcEnd += sizeof(char); - } + while ((isalpha((int)*pcEnd) == 0) + || (*pcEnd == '.')) { + acValueBuf[ nI++ ] = *pcEnd; + pcEnd += sizeof(char); + } - dTmpFreq = strtod(acValueBuf, (char **) NULL); + dTmpFreq = strtod(acValueBuf, (char **) NULL); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d acValueBuf = \"%s\", dTmpFreq = %f, *pcEnd = %c\n", - gFnLevel, acValueBuf, dTmpFreq, *pcEnd); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d acValueBuf = \"%s\", dTmpFreq = %f, *pcEnd = %c\n", + gFnLevel, acValueBuf, dTmpFreq, *pcEnd); - // Get Freq Unit from response string + // Get Freq Unit from response string - nI = 0; + nI = 0; - while (isalpha((int)*pcEnd) != 0) { - acUnitBuf[ nI++ ] = *pcEnd; - pcEnd += sizeof(char); - } + while (isalpha((int)*pcEnd) != 0) { + acUnitBuf[ nI++ ] = *pcEnd; + pcEnd += sizeof(char); + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d acUnitBuf = \"%s\"\n", - gFnLevel, acUnitBuf); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d acUnitBuf = \"%s\"\n", + gFnLevel, acUnitBuf); - // Normalize to Hz + // Normalize to Hz - if (!strncmp(acUnitBuf, - ADAT_FREQ_UNIT_HZ, - ADAT_FREQ_UNIT_HZ_LEN)) { - _nFreq = Hz(dTmpFreq); - } else { - if (!strncmp(acUnitBuf, - ADAT_FREQ_UNIT_KHZ, - ADAT_FREQ_UNIT_KHZ_LEN)) { - _nFreq = kHz(dTmpFreq); - } else { - if (!strncmp(acUnitBuf, - ADAT_FREQ_UNIT_MHZ, - ADAT_FREQ_UNIT_MHZ_LEN)) { - _nFreq = MHz(dTmpFreq); - } else { - if (!strncmp(acUnitBuf, - ADAT_FREQ_UNIT_GHZ, - ADAT_FREQ_UNIT_GHZ_LEN)) { - _nFreq = GHz(dTmpFreq); - } else { - _nFreq = 0; - nRC = -RIG_EINVAL; - } - } - } + if (!strncmp(acUnitBuf, + ADAT_FREQ_UNIT_HZ, + ADAT_FREQ_UNIT_HZ_LEN)) { + _nFreq = Hz(dTmpFreq); + } else { + if (!strncmp(acUnitBuf, + ADAT_FREQ_UNIT_KHZ, + ADAT_FREQ_UNIT_KHZ_LEN)) { + _nFreq = kHz(dTmpFreq); + } else { + if (!strncmp(acUnitBuf, + ADAT_FREQ_UNIT_MHZ, + ADAT_FREQ_UNIT_MHZ_LEN)) { + _nFreq = MHz(dTmpFreq); + } else { + if (!strncmp(acUnitBuf, + ADAT_FREQ_UNIT_GHZ, + ADAT_FREQ_UNIT_GHZ_LEN)) { + _nFreq = GHz(dTmpFreq); + } else { + _nFreq = 0; + nRC = -RIG_EINVAL; + } + } + } - } + } - // Save Freq + // Save Freq - *nFreq = _nFreq; - } - } else { - // If input string is NULL set Freq and VFO also to NULL + *nFreq = _nFreq; + } + } else { + // If input string is NULL set Freq and VFO also to NULL - *nFreq = 0; - *nVFO = 0; - } + *nFreq = 0; + *nVFO = 0; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -791,47 +793,47 @@ int adat_parse_freq(char *pcStr, // Status: RELEASED int adat_parse_mode(char *pcStr, - rmode_t *nRIGMode, - char *pcADATMode) + rmode_t *nRIGMode, + char *pcADATMode) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", + gFnLevel, __func__, __FILE__, __LINE__, + pcStr); - if (pcStr != NULL) { - int nI = 0; - int nFini = 0; + if (pcStr != NULL) { + int nI = 0; + int nFini = 0; - while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) { - if (!strcmp(pcStr, - the_adat_mode_list.adat_modes[ nI ].pcADATModeStr)) { - *nRIGMode = the_adat_mode_list.adat_modes[ nI ].nRIGMode; - nFini = 1; // Done. - } else { - nI++; - } - } - } else { - // If input string is NULL ... + while ((nI < the_adat_mode_list.nNrModes) && (nFini == 0)) { + if (!strcmp(pcStr, + the_adat_mode_list.adat_modes[ nI ].pcADATModeStr)) { + *nRIGMode = the_adat_mode_list.adat_modes[ nI ].nRIGMode; + nFini = 1; // Done. + } else { + nI++; + } + } + } else { + // If input string is NULL ... - *nRIGMode = RIG_MODE_NONE; - pcADATMode = NULL; - } + *nRIGMode = RIG_MODE_NONE; + pcADATMode = NULL; + } - // Done + // Done - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, Mode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC, *nRIGMode); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d, Mode = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC, *nRIGMode); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -840,43 +842,43 @@ int adat_parse_mode(char *pcStr, // Status: RELEASED int adat_mode_rnr2anr(rmode_t nRIGMode, - int *nADATMode) + int *nADATMode) { - int nRC = RIG_OK; - int nI = 0; - int nFini = 0; + int nRC = RIG_OK; + int nI = 0; + int nFini = 0; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGMode); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + 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 { - nI++; - } - } + 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 { + nI++; + } + } - if (nFini == 0) { - // No valid Mode given + if (nFini == 0) { + // No valid Mode given - nRC = -RIG_EINVAL; - } + nRC = -RIG_EINVAL; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -885,43 +887,43 @@ int adat_mode_rnr2anr(rmode_t nRIGMode, // Status: RELEASED int adat_mode_anr2rnr(int nADATMode, - rmode_t *nRIGMode) + rmode_t *nRIGMode) { - int nRC = RIG_OK; - int nI = 0; - int nFini = 0; + int nRC = RIG_OK; + int nI = 0; + int nFini = 0; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGMode); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGMode = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRIGMode); - 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 { - nI++; - } - } + 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 { + nI++; + } + } - if (nFini == 0) { - // No valid Mode given + if (nFini == 0) { + // No valid Mode given - nRC = -RIG_EINVAL; - } + nRC = -RIG_EINVAL; + } - // Done + // 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); - gFnLevel--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -930,52 +932,52 @@ int adat_mode_anr2rnr(int nADATMode, // Status: RELEASED int adat_parse_vfo(char *pcStr, - vfo_t *nRIGVFONr, - int *nADATVFONr) + vfo_t *nRIGVFONr, + int *nADATVFONr) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", + gFnLevel, __func__, __FILE__, __LINE__, + pcStr); - if (pcStr != NULL) { - int nI = 0; - int nFini = 0; + if (pcStr != NULL) { + int nI = 0; + int nFini = 0; - while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) { - if (!strcmp(pcStr, - 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 { - nI++; - } - } + while ((nI < the_adat_vfo_list.nNrVFOs) && (nFini == 0)) { + if (!strcmp(pcStr, + 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 { + nI++; + } + } - if (nFini == 0) { - nRC = -RIG_EINVAL; - } - } else { - // If input string is NULL ... + if (nFini == 0) { + nRC = -RIG_EINVAL; + } + } else { + // If input string is NULL ... - *nRIGVFONr = RIG_VFO_NONE; - *nADATVFONr = 0; - } + *nRIGVFONr = RIG_VFO_NONE; + *nADATVFONr = 0; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -984,43 +986,43 @@ int adat_parse_vfo(char *pcStr, // Status: RELEASED int adat_vfo_rnr2anr(vfo_t nRIGVFONr, - int *nADATVFONr) + int *nADATVFONr) { - int nRC = RIG_OK; - int nI = 0; - int nFini = 0; + int nRC = RIG_OK; + int nI = 0; + int nFini = 0; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGVFONr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGVFONr); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGVFONr = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + 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 { - nI++; - } - } + 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 { + nI++; + } + } - if (nFini == 0) { - // No valid Mode given + if (nFini == 0) { + // No valid Mode given - nRC = -RIG_EINVAL; - } + nRC = -RIG_EINVAL; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1029,43 +1031,43 @@ int adat_vfo_rnr2anr(vfo_t nRIGVFONr, // Status: RELEASED int adat_vfo_anr2rnr(int nADATVFONr, - vfo_t *nRIGVFONr) + vfo_t *nRIGVFONr) { - int nRC = RIG_OK; - int nI = 0; - int nFini = 0; + int nRC = RIG_OK; + int nI = 0; + int nFini = 0; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: nADATVFONr = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nADATVFONr); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: nADATVFONr = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + 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 { - nI++; - } - } + 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 { + nI++; + } + } - if (nFini == 0) { - // No valid ADAT VFO Nr given + if (nFini == 0) { + // No valid ADAT VFO Nr given - nRC = -RIG_EINVAL; - } + nRC = -RIG_EINVAL; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1074,35 +1076,35 @@ int adat_vfo_anr2rnr(int nADATVFONr, // Status: RELEASED int adat_parse_ptt(char *pcStr, - int *nADATPTTStatus) + int *nADATPTTStatus) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pcStr); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pcStr = \"%s\"\n", + gFnLevel, __func__, __FILE__, __LINE__, + pcStr); - if ((pcStr != NULL) && (strlen(pcStr) > 0)) { - *nADATPTTStatus = strtol(pcStr, NULL, 10); - } else { - // If input string is NULL ... + if ((pcStr != NULL) && (strlen(pcStr) > 0)) { + *nADATPTTStatus = strtol(pcStr, NULL, 10); + } else { + // If input string is NULL ... - *nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; - nRC = -RIG_EINVAL; - } + *nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; + nRC = -RIG_EINVAL; + } - // Done + // Done - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1111,41 +1113,41 @@ int adat_parse_ptt(char *pcStr, // Status: RELEASED int adat_ptt_rnr2anr(ptt_t nRIGPTTStatus, - int *nADATPTTStatus) + int *nADATPTTStatus) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGPTTStatus = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRIGPTTStatus); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: nRIGPTTStatus = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRIGPTTStatus); - switch (nRIGPTTStatus) { - case ADAT_PTT_STATUS_RNR_ON: - *nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; - break; + switch (nRIGPTTStatus) { + case ADAT_PTT_STATUS_RNR_ON: + *nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; + break; - case ADAT_PTT_STATUS_RNR_OFF: - *nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; - break; + case ADAT_PTT_STATUS_RNR_OFF: + *nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; + break; - default: - nRC = -RIG_EINVAL; - break; - } + default: + nRC = -RIG_EINVAL; + break; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1154,40 +1156,40 @@ int adat_ptt_rnr2anr(ptt_t nRIGPTTStatus, // Status: RELEASED int adat_ptt_anr2rnr(int nADATPTTStatus, - ptt_t *nRIGPTTStatus) + ptt_t *nRIGPTTStatus) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: nADATPTTStatus = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nADATPTTStatus); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: nADATPTTStatus = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nADATPTTStatus); - switch (nADATPTTStatus) { - case ADAT_PTT_STATUS_ANR_ON: - *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_ON; - break; + switch (nADATPTTStatus) { + case ADAT_PTT_STATUS_ANR_ON: + *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_ON; + break; - case ADAT_PTT_STATUS_ANR_OFF: - *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_OFF; - break; + case ADAT_PTT_STATUS_ANR_OFF: + *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_OFF; + break; - default: - nRC = -RIG_EINVAL; - break; - } + default: + nRC = -RIG_EINVAL; + break; + } - // Done + // Done - 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--; + 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--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1196,30 +1198,30 @@ int adat_ptt_anr2rnr(int nADATPTTStatus, // Status: RELEASED int adat_send(RIG *pRig, - char *pcData) + char *pcData) { - int nRC = RIG_OK; - struct rig_state *pRigState = &pRig->state; + int nRC = RIG_OK; + struct rig_state *pRigState = &pRig->state; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcData = %s\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig, pcData); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcData = %s\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig, pcData); - serial_flush(&pRigState->rigport); + serial_flush(&pRigState->rigport); - nRC = write_block(&pRigState->rigport, pcData, strlen(pcData)); + nRC = write_block(&pRigState->rigport, pcData, strlen(pcData)); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1228,32 +1230,32 @@ int adat_send(RIG *pRig, // Status: RELEASED int adat_receive(RIG *pRig, - char *pcData) + char *pcData) { - int nRC = RIG_OK; - struct rig_state *pRigState = &pRig->state; + int nRC = RIG_OK; + struct rig_state *pRigState = &pRig->state; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - nRC = read_string(&pRigState->rigport, pcData, ADAT_RESPSZ, ADAT_EOL, 1); + nRC = read_string(&pRigState->rigport, pcData, ADAT_RESPSZ, ADAT_EOL, 1); - if (nRC > 0) { - nRC = RIG_OK; - } + 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); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1263,37 +1265,38 @@ int adat_receive(RIG *pRig, int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcCmd = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig, pcCmd); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcCmd = \"%s\"\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig, pcCmd); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - if (pPriv->pcCmd != NULL) - free(pPriv->pcCmd); + if (pPriv->pcCmd != NULL) { + free(pPriv->pcCmd); + } - pPriv->pcCmd = strdup(pcCmd); - pPriv->nCmdKind = nCmdKind; - } + pPriv->pcCmd = strdup(pcCmd); + pPriv->nCmdKind = nCmdKind; + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1303,40 +1306,41 @@ int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind) int adat_priv_set_result(RIG *pRig, char *pcResult) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x, pcResult = \"%s\"\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig, 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); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - if (pPriv->pcResult != NULL) - free(pPriv->pcResult); + if (pPriv->pcResult != NULL) { + free(pPriv->pcResult); + } - pPriv->pcResult = strdup(pcResult); + pPriv->pcResult = strdup(pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcResult = \"%s\"\n", - gFnLevel, pPriv->pcResult); - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcResult = \"%s\"\n", + gFnLevel, pPriv->pcResult); + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1346,36 +1350,37 @@ int adat_priv_set_result(RIG *pRig, char *pcResult) int adat_priv_clear_result(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - if (pPriv->pcResult != NULL) - free(pPriv->pcResult); + if (pPriv->pcResult != NULL) { + free(pPriv->pcResult); + } - pPriv->pcResult = NULL; - } + pPriv->pcResult = NULL; + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1385,119 +1390,122 @@ int adat_priv_clear_result(RIG *pRig) int adat_get_single_cmd_result(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - struct rig_state *pRigState = &pRig->state; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_send(pRig, pPriv->pcCmd); - if ((nRC == RIG_OK) && - (pPriv->nCmdKind == ADAT_CMD_KIND_WITH_RESULT)) { - char acBuf[ ADAT_RESPSZ + 1 ]; - char acBuf2[ ADAT_RESPSZ + 1 ]; - int nBufLength = 0; - char *pcBufEnd = NULL; - char *pcPos = NULL; - char *pcResult = NULL; + if ((nRC == RIG_OK) + && (pPriv->nCmdKind == ADAT_CMD_KIND_WITH_RESULT)) { - memset(acBuf, 0, ADAT_RESPSZ + 1); - memset(acBuf2, 0, ADAT_RESPSZ + 1); + char acBuf[ ADAT_RESPSZ + 1 ]; + char acBuf2[ ADAT_RESPSZ + 1 ]; + int nBufLength = 0; + char *pcBufEnd = NULL; + char *pcPos = NULL; + char *pcResult = NULL; - nRC = adat_receive(pRig, acBuf); + memset(acBuf, 0, ADAT_RESPSZ + 1); + memset(acBuf2, 0, ADAT_RESPSZ + 1); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d acBuf ........ = 0x%08x\n", - gFnLevel, acBuf); + nRC = adat_receive(pRig, acBuf); - pcPos = acBuf; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d acBuf ........ = 0x%08x\n", + gFnLevel, acBuf); - if ((nRC == RIG_OK) && (pcPos != NULL)) { - int nLength = 0; + pcPos = acBuf; - if (*pcPos == '\0') // Adjust for 00 byte at beginning ... - pcPos++; // No, please don't ask me why this + if ((nRC == RIG_OK) && (pcPos != NULL)) { + int nLength = 0; - // happens ... ;-) + if (*pcPos == '\0') { // Adjust for 00 byte at beginning ... + pcPos++; // No, please don't ask me why this + } - nBufLength = strlen(pcPos); - pcBufEnd = pcPos + nBufLength - 1; + // happens ... ;-) - pcResult = pcPos; // Save position + nBufLength = strlen(pcPos); + pcBufEnd = pcPos + nBufLength - 1; - if (pcPos < pcBufEnd) { - nLength = strlen(pcPos); + pcResult = pcPos; // Save position - if (nLength > 0) { - char *pcPos2 = strchr(pcPos, (char) 0x0d); + if (pcPos < pcBufEnd) { + nLength = strlen(pcPos); - if (pcPos2 != NULL) - *pcPos2 = '\0'; // Truncate \0d\0a + if (nLength > 0) { + char *pcPos2 = strchr(pcPos, (char) 0x0d); - pcPos = strchr(pcPos, ' '); + if (pcPos2 != NULL) { + *pcPos2 = '\0'; // Truncate \0d\0a + } - if ((pcPos != NULL) && (pcPos < pcBufEnd)) { - pcPos += sizeof(char); + pcPos = strchr(pcPos, ' '); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pcPos ........ = 0x%08x\n", - gFnLevel, pcPos); + if ((pcPos != NULL) && (pcPos < pcBufEnd)) { + pcPos += sizeof(char); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pcBufEnd ..... = 0x%08x\n", - gFnLevel, pcBufEnd); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pcPos ........ = 0x%08x\n", + gFnLevel, pcPos); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d nBufLength ... = %d\n", - gFnLevel, nBufLength); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pcBufEnd ..... = 0x%08x\n", + gFnLevel, pcBufEnd); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pcPos2 ....... = 0x%08x\n", - gFnLevel, pcPos2); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d nBufLength ... = %d\n", + gFnLevel, nBufLength); - trimwhitespace(acBuf2, strlen(pcPos), pcPos); - pcResult = acBuf2; - } - } else { - nRC = -RIG_EINVAL; - } - } else { - nRC = -RIG_EINVAL; - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pcPos2 ....... = 0x%08x\n", + gFnLevel, pcPos2); - if (nRC == RIG_OK) { - adat_priv_set_result(pRig, pcResult); - } else { - adat_priv_clear_result(pRig); - } - } - } + trimwhitespace(acBuf2, strlen(pcPos), pcPos); + pcResult = acBuf2; + } + } else { + nRC = -RIG_EINVAL; + } + } else { + nRC = -RIG_EINVAL; + } - serial_flush(&pRigState->rigport); + if (nRC == RIG_OK) { + adat_priv_set_result(pRig, pcResult); + } else { + adat_priv_clear_result(pRig); + } + } + } - pPriv->nRC = nRC; - } + serial_flush(&pRigState->rigport); - // Done ! + pPriv->nRC = nRC; + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + // Done ! - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - return nRC; + gFnLevel--; + + return nRC; } // --------------------------------------------------------------------------- @@ -1507,50 +1515,51 @@ int adat_get_single_cmd_result(RIG *pRig) int adat_cmd_recover_from_error(RIG *pRig, int nError) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - // Recover from communication error + // Recover from communication error - if ((nError == RIG_ETIMEOUT) || - (nError == RIG_EPROTO) || - (nError == RIG_EIO)) { - rig_close(pRig); - sleep(ADAT_SLEEP_AFTER_RIG_CLOSE); + if ((nError == RIG_ETIMEOUT) + || (nError == RIG_EPROTO) + || (nError == RIG_EIO)) { - rig_open(pRig); - } + rig_close(pRig); + sleep(ADAT_SLEEP_AFTER_RIG_CLOSE); - // Reset critical Priv values + rig_open(pRig); + } - pPriv->nRC = RIG_OK; + // Reset critical Priv values - // Execute recovery commands + pPriv->nRC = RIG_OK; - (void) adat_transaction(pRig, &adat_cmd_list_recover_from_error); - } + // Execute recovery commands - // Done ! + (void) adat_transaction(pRig, &adat_cmd_list_recover_from_error); + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + // Done ! - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - return nRC; + gFnLevel--; + + return nRC; } // --------------------------------------------------------------------------- @@ -1560,47 +1569,47 @@ int adat_cmd_recover_from_error(RIG *pRig, int nError) int adat_cmd_fn_get_callsign(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_CALLSIGN, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcCallsign = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcCallsign = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcCallsign = \"%s\"\n", - gFnLevel, pPriv->pcCallsign); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcCallsign = \"%s\"\n", + gFnLevel, pPriv->pcCallsign); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1610,43 +1619,43 @@ int adat_cmd_fn_get_callsign(RIG *pRig) int adat_cmd_fn_set_callsign(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - char acBuf[ ADAT_BUFSZ + 1 ]; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + char acBuf[ ADAT_BUFSZ + 1 ]; - memset(acBuf, 0, ADAT_BUFSZ + 1); + memset(acBuf, 0, ADAT_BUFSZ + 1); - strcpy(acBuf, ADAT_CMD_DEF_STRING_SET_CALLSIGN); - strcat(acBuf, "DG1SBG"ADAT_CR); + strcpy(acBuf, ADAT_CMD_DEF_STRING_SET_CALLSIGN); + strcat(acBuf, "DG1SBG"ADAT_CR); - nRC = adat_priv_set_cmd(pRig, acBuf, - ADAT_CMD_KIND_WITHOUT_RESULT); + nRC = adat_priv_set_cmd(pRig, acBuf, + ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); - } - } + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } @@ -1657,46 +1666,46 @@ int adat_cmd_fn_set_callsign(RIG *pRig) int adat_cmd_fn_get_serial_nr(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_SERIAL_NR, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcSerialNr = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcSerialNr = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcSerialNr = \"%s\"\n", - gFnLevel, pPriv->pcSerialNr); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcSerialNr = \"%s\"\n", + gFnLevel, pPriv->pcSerialNr); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1706,47 +1715,47 @@ int adat_cmd_fn_get_serial_nr(RIG *pRig) int adat_cmd_fn_get_fw_version(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_FW_VERSION, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcFWVersion = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcFWVersion = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcFWVersion = \"%s\"\n", - gFnLevel, pPriv->pcFWVersion); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcFWVersion = \"%s\"\n", + gFnLevel, pPriv->pcFWVersion); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1756,46 +1765,46 @@ int adat_cmd_fn_get_fw_version(RIG *pRig) int adat_cmd_fn_get_hw_version(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_HW_VERSION, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcHWVersion = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcHWVersion = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcHWVersion = \"%s\"\n", - gFnLevel, pPriv->pcHWVersion); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcHWVersion = \"%s\"\n", + gFnLevel, pPriv->pcHWVersion); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1805,47 +1814,47 @@ int adat_cmd_fn_get_hw_version(RIG *pRig) int adat_cmd_fn_get_gui_fw_version(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_GUI_FW_VERSION, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcGUIFWVersion = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcGUIFWVersion = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcGUIFWVersion = \"%s\"\n", - gFnLevel, pPriv->pcGUIFWVersion); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcGUIFWVersion = \"%s\"\n", + gFnLevel, pPriv->pcGUIFWVersion); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1855,46 +1864,46 @@ int adat_cmd_fn_get_gui_fw_version(RIG *pRig) int adat_cmd_fn_get_id_code(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_ID_CODE, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcIDCode = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcIDCode = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcIDCode = \"%s\"\n", - gFnLevel, pPriv->pcIDCode); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcIDCode = \"%s\"\n", + gFnLevel, pPriv->pcIDCode); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1904,46 +1913,46 @@ int adat_cmd_fn_get_id_code(RIG *pRig) int adat_cmd_fn_get_options(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_OPTIONS, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - pPriv->pcOptions = strdup(pPriv->pcResult); + if (nRC == RIG_OK) { + pPriv->pcOptions = strdup(pPriv->pcResult); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->pcOptions = \"%s\"\n", - gFnLevel, pPriv->pcOptions); - } - } - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->pcOptions = \"%s\"\n", + gFnLevel, pPriv->pcOptions); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -1953,44 +1962,44 @@ int adat_cmd_fn_get_options(RIG *pRig) int adat_cmd_fn_get_mode(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_MODE, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - nRC = adat_parse_mode(pPriv->pcResult, - &(pPriv->nRIGMode), - pPriv->acADATMode); - } - } - } + if (nRC == RIG_OK) { + nRC = adat_parse_mode(pPriv->pcResult, + &(pPriv->nRIGMode), + pPriv->acADATMode); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2000,56 +2009,56 @@ int adat_cmd_fn_get_mode(RIG *pRig) int adat_cmd_fn_set_mode(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - // Translate Mode from RIG Mode Nr to ADAT Mode Nr + // Translate Mode from RIG Mode Nr to ADAT Mode Nr - nRC = adat_mode_rnr2anr(pPriv->nRIGMode, &(pPriv->nADATMode)); + nRC = adat_mode_rnr2anr(pPriv->nRIGMode, &(pPriv->nADATMode)); - if (nRC == RIG_OK) { - // Prepare Command + if (nRC == RIG_OK) { + // Prepare Command - char acBuf[ ADAT_BUFSZ + 1 ]; + char acBuf[ ADAT_BUFSZ + 1 ]; - memset(acBuf, 0, ADAT_BUFSZ + 1); + memset(acBuf, 0, ADAT_BUFSZ + 1); - snprintf(acBuf, ADAT_BUFSZ, "%s%02d%s", - ADAT_CMD_DEF_STRING_SET_MODE, - (int) pPriv->nADATMode, - ADAT_EOM); + snprintf(acBuf, ADAT_BUFSZ, "%s%02d%s", + ADAT_CMD_DEF_STRING_SET_MODE, + (int) pPriv->nADATMode, + ADAT_EOM); - nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); + nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - // Execute Command + // Execute Command - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); - } - } - } + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2059,54 +2068,54 @@ int adat_cmd_fn_set_mode(RIG *pRig) int adat_cmd_fn_get_freq(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_FREQ, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - nRC = adat_parse_freq(pPriv->pcResult, - ADAT_FREQ_PARSE_MODE_WITH_VFO, - &(pPriv->nCurrentVFO), - &(pPriv->nFreq)); + if (nRC == RIG_OK) { + nRC = adat_parse_freq(pPriv->pcResult, + ADAT_FREQ_PARSE_MODE_WITH_VFO, + &(pPriv->nCurrentVFO), + &(pPriv->nFreq)); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pPriv->nCurrentVFO = %d, Freq [Hz] = %f\n", - gFnLevel, pPriv->nCurrentVFO, pPriv->nFreq); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d pPriv->nCurrentVFO = %d, Freq [Hz] = %f\n", + gFnLevel, pPriv->nCurrentVFO, pPriv->nFreq); - if (nRC == RIG_OK) { - nRC = adat_vfo_anr2rnr(pPriv->nCurrentVFO, - &(pPriv->nRIGVFONr)); - } - } - } - } + if (nRC == RIG_OK) { + nRC = adat_vfo_anr2rnr(pPriv->nCurrentVFO, + &(pPriv->nRIGVFONr)); + } + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2116,46 +2125,46 @@ int adat_cmd_fn_get_freq(RIG *pRig) int adat_cmd_fn_set_freq(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - char acBuf[ ADAT_BUFSZ + 1 ]; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + char acBuf[ ADAT_BUFSZ + 1 ]; - // Get frequency of selected VFO + // Get frequency of selected VFO - memset(acBuf, 0, ADAT_BUFSZ + 1); + memset(acBuf, 0, ADAT_BUFSZ + 1); - snprintf(acBuf, ADAT_BUFSZ, "%s%d%s", - ADAT_CMD_DEF_STRING_SET_FREQ, - (int) pPriv->nFreq, - ADAT_EOM); + snprintf(acBuf, ADAT_BUFSZ, "%s%d%s", + ADAT_CMD_DEF_STRING_SET_FREQ, + (int) pPriv->nFreq, + ADAT_EOM); - nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); + nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); - } - } + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2169,60 +2178,60 @@ int adat_cmd_fn_set_freq(RIG *pRig) int adat_cmd_fn_set_vfo(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - char acBuf[ ADAT_BUFSZ + 1 ]; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + char acBuf[ ADAT_BUFSZ + 1 ]; - // Switch on VFO + // Switch on VFO - memset(acBuf, 0, ADAT_BUFSZ + 1); + memset(acBuf, 0, ADAT_BUFSZ + 1); - snprintf(acBuf, ADAT_BUFSZ, ADAT_CMD_DEF_STRING_SWITCH_ON_VFO, - (int) pPriv->nCurrentVFO, - ADAT_EOM); + snprintf(acBuf, ADAT_BUFSZ, ADAT_CMD_DEF_STRING_SWITCH_ON_VFO, + (int) pPriv->nCurrentVFO, + ADAT_EOM); - nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); + nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - memset(acBuf, 0, ADAT_BUFSZ + 1); - snprintf(acBuf, ADAT_BUFSZ, - ADAT_CMD_DEF_STRING_SET_VFO_AS_MAIN_VFO, - (int) pPriv->nCurrentVFO, - ADAT_EOM); + if (nRC == RIG_OK) { + memset(acBuf, 0, ADAT_BUFSZ + 1); + snprintf(acBuf, ADAT_BUFSZ, + ADAT_CMD_DEF_STRING_SET_VFO_AS_MAIN_VFO, + (int) pPriv->nCurrentVFO, + ADAT_EOM); - nRC = adat_priv_set_cmd(pRig, acBuf, - ADAT_CMD_KIND_WITHOUT_RESULT); + nRC = adat_priv_set_cmd(pRig, acBuf, + ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); - } - } - } - } + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); + } + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2232,48 +2241,48 @@ int adat_cmd_fn_set_vfo(RIG *pRig) int adat_cmd_fn_get_ptt(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + nRC = adat_priv_set_cmd(pRig, + ADAT_CMD_DEF_STRING_GET_PTT, + ADAT_CMD_KIND_WITH_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); - if (nRC == RIG_OK) { - nRC = adat_parse_ptt(pPriv->pcResult, - &(pPriv->nADATPTTStatus)); + if (nRC == RIG_OK) { + nRC = adat_parse_ptt(pPriv->pcResult, + &(pPriv->nADATPTTStatus)); - if (nRC == RIG_OK) { - nRC = adat_ptt_anr2rnr(pPriv->nADATPTTStatus, - &(pPriv->nRIGPTTStatus)); - } - } - } - } + if (nRC == RIG_OK) { + nRC = adat_ptt_anr2rnr(pPriv->nADATPTTStatus, + &(pPriv->nRIGPTTStatus)); + } + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2283,69 +2292,69 @@ int adat_cmd_fn_get_ptt(RIG *pRig) int adat_cmd_fn_set_ptt(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - char acBuf[ ADAT_BUFSZ + 1 ]; - char *pcPTTStr = NULL; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + char acBuf[ ADAT_BUFSZ + 1 ]; + char *pcPTTStr = NULL; - memset(acBuf, 0, ADAT_BUFSZ + 1); + memset(acBuf, 0, ADAT_BUFSZ + 1); - // Switch PTT + // Switch PTT - switch (pPriv->nOpCode) { - case ADAT_OPCODE_PTT_SWITCH_ON: + switch (pPriv->nOpCode) { + case ADAT_OPCODE_PTT_SWITCH_ON: - pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; - nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_ON, - &(pPriv->nRIGPTTStatus)); - pcPTTStr = ADAT_CMD_PTT_STR_ON; - break; + pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; + nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_ON, + &(pPriv->nRIGPTTStatus)); + pcPTTStr = ADAT_CMD_PTT_STR_ON; + break; - case ADAT_OPCODE_PTT_SWITCH_OFF: - pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; - nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_OFF, - &(pPriv->nRIGPTTStatus)); - pcPTTStr = ADAT_CMD_PTT_STR_OFF; - break; + case ADAT_OPCODE_PTT_SWITCH_OFF: + pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; + nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_OFF, + &(pPriv->nRIGPTTStatus)); + pcPTTStr = ADAT_CMD_PTT_STR_OFF; + break; - default: - nRC = -RIG_EINVAL; - break; - } + default: + nRC = -RIG_EINVAL; + break; + } - if (nRC == RIG_OK) { - snprintf(acBuf, ADAT_BUFSZ, ADAT_CMD_DEF_STRING_SET_PTT, - pcPTTStr, - ADAT_EOM); + 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); + nRC = adat_priv_set_cmd(pRig, acBuf, ADAT_CMD_KIND_WITHOUT_RESULT); - if (nRC == RIG_OK) { - nRC = adat_get_single_cmd_result(pRig); - } - } - } + if (nRC == RIG_OK) { + nRC = adat_get_single_cmd_result(pRig); + } + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } @@ -2359,115 +2368,118 @@ int adat_cmd_fn_set_ptt(RIG *pRig) // commands of type adat_cmd_def_t . int adat_transaction(RIG *pRig, - adat_cmd_list_ptr pCmdList) + adat_cmd_list_ptr pCmdList) { - int nRC = RIG_OK; - int nFini = 0; // = 1 -> Stop executing commands + int nRC = RIG_OK; + int nFini = 0; // = 1 -> Stop executing commands - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - int nI = 0; - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): Nr of commands = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + pCmdList->nNrCmds); - while ((nRC == RIG_OK) && (nFini == 0) && (nI < pCmdList->nNrCmds)) { - adat_cmd_def_ptr pCmd = NULL; + while ((nRC == RIG_OK) && (nFini == 0) && (nI < pCmdList->nNrCmds)) { + adat_cmd_def_ptr pCmd = NULL; - pCmd = pCmdList->adat_cmds[ nI ]; + 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", - gFnLevel, __func__, __FILE__, __LINE__); - adat_print_cmd(pCmd); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d About to execute ADAT Command ... \n", + gFnLevel, __func__, __FILE__, __LINE__); + adat_print_cmd(pCmd); - // Execute Command + // Execute Command - if (pCmd->pfCmdFn != NULL) { - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d Calling function via fn ptr ... \n", - gFnLevel); - nRC = pCmd->pfCmdFn(pRig); - } else { - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d Sending command string ... \n", - gFnLevel); + if (pCmd->pfCmdFn != NULL) { + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d Calling function via fn ptr ... \n", + gFnLevel); + nRC = pCmd->pfCmdFn(pRig); + } else { + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d Sending command string ... \n", + gFnLevel); // TODO: Quell clang warning of conditional always evaluating to true. // if( pCmd->pacCmdStrs != NULL ) // { - int nJ = 0; + int nJ = 0; - if (pCmd->nNrCmdStrs > 0) { - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d pacCmdStrs[%d] = %s\n", - gFnLevel, nJ, pCmd->pacCmdStrs[ nJ ]); + 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)) { - nRC = adat_send(pRig, pCmd->pacCmdStrs[ nJ ]); + while ((nJ < pCmd->nNrCmdStrs) + && (nRC == RIG_OK) + && (pCmd->pacCmdStrs[ nJ ] != NULL)) { - if (nRC == RIG_OK) { - if (pCmd->nCmdKind == ADAT_CMD_KIND_WITH_RESULT) { - char acBuf[ ADAT_RESPSZ + 1 ]; + nRC = adat_send(pRig, pCmd->pacCmdStrs[ nJ ]); - memset(acBuf, 0, ADAT_RESPSZ + 1); + if (nRC == RIG_OK) { + if (pCmd->nCmdKind == ADAT_CMD_KIND_WITH_RESULT) { + char acBuf[ ADAT_RESPSZ + 1 ]; - nRC = adat_receive(pRig, acBuf); + memset(acBuf, 0, ADAT_RESPSZ + 1); - while ((nRC == RIG_OK) && - (strncmp(acBuf, ADAT_BOM, strlen(ADAT_BOM)) != 0)) { - nRC = adat_receive(pRig, acBuf); - } + nRC = adat_receive(pRig, acBuf); - pPriv->pcResult = strdup(acBuf); - } - } + while ((nRC == RIG_OK) + && (strncmp(acBuf, ADAT_BOM, + strlen(ADAT_BOM)) != 0)) { - nJ++; - } - } + nRC = adat_receive(pRig, acBuf); + } + + pPriv->pcResult = strdup(acBuf); + } + } + + nJ++; + } + } // } - } + } - if (nRC != RIG_OK) { - (void) adat_cmd_recover_from_error(pRig, nRC); - } + if (nRC != RIG_OK) { + (void) adat_cmd_recover_from_error(pRig, nRC); + } - nI++; - } else { - nFini = 1; - } + nI++; + } else { + nFini = 1; + } - // sleep between cmds - ADAT needs time to act upoon cmds + // sleep between cmds - ADAT needs time to act upoon cmds - usleep(ADAT_SLEEP_MICROSECONDS_BETWEEN_CMDS); - } - } + usleep(ADAT_SLEEP_MICROSECONDS_BETWEEN_CMDS); + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2477,52 +2489,52 @@ int adat_transaction(RIG *pRig, adat_priv_data_ptr adat_new_priv_data(RIG *pRig) { - int nRC = 0; - adat_priv_data_ptr pPriv = NULL; + int nRC = 0; + adat_priv_data_ptr pPriv = NULL; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig != NULL) { - // Init Priv Data + if (pRig != NULL) { + // Init Priv Data - pPriv = (adat_priv_data_ptr) calloc(sizeof(adat_priv_data_t), 1); + pPriv = (adat_priv_data_ptr) calloc(sizeof(adat_priv_data_t), 1); - if (pPriv != NULL) { - char acBuf[ ADAT_BUFSZ + 1 ]; - memset(acBuf, 0, ADAT_BUFSZ + 1); + if (pPriv != NULL) { + char acBuf[ ADAT_BUFSZ + 1 ]; + memset(acBuf, 0, ADAT_BUFSZ + 1); - // FIXME: pointless code at init time + // FIXME: pointless code at init time #if 0 - nRC = adat_get_conf(pRig, TOKEN_ADAT_PRODUCT_NAME, acBuf); + nRC = adat_get_conf(pRig, TOKEN_ADAT_PRODUCT_NAME, acBuf); - if (nRC == 0) { - pPriv->pcProductName = strdup(acBuf); + if (nRC == 0) { + pPriv->pcProductName = strdup(acBuf); - pRig->state.priv = (void *) pPriv; - } + pRig->state.priv = (void *) pPriv; + } #else - pRig->state.priv = (void *) pPriv; + pRig->state.priv = (void *) pPriv; #endif - } else { - nRC = -RIG_ENOMEM; - } - } else { - nRC = -RIG_EARG; - } + } else { + nRC = -RIG_ENOMEM; + } + } 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. RC = %d, pPriv = 0x%x\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC, pPriv); + gFnLevel--; - return pPriv; + return pPriv; } // --------------------------------------------------------------------------- @@ -2532,65 +2544,65 @@ adat_priv_data_ptr adat_new_priv_data(RIG *pRig) void adat_del_priv_data(adat_priv_data_t **ppPriv) { - int nRC = 0; + int nRC = 0; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: ppPrivData = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - ppPriv); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: ppPrivData = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + ppPriv); - if ((ppPriv != NULL) && (*ppPriv != NULL)) { - // Delete / Free Priv Data + if ((ppPriv != NULL) && (*ppPriv != NULL)) { + // Delete / Free Priv Data - if ((*ppPriv)->pcProductName != NULL) { - free((*ppPriv)->pcProductName); - } + if ((*ppPriv)->pcProductName != NULL) { + free((*ppPriv)->pcProductName); + } - if ((*ppPriv)->pcSerialNr != NULL) { - free((*ppPriv)->pcSerialNr); - } + if ((*ppPriv)->pcSerialNr != NULL) { + free((*ppPriv)->pcSerialNr); + } - if ((*ppPriv)->pcHWVersion != NULL) { - free((*ppPriv)->pcHWVersion); - } + if ((*ppPriv)->pcHWVersion != NULL) { + free((*ppPriv)->pcHWVersion); + } - if ((*ppPriv)->pcFWVersion != NULL) { - free((*ppPriv)->pcFWVersion); - } + if ((*ppPriv)->pcFWVersion != NULL) { + free((*ppPriv)->pcFWVersion); + } - if ((*ppPriv)->pcGUIFWVersion != NULL) { - free((*ppPriv)->pcGUIFWVersion); - } + if ((*ppPriv)->pcGUIFWVersion != NULL) { + free((*ppPriv)->pcGUIFWVersion); + } - if ((*ppPriv)->pcOptions != NULL) { - free((*ppPriv)->pcOptions); - } + if ((*ppPriv)->pcOptions != NULL) { + free((*ppPriv)->pcOptions); + } - if ((*ppPriv)->pcIDCode != NULL) { - free((*ppPriv)->pcIDCode); - } + if ((*ppPriv)->pcIDCode != NULL) { + free((*ppPriv)->pcIDCode); + } - if ((*ppPriv)->pcCallsign != NULL) { - free((*ppPriv)->pcCallsign); - } + if ((*ppPriv)->pcCallsign != NULL) { + free((*ppPriv)->pcCallsign); + } - // Free priv struct itself + // Free priv struct itself - free((*ppPriv)); - *ppPriv = NULL; - } else { - nRC = -RIG_EARG; - } + free((*ppPriv)); + *ppPriv = NULL; + } else { + nRC = -RIG_EARG; + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. RC = %d.\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. RC = %d.\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return; + return; }; // --------------------------------------------------------------------------- @@ -2600,40 +2612,40 @@ void adat_del_priv_data(adat_priv_data_t **ppPriv) int adat_init(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = NULL; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = NULL; - // Get new Priv Data + // Get new Priv Data - pPriv = adat_new_priv_data(pRig); + pPriv = adat_new_priv_data(pRig); - if (pPriv == NULL) { - nRC = -RIG_ENOMEM; - } - } + if (pPriv == NULL) { + nRC = -RIG_ENOMEM; + } + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2643,31 +2655,31 @@ int adat_init(RIG *pRig) int adat_cleanup(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - if (pRig->state.priv != NULL) { - adat_del_priv_data((adat_priv_data_t **) & (pRig->state.priv)); - pRig->state.priv = NULL; - } - } + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + if (pRig->state.priv != NULL) { + adat_del_priv_data((adat_priv_data_t **) & (pRig->state.priv)); + pRig->state.priv = NULL; + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2677,38 +2689,38 @@ int adat_cleanup(RIG *pRig) int adat_open(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - // grace period for the radio to be there + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + // grace period for the radio to be there - sleep(ADAT_SLEEP_AFTER_RIG_OPEN); + sleep(ADAT_SLEEP_AFTER_RIG_OPEN); - // Now get basic info from ADAT TRX + // Now get basic info from ADAT TRX - nRC = adat_transaction(pRig, &adat_cmd_list_open_adat); - } + nRC = adat_transaction(pRig, &adat_cmd_list_open_adat); + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2718,34 +2730,34 @@ int adat_open(RIG *pRig) int adat_close(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - // Now switch to interactive mode + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + // Now switch to interactive mode - nRC = adat_transaction(pRig, &adat_cmd_list_close_adat); - } + nRC = adat_transaction(pRig, &adat_cmd_list_close_adat); + } - // Done ! + // Done ! - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2755,43 +2767,43 @@ int adat_close(RIG *pRig) const char *adat_get_info(RIG *pRig) { - int nRC = RIG_OK; - static char acBuf[ 512 ]; + int nRC = RIG_OK; + static char acBuf[ 512 ]; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - memset(acBuf, 0, 512); + memset(acBuf, 0, 512); - if (pRig != NULL) { - nRC = adat_transaction(pRig, &adat_cmd_list_get_info); + if (pRig != NULL) { + nRC = adat_transaction(pRig, &adat_cmd_list_get_info); - if (nRC == RIG_OK) { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (nRC == RIG_OK) { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - snprintf(acBuf, 512, - "ADAT ADT-200A, Callsign: %s, S/N: %s, ID Code: %s, Options: %s, FW: %s, GUI FW: %s, HW: %s", - pPriv->pcCallsign, - pPriv->pcSerialNr, - pPriv->pcIDCode, - pPriv->pcOptions, - pPriv->pcFWVersion, - pPriv->pcGUIFWVersion, - pPriv->pcHWVersion); - } - } + snprintf(acBuf, 512, + "ADAT ADT-200A, Callsign: %s, S/N: %s, ID Code: %s, Options: %s, FW: %s, GUI FW: %s, HW: %s", + pPriv->pcCallsign, + pPriv->pcSerialNr, + pPriv->pcIDCode, + pPriv->pcOptions, + pPriv->pcFWVersion, + pPriv->pcGUIFWVersion, + pPriv->pcHWVersion); + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Value ='%s'\n", - gFnLevel, __func__, __FILE__, __LINE__, - acBuf); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Value ='%s'\n", + gFnLevel, __func__, __FILE__, __LINE__, + acBuf); + gFnLevel--; - return acBuf; + return acBuf; } // --------------------------------------------------------------------------- @@ -2801,34 +2813,34 @@ const char *adat_get_info(RIG *pRig) int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - pPriv->nFreq = freq; + pPriv->nFreq = freq; - nRC = adat_transaction(pRig, &adat_cmd_list_set_freq); - } + nRC = adat_transaction(pRig, &adat_cmd_list_set_freq); + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2838,34 +2850,34 @@ int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq) int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - nRC = adat_transaction(pRig, &adat_cmd_list_get_freq); + nRC = adat_transaction(pRig, &adat_cmd_list_get_freq); - *freq = pPriv->nFreq; - } + *freq = pPriv->nFreq; + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2875,31 +2887,31 @@ int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq) int adat_set_level(RIG *pRig, vfo_t vfo, setting_t level, value_t val) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2909,31 +2921,31 @@ int adat_set_level(RIG *pRig, vfo_t vfo, setting_t level, value_t val) int adat_get_level(RIG *pRig, vfo_t vfo, setting_t level, value_t *val) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2943,42 +2955,43 @@ int adat_get_level(RIG *pRig, vfo_t vfo, setting_t level, value_t *val) int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - pPriv->nRIGMode = mode; - nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO)); + pPriv->nRIGMode = mode; + nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO)); - if (width != RIG_PASSBAND_NOCHANGE) { - if (width == RIG_PASSBAND_NORMAL) - width = rig_passband_normal(pRig, mode); + if (width != RIG_PASSBAND_NOCHANGE) { + if (width == RIG_PASSBAND_NORMAL) { + width = rig_passband_normal(pRig, mode); + } - pPriv->nWidth = width; - } + pPriv->nWidth = width; + } - nRC = adat_transaction(pRig, &adat_cmd_list_set_mode); - } + nRC = adat_transaction(pRig, &adat_cmd_list_set_mode); + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -2988,37 +3001,37 @@ int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width) int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - nRC = adat_transaction(pRig, &adat_cmd_list_get_mode); + nRC = adat_transaction(pRig, &adat_cmd_list_get_mode); - if (nRC == RIG_OK) { - *mode = pPriv->nRIGMode; - *width = pPriv->nWidth; - } - } + if (nRC == RIG_OK) { + *mode = pPriv->nRIGMode; + *width = pPriv->nWidth; + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3028,34 +3041,34 @@ int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) int adat_get_vfo(RIG *pRig, vfo_t *vfo) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - nRC = adat_transaction(pRig, &adat_cmd_list_get_vfo); + nRC = adat_transaction(pRig, &adat_cmd_list_get_vfo); - *vfo = pPriv->nRIGVFONr; - } + *vfo = pPriv->nRIGVFONr; + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3065,36 +3078,36 @@ int adat_get_vfo(RIG *pRig, vfo_t *vfo) int adat_set_vfo(RIG *pRig, vfo_t vfo) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO)); + nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO)); - if (nRC == RIG_OK) { - nRC = adat_transaction(pRig, &adat_cmd_list_set_vfo); - } - } + 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3104,34 +3117,34 @@ int adat_set_vfo(RIG *pRig, vfo_t vfo) int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - nRC = adat_transaction(pRig, &adat_cmd_list_get_ptt); + nRC = adat_transaction(pRig, &adat_cmd_list_get_ptt); - *ptt = pPriv->nRIGPTTStatus; - } + *ptt = pPriv->nRIGPTTStatus; + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3141,48 +3154,48 @@ int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt) int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - switch (ptt) { - case RIG_PTT_ON: - pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_ON; - break; + switch (ptt) { + case RIG_PTT_ON: + pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_ON; + break; - case RIG_PTT_OFF: - pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_OFF; - break; + case RIG_PTT_OFF: + pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_OFF; + break; - default: - nRC = -RIG_EINVAL; - break; - } + default: + nRC = -RIG_EINVAL; + break; + } - if (nRC == RIG_OK) { - nRC = adat_transaction(pRig, &adat_cmd_list_set_ptt); - } - } + 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3191,32 +3204,32 @@ int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt) // Status: RELEASED int adat_power2mW(RIG *pRig, unsigned int *mwpower, float power, - freq_t freq, rmode_t mode) + freq_t freq, rmode_t mode) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if ((pRig == NULL) || (mwpower == NULL)) { - nRC = -RIG_EARG; - } else { - *mwpower = power * ADAT_MAX_POWER_IN_mW; - } + if ((pRig == NULL) || (mwpower == NULL)) { + nRC = -RIG_EARG; + } 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3225,32 +3238,32 @@ int adat_power2mW(RIG *pRig, unsigned int *mwpower, float power, // Status: RELEASED int adat_mW2power(RIG *pRig, float *power, unsigned int mwpower, - freq_t freq, rmode_t mode) + freq_t freq, rmode_t mode) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if ((pRig == NULL) || (power == NULL)) { - nRC = -RIG_EARG; - } else { - *power = mwpower / ((float)ADAT_MAX_POWER_IN_mW); - } + if ((pRig == NULL) || (power == NULL)) { + nRC = -RIG_EARG; + } 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3260,41 +3273,41 @@ int adat_mW2power(RIG *pRig, float *power, unsigned int mwpower, int adat_get_powerstat(RIG *pRig, powerstat_t *status) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - nRC = adat_transaction(pRig, &adat_cmd_list_get_powerstatus); + nRC = adat_transaction(pRig, &adat_cmd_list_get_powerstatus); - // nRC < 0 -> Power is off. + // nRC < 0 -> Power is off. - if (nRC == RIG_OK) { - *status = RIG_POWER_ON; - } else { - *status = RIG_POWER_OFF; - nRC = RIG_OK; - } - } + if (nRC == RIG_OK) { + *status = RIG_POWER_ON; + } else { + *status = RIG_POWER_OFF; + nRC = RIG_OK; + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } @@ -3305,39 +3318,39 @@ int adat_get_powerstat(RIG *pRig, powerstat_t *status) int adat_set_conf(RIG *pRig, token_t token, const char *val) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - switch (token) { - case TOKEN_ADAT_PRODUCT_NAME: - pPriv->pcProductName = strdup(val); - break; + switch (token) { + case TOKEN_ADAT_PRODUCT_NAME: + pPriv->pcProductName = strdup(val); + break; - default: - nRC = -RIG_EINVAL; - } - } + default: + nRC = -RIG_EINVAL; + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3347,39 +3360,39 @@ int adat_set_conf(RIG *pRig, token_t token, const char *val) int adat_get_conf(RIG *pRig, token_t token, char *val) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - switch (token) { - case TOKEN_ADAT_PRODUCT_NAME: - val = pPriv->pcProductName; - break; + switch (token) { + case TOKEN_ADAT_PRODUCT_NAME: + val = pPriv->pcProductName; + break; - default: - nRC = -RIG_EINVAL; - } - } + default: + nRC = -RIG_EINVAL; + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3389,31 +3402,31 @@ int adat_get_conf(RIG *pRig, token_t token, char *val) int adat_reset(RIG *pRig, reset_t reset) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + if (pRig == NULL) { + nRC = -RIG_EARG; + } 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--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3423,38 +3436,38 @@ int adat_reset(RIG *pRig, reset_t reset) int adat_handle_event(RIG *pRig) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", - gFnLevel, __func__, __FILE__, __LINE__, - pRig); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = 0x%08x\n", + gFnLevel, __func__, __FILE__, __LINE__, + pRig); - // Check Params + // Check Params - if (pRig == NULL) { - nRC = -RIG_EARG; - } else { - //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; - char acBuf[ ADAT_RESPSZ + 1 ]; + if (pRig == NULL) { + nRC = -RIG_EARG; + } else { + //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; + char acBuf[ ADAT_RESPSZ + 1 ]; - memset(acBuf, 0, ADAT_RESPSZ + 1); - adat_receive(pRig, acBuf); + memset(acBuf, 0, ADAT_RESPSZ + 1); + adat_receive(pRig, acBuf); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d Event data = \"%s\"\n", - gFnLevel, acBuf); - } + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d Event data = \"%s\"\n", + gFnLevel, acBuf); + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } @@ -3465,28 +3478,28 @@ int adat_handle_event(RIG *pRig) DECLARE_INITRIG_BACKEND(adat) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; #if 0 - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY.\n", - gFnLevel, __func__, __FILE__, __LINE__); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY.\n", + gFnLevel, __func__, __FILE__, __LINE__); #endif - rig_register(&adt_200a_caps); + rig_register(&adt_200a_caps); #if 0 - rig_debug(RIG_DEBUG_VERBOSE, "ADAT: Rig ADT-200A registered.\n"); + rig_debug(RIG_DEBUG_VERBOSE, "ADAT: Rig ADT-200A registered.\n"); - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); #endif - gFnLevel--; + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- @@ -3496,58 +3509,60 @@ DECLARE_INITRIG_BACKEND(adat) DECLARE_PROBERIG_BACKEND(adat) { - int nRC = RIG_OK; + int nRC = RIG_OK; - gFnLevel++; + gFnLevel++; - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): ENTRY.\n", - gFnLevel, __func__, __FILE__, __LINE__); + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): ENTRY.\n", + gFnLevel, __func__, __FILE__, __LINE__); - if (!port) - return RIG_MODEL_NONE; + if (!port) { + return RIG_MODEL_NONE; + } - if (port->type.rig != RIG_PORT_SERIAL) - return RIG_MODEL_NONE; + if (port->type.rig != RIG_PORT_SERIAL) { + return RIG_MODEL_NONE; + } - port->write_delay = port->post_write_delay = 10; - port->parm.serial.stop_bits = 0; - port->retry = 1; + port->write_delay = port->post_write_delay = 10; + port->parm.serial.stop_bits = 0; + port->retry = 1; - nRC = serial_open(port); + nRC = serial_open(port); - if (nRC != RIG_OK) { - nRC = RIG_MODEL_NONE; - } else { - char acBuf[ ADAT_RESPSZ + 1 ]; - int nRead = 0; + if (nRC != RIG_OK) { + nRC = RIG_MODEL_NONE; + } else { + char acBuf[ ADAT_RESPSZ + 1 ]; + int nRead = 0; - memset(acBuf, 0, ADAT_RESPSZ + 1); + memset(acBuf, 0, ADAT_RESPSZ + 1); - nRC = write_block(port, - ADAT_CMD_DEF_STRING_GET_ID_CODE, - strlen(ADAT_CMD_DEF_STRING_GET_ID_CODE)); - nRead = read_string(port, acBuf, ADAT_RESPSZ, ADAT_EOM, 1); - close(port->fd); + nRC = write_block(port, + ADAT_CMD_DEF_STRING_GET_ID_CODE, + strlen(ADAT_CMD_DEF_STRING_GET_ID_CODE)); + nRead = read_string(port, acBuf, ADAT_RESPSZ, ADAT_EOM, 1); + close(port->fd); - if ((nRC != RIG_OK || nRead < 0)) { - nRC = RIG_MODEL_NONE; - } else { - rig_debug(RIG_DEBUG_VERBOSE, "ADAT: %d Received ID = %s.", - gFnLevel, acBuf); + if ((nRC != RIG_OK || nRead < 0)) { + nRC = RIG_MODEL_NONE; + } else { + rig_debug(RIG_DEBUG_VERBOSE, "ADAT: %d Received ID = %s.", + gFnLevel, acBuf); - nRC = RIG_MODEL_ADT_200A; - } - } + nRC = RIG_MODEL_ADT_200A; + } + } - rig_debug(RIG_DEBUG_TRACE, - "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", - gFnLevel, __func__, __FILE__, __LINE__, - nRC); - gFnLevel--; + rig_debug(RIG_DEBUG_TRACE, + "*** ADAT: %d %s (%s:%d): EXIT. Return Code = %d\n", + gFnLevel, __func__, __FILE__, __LINE__, + nRC); + gFnLevel--; - return nRC; + return nRC; } // --------------------------------------------------------------------------- diff --git a/adat/adat.h b/adat/adat.h index 6f1ab0a95..6df5d09bc 100644 --- a/adat/adat.h +++ b/adat/adat.h @@ -34,7 +34,7 @@ // HAMLIB INCLUDES // --------------------------------------------------------------------------- -#include "hamlib/rig.h" +#include // --------------------------------------------------------------------------- // GLOBAL DEFINITIONS @@ -329,8 +329,7 @@ // ADAT PRIVATE DATA // --------------------------------------------------------------------------- -typedef struct _adat_priv_data -{ +typedef struct _adat_priv_data { int nOpCode; char *pcProductName; // Future use (USB direct I/O) @@ -351,15 +350,15 @@ typedef struct _adat_priv_data int nCurrentVFO; vfo_t nRIGVFONr; - freq_t nFreq; + freq_t nFreq; char acRXFreq[ ADAT_BUFSZ ]; char acTXFreq[ ADAT_BUFSZ ]; - rmode_t nRIGMode; + rmode_t nRIGMode; char acADATMode[ ADAT_MODE_LENGTH + 1 ]; int nADATMode; - pbwidth_t nWidth; + pbwidth_t nWidth; int nADATPTTStatus; ptt_t nRIGPTTStatus; @@ -368,10 +367,10 @@ typedef struct _adat_priv_data value_t mNB1; value_t mNB2; - value_t mAGC; - value_t mRFGain; - value_t mIFShift; - value_t mRawStr; + value_t mAGC; + value_t mRFGain; + value_t mIFShift; + value_t mRawStr; // ADAT Command-related Values @@ -389,7 +388,7 @@ typedef struct _adat_priv_data // --------------------------------------------------------------------------- typedef unsigned long long adat_cmd_id_t; // Bit mask for commands. Each command -// is represented by 1 bit. + // is represented by 1 bit. // adat_cmd_def : ADAT COMMAND DEFINITION. // Basic idea: Each command can be made of several strings to be sent @@ -398,38 +397,34 @@ 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. + // 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 - int (*pfCmdFn)( RIG *pRig ); // Fn to be called to execute this cmd + int (*pfCmdFn)(RIG *pRig); // Fn to be called to execute this cmd int nNrCmdStrs; // Oh my, C as a language ... I'd love to - // switch to Common Lisp ... What a hack here ... + // switch to Common Lisp ... What a hack here ... char *pacCmdStrs[]; // Commands to be executed if no CmdFn given } 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[]; @@ -440,8 +435,7 @@ 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 @@ -449,8 +443,7 @@ typedef enum // ADAT MODE DEFINITION -typedef struct _adat_mode_def -{ +typedef struct _adat_mode_def { char *pcADATModeStr; rmode_t nRIGMode; int nADATMode; @@ -458,8 +451,7 @@ 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 ]; @@ -469,8 +461,7 @@ 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; @@ -478,8 +469,7 @@ 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 ]; @@ -493,102 +483,102 @@ typedef struct _adat_vfo_list // Helper functions -size_t trimwhitespace( char *, size_t, const char * ); -int adat_print_cmd( adat_cmd_def_ptr ); +size_t trimwhitespace(char *, size_t, const char *); +int adat_print_cmd(adat_cmd_def_ptr); -int adat_parse_freq( char *, adat_freq_parse_mode_t, int *, freq_t * ); +int adat_parse_freq(char *, adat_freq_parse_mode_t, int *, freq_t *); -int adat_parse_mode( char *, rmode_t *, char * ); -int adat_mode_rnr2anr( rmode_t, int * ); -int adat_mode_anr2rnr( int, rmode_t * ); +int adat_parse_mode(char *, rmode_t *, char *); +int adat_mode_rnr2anr(rmode_t, int *); +int adat_mode_anr2rnr(int, rmode_t *); -int adat_parse_vfo( char *, vfo_t *, int * ); -int adat_vfo_rnr2anr( vfo_t, int * ); -int adat_vfo_anr2rnr( int, vfo_t * ); +int adat_parse_vfo(char *, vfo_t *, int *); +int adat_vfo_rnr2anr(vfo_t, int *); +int adat_vfo_anr2rnr(int, vfo_t *); -int adat_parse_ptt( char *, int * ); -int adat_ptt_rnr2anr( ptt_t, int * ); -int adat_ptt_anr2rnr( int, ptt_t * ); +int adat_parse_ptt(char *, int *); +int adat_ptt_rnr2anr(ptt_t, int *); +int adat_ptt_anr2rnr(int, ptt_t *); -int adat_send( RIG *, char * ); -int adat_receive( RIG *, char * ); +int adat_send(RIG *, char *); +int adat_receive(RIG *, char *); -int adat_priv_set_cmd( RIG *, char *, int ); -int adat_priv_set_result( RIG *, char * ); -int adat_priv_clear_result( RIG * ); +int adat_priv_set_cmd(RIG *, char *, int); +int adat_priv_set_result(RIG *, char *); +int adat_priv_clear_result(RIG *); -int adat_get_single_cmd_result( RIG * ); +int adat_get_single_cmd_result(RIG *); -int adat_cmd_recover_from_error( RIG *, int ); +int adat_cmd_recover_from_error(RIG *, int); -int adat_transaction( RIG *, adat_cmd_list_ptr ); +int adat_transaction(RIG *, adat_cmd_list_ptr); -adat_priv_data_ptr adat_new_priv_data( RIG * ); -void adat_del_priv_data( adat_priv_data_t ** ); +adat_priv_data_ptr adat_new_priv_data(RIG *); +void adat_del_priv_data(adat_priv_data_t **); // Command implementation -int adat_cmd_fn_get_serial_nr( RIG * ); -int adat_cmd_fn_get_fw_version( RIG * ); -int adat_cmd_fn_get_hw_version( RIG * ); -int adat_cmd_fn_get_gui_fw_version( RIG * ); -int adat_cmd_fn_get_id_code( RIG * ); -int adat_cmd_fn_get_options( RIG * ); +int adat_cmd_fn_get_serial_nr(RIG *); +int adat_cmd_fn_get_fw_version(RIG *); +int adat_cmd_fn_get_hw_version(RIG *); +int adat_cmd_fn_get_gui_fw_version(RIG *); +int adat_cmd_fn_get_id_code(RIG *); +int adat_cmd_fn_get_options(RIG *); -int adat_cmd_fn_set_callsign( RIG * ); -int adat_cmd_fn_get_callsign( RIG * ); +int adat_cmd_fn_set_callsign(RIG *); +int adat_cmd_fn_get_callsign(RIG *); -int adat_cmd_fn_set_freq( RIG * ); -int adat_cmd_fn_get_freq( RIG * ); +int adat_cmd_fn_set_freq(RIG *); +int adat_cmd_fn_get_freq(RIG *); -int adat_cmd_fn_get_mode( RIG * ); -int adat_cmd_fn_set_mode( RIG * ); +int adat_cmd_fn_get_mode(RIG *); +int adat_cmd_fn_set_mode(RIG *); -int adat_cmd_fn_get_vfo( RIG * ); -int adat_cmd_fn_set_vfo( RIG * ); +int adat_cmd_fn_get_vfo(RIG *); +int adat_cmd_fn_set_vfo(RIG *); -int adat_cmd_fn_get_ptt( RIG * ); -int adat_cmd_fn_set_ptt( RIG * ); +int adat_cmd_fn_get_ptt(RIG *); +int adat_cmd_fn_set_ptt(RIG *); // --------------------------------------------------------------------------- // ADAT FUNCTION DECLARATIONS // --------------------------------------------------------------------------- -int adat_init( RIG * ); -int adat_cleanup( RIG * ); -int adat_reset( RIG *, reset_t ); -int adat_open( RIG * ); -int adat_close( RIG * ); +int adat_init(RIG *); +int adat_cleanup(RIG *); +int adat_reset(RIG *, reset_t); +int adat_open(RIG *); +int adat_close(RIG *); -int adat_set_conf( RIG *, token_t, const char *val ); -int adat_get_conf( RIG *, token_t, char *val ); +int adat_set_conf(RIG *, token_t, const char *val); +int adat_get_conf(RIG *, token_t, char *val); -int adat_set_freq( RIG *, vfo_t, freq_t ); -int adat_get_freq( RIG *, vfo_t, freq_t * ); +int adat_set_freq(RIG *, vfo_t, freq_t); +int adat_get_freq(RIG *, vfo_t, freq_t *); -int adat_set_vfo( RIG *, vfo_t ); -int adat_get_vfo( RIG *, vfo_t * ); +int adat_set_vfo(RIG *, vfo_t); +int adat_get_vfo(RIG *, vfo_t *); -int adat_set_ptt( RIG *, vfo_t, ptt_t ); -int adat_get_ptt( RIG *, vfo_t, ptt_t * ); +int adat_set_ptt(RIG *, vfo_t, ptt_t); +int adat_get_ptt(RIG *, vfo_t, ptt_t *); -int adat_set_mode( RIG *, vfo_t, rmode_t, pbwidth_t ); -int adat_get_mode( RIG *, vfo_t, rmode_t *, pbwidth_t * ); +int adat_set_mode(RIG *, vfo_t, rmode_t, pbwidth_t); +int adat_get_mode(RIG *, vfo_t, rmode_t *, pbwidth_t *); -int adat_set_func( RIG *, vfo_t, setting_t func, int ); -int adat_get_func( RIG *, vfo_t, setting_t func, int * ); +int adat_set_func(RIG *, vfo_t, setting_t func, int); +int adat_get_func(RIG *, vfo_t, setting_t func, int *); -int adat_set_level( RIG *, vfo_t, setting_t level, value_t ); -int adat_get_level( RIG *, vfo_t, setting_t level, value_t * ); +int adat_set_level(RIG *, vfo_t, setting_t level, value_t); +int adat_get_level(RIG *, vfo_t, setting_t level, value_t *); -int adat_handle_event( RIG * ); +int adat_handle_event(RIG *); -const char * adat_get_info( RIG * ); +const char *adat_get_info(RIG *); -int adat_mW2power( RIG *, float *, unsigned int, freq_t, rmode_t ); -int adat_power2mW( RIG *, unsigned int *, float, freq_t, rmode_t ); +int adat_mW2power(RIG *, float *, unsigned int, freq_t, rmode_t); +int adat_power2mW(RIG *, unsigned int *, float, freq_t, rmode_t); -int adat_get_powerstat( RIG *, powerstat_t * ); +int adat_get_powerstat(RIG *, powerstat_t *); extern const struct rig_caps adt_200a_caps; diff --git a/adat/adt_200a.c b/adat/adt_200a.c index d4e17bec6..da5d02abf 100644 --- a/adat/adt_200a.c +++ b/adat/adt_200a.c @@ -23,7 +23,7 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif // --------------------------------------------------------------------------- @@ -53,8 +53,7 @@ // 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", @@ -134,35 +133,35 @@ const struct rig_caps adt_200a_caps = .filters = { - { RIG_MODE_CW|RIG_MODE_CWR, Hz(50) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(75) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(100) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(150) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(200) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(300) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(750) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(1000) }, - { RIG_MODE_CW|RIG_MODE_CWR, Hz(1200) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(300) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(500) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(750) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(1000) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(1200) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(1500) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(1800) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(2000) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(2200) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(2400) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(2700) }, - { RIG_MODE_LSB|RIG_MODE_USB, Hz(3500) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(3000) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(3500) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(4000) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(4500) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(5000) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(6000) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(7000) }, - { RIG_MODE_AM|RIG_MODE_SAL|RIG_MODE_SAH, Hz(8000) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(50) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(75) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(100) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(150) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(200) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(300) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(750) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(1000) }, + { RIG_MODE_CW | RIG_MODE_CWR, Hz(1200) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(300) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(500) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(750) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(1000) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(1200) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(1500) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(1800) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(2000) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(2200) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(2400) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(2700) }, + { RIG_MODE_LSB | RIG_MODE_USB, Hz(3500) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(3000) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(3500) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(4000) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(4500) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(5000) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(6000) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(7000) }, + { RIG_MODE_AM | RIG_MODE_SAL | RIG_MODE_SAH, Hz(8000) }, { RIG_MODE_FM, Hz(6000) }, { RIG_MODE_FM, Hz(7000) }, { RIG_MODE_FM, Hz(8000) }, diff --git a/adat/adt_200a.h b/adat/adt_200a.h index 392813c49..403fc8f50 100644 --- a/adat/adt_200a.h +++ b/adat/adt_200a.h @@ -35,20 +35,20 @@ // ADT-200A USB DEFINITIONS // --------------------------------------------------------------------------- -#define ADT_200A_VENDOR_ID 0x0403 +#define ADT_200A_VENDOR_ID 0x0403 #define ADT_200A_PRODUCT_ID 0x6001 -#define ADT_200A_VENDOR_NAME "FTDI" -#define ADT_200A_PRODUCT_NAME "TRX3C Serial C945D5B" +#define ADT_200A_VENDOR_NAME "FTDI" +#define ADT_200A_PRODUCT_NAME "TRX3C Serial C945D5B" #define ADT_200A_USB_INTERFACE_NR 0x00 #define ADT_200A_USB_CONFIGURATION_VALUE 0x01 #define ADT_200A_ALTERNATE_SETTIMG 0x00 -#define ADT_200A_USB_INPUT_ENDPOINT 0x81 +#define ADT_200A_USB_INPUT_ENDPOINT 0x81 #define ADT_200A_USB_INPUT_MAX_PACKET_SIZE 64 -#define ADT_200A_USB_OUTPUT_ENDPOINT b0x02 +#define ADT_200A_USB_OUTPUT_ENDPOINT b0x02 #define ADT_200A_USB_OUTPUT_MAX_PACKET_SIZE 64 // ---------------------------------------------------------------------------