mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "Remove multicast from rig_state structure as it breaks backwards compability on DLL with WSJT-X" 

This didn't fix the DLL compatibility problem
This reverts commit 77d9d11f92.
pull/1330/head
Mike Black W9MDB 2023-05-31 07:27:34 -05:00
rodzic c3cf7a9874
commit fd86001ead
4 zmienionych plików z 4 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
include/hamlib/rig.h
Wyświetl plik

@ -2629,7 +2629,7 @@ struct rig_state {
char client_version[32]; /*!<! Allow client to report version for compatibility checks/capability */ char client_version[32]; /*!<! Allow client to report version for compatibility checks/capability */
freq_t offset_vfoa; /*!< Offset to apply to VFOA/Main set_freq */ freq_t offset_vfoa; /*!< Offset to apply to VFOA/Main set_freq */
freq_t offset_vfob; /*!< Offset to apply to VFOB/Sub set_freq */ freq_t offset_vfob; /*!< Offset to apply to VFOB/Sub set_freq */
// struct multicast_s *multicast; /*!< Pointer to multicast server data */ struct multicast_s *multicast; /*!< Pointer to multicast server data */
}; };
//! @cond Doxygen_Suppress //! @cond Doxygen_Suppress

2
src/multicast.c
Wyświetl plik

@ -13,7 +13,6 @@
#endif #endif
#include "hamlib/rig.h" #include "hamlib/rig.h"
#include "misc.h" #include "misc.h"
#if 0
#include "multicast.h" #include "multicast.h"
#define RIG_MULTICAST_ADDR "224.0.0.1" #define RIG_MULTICAST_ADDR "224.0.0.1"
@ -525,4 +524,3 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
#endif #endif
#endif

2
src/rig.c
Wyświetl plik

@ -7599,7 +7599,6 @@ HAMLIB_EXPORT(void) sync_callback(int lock)
void rig_lock(RIG *rig, int lock) void rig_lock(RIG *rig, int lock)
{ {
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
#if 0 //MULTICAST disabled as it breaks the DLL backwards compatibility
if (rig->state.multicast == NULL) { return; } // not initialized yet if (rig->state.multicast == NULL) { return; } // not initialized yet
@ -7621,7 +7620,6 @@ void rig_lock(RIG *rig, int lock)
} }
#endif #endif
#endif
} }

6
tests/rigtestmcast.c
Wyświetl plik

@ -31,9 +31,9 @@ int main(int argc, char *argv[])
#endif #endif
rig->state.rigport.parm.serial.rate = 38400; rig->state.rigport.parm.serial.rate = 38400;
rig_open(rig); rig_open(rig);
// multicast_init(rig, "224.0.0.1", 4532); multicast_init(rig, "224.0.0.1", 4532);
//printf("threadid=%lld\n", (long long)rig->state.multicast->threadid); printf("threadid=%lld\n", (long long)rig->state.multicast->threadid);
//pthread_join(rig->state.multicast->threadid, NULL); pthread_join(rig->state.multicast->threadid, NULL);
pthread_exit(NULL); pthread_exit(NULL);
return 0; return 0;
} }