mirror of
https://github.com/Hamlib/Hamlib.git
synced 2024-09-21 02:17:21 +00:00
Rename ctx10 unpack_frame to commradio_unpack_frame to avoid collision with freedv unpack_frame
This commit is contained in:
parent
d3e191101f
commit
1e54e24767
@ -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;
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user