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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/910/head
Mike Black W9MDB 2021-12-27 11:48:22 -06:00
rodzic 0ccf0b480c 2f15661067
commit 16406bba09
2 zmienionych plików z 12 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
src/iofunc.c
Wyświetl plik

@ -373,7 +373,11 @@ extern int is_uh_radio_fd(int fd);
*/ */
static ssize_t port_read_generic(hamlib_port_t *p, void *buf, size_t count, int direct) static ssize_t port_read_generic(hamlib_port_t *p, void *buf, size_t count, int direct)
{ {
#if ASYNC_BUG
int fd = direct ? p->fd : p->fd_sync_read; int fd = direct ? p->fd : p->fd_sync_read;
#else
int fd = direct;
#endif
int i; int i;
ssize_t ret; ssize_t ret;

12
tests/testrigcaps.c
Wyświetl plik

@ -4,7 +4,7 @@
int main() int main()
{ {
printf("Check rig_caps offsets\n"); printf("Check rig_caps offsets\n");
printf("If changed can affect shared library API\n"); printf("If changed will break shared library API\n");
RIG *rig; RIG *rig;
int retcode = 0; int retcode = 0;
rig_set_debug_level(RIG_DEBUG_NONE); rig_set_debug_level(RIG_DEBUG_NONE);
@ -18,7 +18,7 @@ int main()
#elif defined(WIN32) || defined (_WIN32) || defined(__WIN32__) #elif defined(WIN32) || defined (_WIN32) || defined(__WIN32__)
int expected = 10144; // mingw32 int expected = 10144; // mingw32
#else #else
int expected = 13280; // should be most 64-bit compilers int expected = 13328; // should be most 64-bit compilers
#endif #endif
if (offset == 9384) { expected = 9384; } // 32-bit Intel if (offset == 9384) { expected = 9384; } // 32-bit Intel
@ -41,7 +41,7 @@ int main()
#elif defined(WIN32) || defined (_WIN32) || defined(__WIN32__) #elif defined(WIN32) || defined (_WIN32) || defined(__WIN32__)
expected = 10448; // mingw32 expected = 10448; // mingw32
#else #else
expected = 13696; expected = 14188;
#endif #endif
if (offset == 9676) { expected = 9676; } // 32-bit Intel if (offset == 9676) { expected = 9676; } // 32-bit Intel
@ -52,7 +52,11 @@ int main()
{ {
printf("Warning...offset of power_max has changed!!!\n"); printf("Warning...offset of power_max has changed!!!\n");
printf("was %d, now %lu\n", expected, offset); printf("was %d, now %lu\n", expected, offset);
retcode = 0; retcode = 2;
}
if (retcode == 0)
{
printf("Offsets are OK (i.e. have not changed)\n");
} }
return retcode; return retcode;