X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=735f5fda14d784d48d1f4b2a8f52ce78f5f935b2;hb=25a0f108f4512ade836fed128c3ad649dedcb788;hp=b1bcfa55514f413a2dff9e7c23bec51cf0cecab2;hpb=58453e5876ffae9153e9f4ddc2ad8dc244c7f26d;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c index b1bcfa55..735f5fda 100644 --- a/hardware/openbench-logic-sniffer/ols.c +++ b/hardware/openbench-logic-sniffer/ols.c @@ -509,14 +509,10 @@ hw_init_free_ports: return devices; } -static int hw_dev_open(int dev_index) +static int hw_dev_open(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; struct context *ctx; - if (!(sdi = sr_dev_inst_get(odi->instances, dev_index))) - return SR_ERR; - ctx = sdi->priv; ctx->serial->fd = serial_open(ctx->serial->port, O_RDWR); @@ -528,19 +524,12 @@ static int hw_dev_open(int dev_index) return SR_OK; } -static int hw_dev_close(int dev_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; struct context *ctx; - if (!(sdi = sr_dev_inst_get(odi->instances, dev_index))) { - sr_err("ols: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - ctx = sdi->priv; - /* TODO */ if (ctx->serial->fd != -1) { serial_close(ctx->serial->fd); ctx->serial->fd = -1;