From 1e54e2476757bcecc8091d4d4aae5bdc33307311 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Fri, 9 Aug 2024 17:20:02 -0500
Subject: [PATCH] Rename ctx10 unpack_frame to commradio_unpack_frame to avoid
 collision with freedv unpack_frame

---
 rigs/commradio/commradio.c | 2 +-
 rigs/commradio/ctx10.c     | 2 +-
 rigs/commradio/frame.c     | 2 +-
 rigs/commradio/frame.h     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rigs/commradio/commradio.c b/rigs/commradio/commradio.c
index 888db0f2c..c73c7b6fe 100644
--- a/rigs/commradio/commradio.c
+++ b/rigs/commradio/commradio.c
@@ -58,7 +58,7 @@ int commradio_transaction(RIG *rig, const unsigned char *cmd, int cmd_len,
 	{
 		goto transaction_quit;
 	}
-	ret = unpack_frame(data, rx, ret);
+	ret = commradio_unpack_frame(data, rx, ret);
 	if (ret < RIG_OK)
 	{
 		goto transaction_quit;
diff --git a/rigs/commradio/ctx10.c b/rigs/commradio/ctx10.c
index 1631a1664..fc411ee41 100644
--- a/rigs/commradio/ctx10.c
+++ b/rigs/commradio/ctx10.c
@@ -20,7 +20,7 @@ struct rig_caps ctx10_caps =
 	RIG_MODEL(RIG_MODEL_CTX10),
 	.model_name = "CTX-10",
 	.mfg_name = "Commradio",
-	.version = "20240802.0",
+	.version = "20240809.0",
 	.copyright = "LGPL",
 	.status = RIG_STATUS_STABLE,
 	.rig_type = RIG_TYPE_TRANSCEIVER,
diff --git a/rigs/commradio/frame.c b/rigs/commradio/frame.c
index fc1756ab4..0bc44fd8a 100644
--- a/rigs/commradio/frame.c
+++ b/rigs/commradio/frame.c
@@ -104,7 +104,7 @@ int frame_message(unsigned char frame[], const unsigned char *data,
 	return frame_len;
 }
 
-int unpack_frame(unsigned char msg[], const unsigned char *frame, 
+int commradio_unpack_frame(unsigned char msg[], const unsigned char *frame, 
 		         const int frame_len)
 {
 	if (frame_len < 5) 
diff --git a/rigs/commradio/frame.h b/rigs/commradio/frame.h
index 14458e412..56a7b177c 100644
--- a/rigs/commradio/frame.h
+++ b/rigs/commradio/frame.h
@@ -16,7 +16,7 @@
 int frame_message(unsigned char frame[], const unsigned char *data, 
 		          int data_len);
 
-int unpack_frame(unsigned char msg[], const unsigned char *frame, int frame_len);
+int commradio_unpack_frame(unsigned char msg[], const unsigned char *frame, int frame_len);
 
 #endif /* _FRAME_H */