Skip to content

Commit 9d5c88d

Browse files
committed
Working obtaining samples from ExtIO
1 parent 0239383 commit 9d5c88d

16 files changed

Lines changed: 2503 additions & 36 deletions

JavaGUI/hs_err_pid2020.log

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

JavaGUI/hs_err_pid3632.log

Lines changed: 324 additions & 0 deletions
Large diffs are not rendered by default.

JavaGUI/hs_err_pid4108.log

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

JavaGUI/hs_err_pid4116.log

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

JavaGUI/hs_err_pid5344.log

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

JavaGUI/hs_err_pid5848.log

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

JavaGUI/hs_err_pid7508.log

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

TSDRPlugin_ExtIO/makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
PLUGNAME=TSDRPlugin_ExtIO
44

55
# Dependencies
6-
OBJS=$(PLUGNAME).o ExtIOPluginLoader.o
7-
DEPS=TSDRPlugin.h TSDRCodes.h ExtIOPluginLoader.h osdetect.h errors.h
6+
OBJS=$(PLUGNAME).o ExtIOPluginLoader.o threading.o
7+
DEPS=TSDRPlugin.h TSDRCodes.h ExtIOPluginLoader.h osdetect.h errors.h threading.h
88

99
# Flags
1010
CFLAGS+=-O3

TSDRPlugin_ExtIO/src/ExtIOPluginLoader.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,8 @@ int extio_load(extiosource_t * plugin, const char *dlname)
4646
if ((plugin->SetHWLO = extio_getfunction(plugin, "SetHWLO")) == 0) return TSDR_ERR_PLUGIN;
4747
if ((plugin->GetStatus = extio_getfunction(plugin, "GetStatus")) == 0) return TSDR_ERR_PLUGIN;
4848

49-
// optional
50-
if ((plugin->RawDataReady = extio_getfunction(plugin, "RawDataReady")) == 0) plugin->RawDataReady = NULL;
51-
if ((plugin->ShowGUI = extio_getfunction(plugin, "ShowGUI")) == 0) plugin->ShowGUI = NULL;
52-
if ((plugin->HideGUI = extio_getfunction(plugin, "HideGUI")) == 0) plugin->HideGUI = NULL;
49+
// mandatory functions that rtlsdr expects
50+
if ((plugin->GetHWSR = extio_getfunction(plugin, "GetHWSR")) == 0) return TSDR_ERR_PLUGIN;
5351

5452
return TSDR_OK;
5553
}

TSDRPlugin_ExtIO/src/ExtIOPluginLoader.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <dlfcn.h>
1414
#endif
1515

16-
typedef int (* pfnExtIOCallback) (int cnt, int status, float IQoffs, void *IQdata);
16+
typedef void (* pfnExtIOCallback) (int cnt, int status, float IQoffs, void *IQdata);
1717

1818
struct extiosource {
1919
void * fd;
@@ -28,10 +28,9 @@
2828
int (__stdcall * SetHWLO) (long extLOfreq); // see also SetHWLO64
2929
int (__stdcall * GetStatus) (void);
3030

31-
// optional functions
32-
void (__stdcall * RawDataReady) (long samprate, void *Ldata, void *Rdata, int numsamples);
33-
void (__stdcall * ShowGUI) (void);
34-
void (__stdcall * HideGUI) (void);
31+
// mandatory functions that tsdrrequires
32+
long (__stdcall * GetHWSR) (void);
33+
3534

3635
} typedef extiosource_t;
3736

0 commit comments

Comments
 (0)