BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-dso: use driver struct-based device instance list

This commit is contained in:
Bert Vermeulen 2012-07-13 13:37:35 +02:00
parent e5e81856b4
commit 982947f7a2
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hardware/hantek-dso/api.c
View File

@ -145,7 +145,8 @@ static const char *coupling[] = {
}; };
SR_PRIV libusb_context *usb_context = NULL; SR_PRIV libusb_context *usb_context = NULL;
SR_PRIV GSList *dev_insts = NULL; SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
static struct sr_dev_driver *hdi = &hantek_dso_driver_info;
static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof) static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof)
{ {
@ -178,7 +179,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
ctx->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE); ctx->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
ctx->triggerposition = DEFAULT_HORIZ_TRIGGERPOS; ctx->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
sdi->priv = ctx; sdi->priv = ctx;
dev_insts = g_slist_append(dev_insts, sdi); hdi->instances = g_slist_append(hdi->instances, sdi);
return sdi; return sdi;
} }
@ -281,7 +282,7 @@ static int hw_dev_open(int dev_index)
int64_t timediff_us, timediff_ms; int64_t timediff_us, timediff_ms;
int err; int err;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR_ARG; return SR_ERR_ARG;
ctx = sdi->priv; ctx = sdi->priv;
@ -326,7 +327,7 @@ static int hw_dev_close(int dev_index)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR_ARG; return SR_ERR_ARG;
dso_close(sdi); dso_close(sdi);
@ -341,7 +342,7 @@ static int hw_cleanup(void)
struct context *ctx; struct context *ctx;
/* Properly close and free all devices. */ /* Properly close and free all devices. */
for (l = dev_insts; l; l = l->next) { for (l = hdi->instances; l; l = l->next) {
if (!(sdi = l->data)) { if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */ /* Log error, but continue cleaning up the rest. */
sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__); sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__);
@ -359,8 +360,8 @@ static int hw_cleanup(void)
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
} }
g_slist_free(dev_insts); g_slist_free(hdi->instances);
dev_insts = NULL; hdi->instances = NULL;
if (usb_context) if (usb_context)
libusb_exit(usb_context); libusb_exit(usb_context);
@ -375,7 +376,7 @@ static const void *hw_dev_info_get(int dev_index, int dev_info_id)
const void *info; const void *info;
uint64_t tmp; uint64_t tmp;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return NULL; return NULL;
info = NULL; info = NULL;
@ -420,7 +421,7 @@ static int hw_dev_status_get(int dev_index)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ST_NOT_FOUND; return SR_ST_NOT_FOUND;
return sdi->status; return sdi->status;
@ -441,7 +442,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
int ret, i; int ret, i;
char **targets; char **targets;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR; return SR_ERR;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
@ -794,7 +795,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
struct context *ctx; struct context *ctx;
int i; int i;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR; return SR_ERR;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
@ -841,7 +842,7 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR; return SR_ERR;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
@ -871,4 +872,5 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
.dev_config_set = hw_dev_config_set, .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop, .dev_acquisition_stop = hw_dev_acquisition_stop,
.instances = NULL,
}; };