From c17b5da379f61292df5fc221b5b495f33276f91c Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Thu, 20 Jul 2023 11:12:24 -0500 Subject: [PATCH] Move serial_cfg_params to common inlude fill as it is applicate to all serial devices --- src/amp_conf.c | 29 ++--------------------------- src/conf.c | 39 +-------------------------------------- src/rot_conf.c | 28 +--------------------------- src/serial_cfg_params.h | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 92 deletions(-) create mode 100644 src/serial_cfg_params.h diff --git a/src/amp_conf.c b/src/amp_conf.c index 9651f5238..9f07cb27b 100644 --- a/src/amp_conf.c +++ b/src/amp_conf.c @@ -77,34 +77,9 @@ static const struct confparams ampfrontend_cfg_params[] = static const struct confparams ampfrontend_serial_cfg_params[] = { - { - TOK_SERIAL_SPEED, "serial_speed", "Serial speed", - "Serial port baud rate", - "0", RIG_CONF_NUMERIC, { .n = { 300, 115200, 1 } } - }, - { - TOK_DATA_BITS, "data_bits", "Serial data bits", - "Serial port data bits", - "8", RIG_CONF_NUMERIC, { .n = { 5, 8, 1 } } - }, - { - TOK_STOP_BITS, "stop_bits", "Serial stop bits", - "Serial port stop bits", - "1", RIG_CONF_NUMERIC, { .n = { 0, 3, 1 } } - }, - { - TOK_PARITY, "serial_parity", "Serial parity", - "Serial port parity", - "None", RIG_CONF_COMBO, { .c = {{ "None", "Odd", "Even", "Mark", "Space", NULL }} } - }, - { - TOK_HANDSHAKE, "serial_handshake", "Serial handshake", - "Serial port handshake", - "None", RIG_CONF_COMBO, { .c = {{ "None", "XONXOFF", "Hardware", NULL }} } - }, - - { RIG_CONF_END, NULL, } +#include "serial_cfg_params.h" }; + /** @} */ /* amplifier definitions */ diff --git a/src/conf.c b/src/conf.c index 831fdc5d8..cc9291e3a 100644 --- a/src/conf.c +++ b/src/conf.c @@ -197,44 +197,7 @@ static const struct confparams frontend_cfg_params[] = static const struct confparams frontend_serial_cfg_params[] = { - { - TOK_SERIAL_SPEED, "serial_speed", "Serial speed", - "Serial port baud rate", - "0", RIG_CONF_NUMERIC, { .n = { 300, 115200, 1 } } - }, - { - TOK_DATA_BITS, "data_bits", "Serial data bits", - "Serial port data bits", - "8", RIG_CONF_NUMERIC, { .n = { 5, 8, 1 } } - }, - { - TOK_STOP_BITS, "stop_bits", "Serial stop bits", - "Serial port stop bits", - "1", RIG_CONF_NUMERIC, { .n = { 0, 3, 1 } } - }, - { - TOK_PARITY, "serial_parity", "Serial parity", - "Serial port parity", - "None", RIG_CONF_COMBO, { .c = {{ "None", "Odd", "Even", "Mark", "Space", NULL }} } - }, - { - TOK_HANDSHAKE, "serial_handshake", "Serial handshake", - "Serial port handshake", - "None", RIG_CONF_COMBO, { .c = {{ "None", "XONXOFF", "Hardware", NULL }} } - }, - - { - TOK_RTS_STATE, "rts_state", "RTS state", - "Serial port set state of RTS signal for external powering", - "Unset", RIG_CONF_COMBO, { .c = {{ "Unset", "ON", "OFF", NULL }} } - }, - { - TOK_DTR_STATE, "dtr_state", "DTR state", - "Serial port set state of DTR signal for external powering", - "Unset", RIG_CONF_COMBO, { .c = {{ "Unset", "ON", "OFF", NULL }} } - }, - - { RIG_CONF_END, NULL, } +#include "serial_cfg_params.h" }; diff --git a/src/rot_conf.c b/src/rot_conf.c index 8a7f6a7d7..73c147d19 100644 --- a/src/rot_conf.c +++ b/src/rot_conf.c @@ -110,33 +110,7 @@ static const struct confparams rotfrontend_cfg_params[] = static const struct confparams rotfrontend_serial_cfg_params[] = { - { - TOK_SERIAL_SPEED, "serial_speed", "Serial speed", - "Serial port baud rate", - "0", RIG_CONF_NUMERIC, { .n = { 300, 115200, 1 } } - }, - { - TOK_DATA_BITS, "data_bits", "Serial data bits", - "Serial port data bits", - "8", RIG_CONF_NUMERIC, { .n = { 5, 8, 1 } } - }, - { - TOK_STOP_BITS, "stop_bits", "Serial stop bits", - "Serial port stop bits", - "1", RIG_CONF_NUMERIC, { .n = { 0, 3, 1 } } - }, - { - TOK_PARITY, "serial_parity", "Serial parity", - "Serial port parity", - "None", RIG_CONF_COMBO, { .c = {{ "None", "Odd", "Even", "Mark", "Space", NULL }} } - }, - { - TOK_HANDSHAKE, "serial_handshake", "Serial handshake", - "Serial port handshake", - "None", RIG_CONF_COMBO, { .c = {{ "None", "XONXOFF", "Hardware", NULL }} } - }, - - { RIG_CONF_END, NULL, } +#include "serial_cfg_params.h" }; /** @} */ /* rotator definitions */ diff --git a/src/serial_cfg_params.h b/src/serial_cfg_params.h new file mode 100644 index 000000000..91438598c --- /dev/null +++ b/src/serial_cfg_params.h @@ -0,0 +1,38 @@ + { + TOK_SERIAL_SPEED, "serial_speed", "Serial speed", + "Serial port baud rate", + "0", RIG_CONF_NUMERIC, { .n = { 300, 115200, 1 } } + }, + { + TOK_DATA_BITS, "data_bits", "Serial data bits", + "Serial port data bits", + "8", RIG_CONF_NUMERIC, { .n = { 5, 8, 1 } } + }, + { + TOK_STOP_BITS, "stop_bits", "Serial stop bits", + "Serial port stop bits", + "1", RIG_CONF_NUMERIC, { .n = { 0, 3, 1 } } + }, + { + TOK_PARITY, "serial_parity", "Serial parity", + "Serial port parity", + "None", RIG_CONF_COMBO, { .c = {{ "None", "Odd", "Even", "Mark", "Space", NULL }} } + }, + { + TOK_HANDSHAKE, "serial_handshake", "Serial handshake", + "Serial port handshake", + "None", RIG_CONF_COMBO, { .c = {{ "None", "XONXOFF", "Hardware", NULL }} } + }, + + { + TOK_RTS_STATE, "rts_state", "RTS state", + "Serial port set state of RTS signal for external powering", + "Unset", RIG_CONF_COMBO, { .c = {{ "Unset", "ON", "OFF", NULL }} } + }, + { + TOK_DTR_STATE, "dtr_state", "DTR state", + "Serial port set state of DTR signal for external powering", + "Unset", RIG_CONF_COMBO, { .c = {{ "Unset", "ON", "OFF", NULL }} } + }, + + { RIG_CONF_END, NULL, }