X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ftondaj-sl-814%2Fapi.c;h=17fbc2b1b4d91bfac21e93b866f3be132ecf8716;hb=5b389efcfeff17b0f7466597706c898ad65eb6a9;hp=c1d8abf8bc2206600ce10a197446470b092253ca;hpb=19ee7dff78f7195bfc82f14ef659751cdd0f6476;p=libsigrok.git diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c index c1d8abf8..17fbc2b1 100644 --- a/hardware/tondaj-sl-814/api.c +++ b/hardware/tondaj-sl-814/api.c @@ -73,7 +73,7 @@ static int clear_instances(void) return SR_OK; } -static int hw_init(void) +static int hw_init(struct sr_context *sr_ctx) { struct drv_context *drvc; @@ -82,6 +82,7 @@ static int hw_init(void) return SR_ERR_MALLOC; } + drvc->sr_ctx = sr_ctx; di->priv = drvc; return SR_OK; @@ -140,7 +141,7 @@ static GSList *hw_scan(GSList *options) if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK) + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) return NULL; sdi->priv = devc; @@ -172,7 +173,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi) devc = sdi->priv; - if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK) + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) return SR_ERR; sdi->status = SR_ST_ACTIVE;