diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
| commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
| tree | d5c2a62c4db97de94f92150340612c64d3997669 /spectro/smcube.c | |
| parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
| parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/smcube.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/smcube.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spectro/smcube.c b/spectro/smcube.c index c450d48..9f6947d 100644..100755 --- a/spectro/smcube.c +++ b/spectro/smcube.c @@ -73,6 +73,7 @@ #include "numsup.h" #include "sa_conv.h" #endif /* !SALONEINSTLIB */ +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -203,7 +204,7 @@ smcube_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { baud_rate brt[] = { baud_38400, baud_nc }; unsigned int etime; unsigned int i; - instType itype = pp->itype; + instType dtype = pp->dtype; int se; inst_code ev = inst_ok; @@ -1133,7 +1134,7 @@ smcube_get_set_opt(inst *pp, inst_opt_type m, ...) { } /* Constructor */ -extern smcube *new_smcube(icoms *icom, instType itype) { +extern smcube *new_smcube(icoms *icom, instType dtype) { smcube *p; if ((p = (smcube *)calloc(sizeof(smcube),1)) == NULL) { a1loge(icom->log, 1, "new_smcube: malloc failed!\n"); @@ -1158,7 +1159,7 @@ extern smcube *new_smcube(icoms *icom, instType itype) { p->icom = icom; icom->icntx = (void *)p; /* Allow us to get instrument from icom */ - p->itype = itype; + p->dtype = dtype; amutex_init(p->lock); |