From 7f6736368701d01944fb4f752e31099f9b0ff67e Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Sun, 14 Jan 2024 15:08:18 -0500 Subject: [PATCH] Need more parens to work in expressions. Clean up sticky note items. --- include/hamlib/rig.h | 14 +++++++------- src/conf.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index f4760ed68..4a48d1c04 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -2489,13 +2489,13 @@ typedef hamlib_port_t port_t; */ #else /* Define external unique names */ -#define HAMLIB_RIGPORT(r) (hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_RIGPORT) -#define HAMLIB_PTTPORT(r) (hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_PTTPORT) -#define HAMLIB_DCDPORT(r) (hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_DCDPORT) -//#define HAMLIB_CACHE(r) (struct rig_cache *)rig_data_pointer(r, RIG_PTRX_CACHE) -#define HAMLIB_AMPPORT(a) (hamlib_port_t *)amp_data_pointer(a, RIG_PTRX_AMPPORT) -#define HAMLIB_ROTPORT(r) (hamlib_port_t *)rot_data_pointer(r, RIG_PTRX_ROTPORT) -#define HAMLIB_ROTPORT2(r) (hamlib_port_t *)rot_data_pointer(r, RIG_PTRX_ROTPORT2) +#define HAMLIB_RIGPORT(r) ((hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_RIGPORT)) +#define HAMLIB_PTTPORT(r) ((hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_PTTPORT)) +#define HAMLIB_DCDPORT(r) ((hamlib_port_t *)rig_data_pointer(r, RIG_PTRX_DCDPORT)) +#define HAMLIB_CACHE(r) ((struct rig_cache *)rig_data_pointer(r, RIG_PTRX_CACHE)) +#define HAMLIB_AMPPORT(a) ((hamlib_port_t *)amp_data_pointer(a, RIG_PTRX_AMPPORT)) +#define HAMLIB_ROTPORT(r) ((hamlib_port_t *)rot_data_pointer(r, RIG_PTRX_ROTPORT)) +#define HAMLIB_ROTPORT2(r) ((hamlib_port_t *)rot_data_pointer(r, RIG_PTRX_ROTPORT2)) #endif typedef enum { diff --git a/src/conf.c b/src/conf.c index 7a37428a3..5099a0fad 100644 --- a/src/conf.c +++ b/src/conf.c @@ -573,7 +573,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) } // JTDX and WSJTX currently use state.pttport to check for PTT_NONE - rig->state.pttport.type.ptt = pttp->type.ptt; +// rig->state.pttport.type.ptt = pttp->type.ptt; rs->pttport_deprecated.type.ptt = pttp->type.ptt; break;