diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c index 9eef46193..46860bd3d 100644 --- a/tests/dumpcaps.c +++ b/tests/dumpcaps.c @@ -3,9 +3,6 @@ * This programs dumps the capabilities of a backend rig. * * - * $Id: dumpcaps.c,v 1.52 2009-01-28 22:49:58 fillods Exp $ - * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -129,7 +126,7 @@ int dumpcaps (RIG* rig, FILE *fout) fprintf(fout, "Rig capable\n"); break; case RIG_DCD_PARALLEL: - fprintf(fout, "Parallel port (DATA1? STROBE?)\n"); + fprintf(fout, "Parallel port (/STROBE)\n"); break; case RIG_DCD_SERIAL_CTS: fprintf(fout, "Serial port (CTS/RTS)\n"); @@ -152,6 +149,14 @@ int dumpcaps (RIG* rig, FILE *fout) switch (caps->port_type) { case RIG_PORT_SERIAL: fprintf(fout, "RS-232\n"); + fprintf(fout, "Serial speed: %d..%d bauds, %d%c%d %s\n", caps->serial_rate_min, + caps->serial_rate_max, caps->serial_data_bits, + caps->serial_parity == RIG_PARITY_NONE ? 'N': + (caps->serial_parity == RIG_PARITY_ODD ? 'O' : 'E'), + caps->serial_stop_bits, + caps->serial_handshake == RIG_HANDSHAKE_NONE ? "" : + (caps->serial_handshake == RIG_HANDSHAKE_XONXOFF ? "XONXOFF" : "CTS/RTS") + ); break; case RIG_PORT_PARALLEL: fprintf(fout, "Parallel\n"); @@ -173,15 +178,6 @@ int dumpcaps (RIG* rig, FILE *fout) backend_warnings++; } - fprintf(fout, "Serial speed: %d..%d bauds, %d%c%d %s\n", caps->serial_rate_min, - caps->serial_rate_max, caps->serial_data_bits, - caps->serial_parity == RIG_PARITY_NONE ? 'N': - (caps->serial_parity == RIG_PARITY_ODD ? 'O' : 'E'), - caps->serial_stop_bits, - caps->serial_handshake == RIG_HANDSHAKE_NONE ? "" : - (caps->serial_handshake == RIG_HANDSHAKE_XONXOFF ? "XONXOFF" : "CTS/RTS") - ); - fprintf(fout, "Write delay: %dms, timeout %dms, %d retry\n", caps->write_delay, caps->timeout, caps->retry); fprintf(fout, "Post Write delay: %dms\n", diff --git a/tests/dumpcaps_rot.c b/tests/dumpcaps_rot.c index b0ef43b6c..4809a3830 100644 --- a/tests/dumpcaps_rot.c +++ b/tests/dumpcaps_rot.c @@ -1,11 +1,8 @@ /* - * dumpcaps_rot.c - Copyright (C) 2000-2009 Stephane Fillod + * dumpcaps_rot.c - Copyright (C) 2000-2010 Stephane Fillod * This programs dumps the capabilities of a backend rig. * * - * $Id: dumpcaps_rot.c,v 1.52 2009-01-28 22:49:58 fillods Exp $ - * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -79,6 +76,14 @@ int dumpcaps_rot (ROT* rot, FILE *fout) switch (caps->port_type) { case RIG_PORT_SERIAL: fprintf(fout, "RS-232\n"); + fprintf(fout, "Serial speed:\t\t%d..%d bauds, %d%c%d%s\n", caps->serial_rate_min, + caps->serial_rate_max, caps->serial_data_bits, + caps->serial_parity == RIG_PARITY_NONE ? 'N': + (caps->serial_parity == RIG_PARITY_ODD ? 'O' : 'E'), + caps->serial_stop_bits, + caps->serial_handshake == RIG_HANDSHAKE_NONE ? "" : + (caps->serial_handshake == RIG_HANDSHAKE_XONXOFF ? " XONXOFF" : " CTS/RTS") + ); break; case RIG_PORT_PARALLEL: fprintf(fout, "Parallel\n"); @@ -100,15 +105,6 @@ int dumpcaps_rot (ROT* rot, FILE *fout) backend_warnings++; } - fprintf(fout, "Serial speed:\t\t%d..%d bauds, %d%c%d%s\n", caps->serial_rate_min, - caps->serial_rate_max, caps->serial_data_bits, - caps->serial_parity == RIG_PARITY_NONE ? 'N': - (caps->serial_parity == RIG_PARITY_ODD ? 'O' : 'E'), - caps->serial_stop_bits, - caps->serial_handshake == RIG_HANDSHAKE_NONE ? "" : - (caps->serial_handshake == RIG_HANDSHAKE_XONXOFF ? " XONXOFF" : " CTS/RTS") - ); - fprintf(fout, "Write delay:\t\t%dmS, timeout %dmS, %d retr%s\n", caps->write_delay, caps->timeout, caps->retry, (caps->retry == 1) ? "y" : "ies"); fprintf(fout, "Post Write delay:\t%dmS\n",