X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fprotocol.c;h=151b7c837af7cbf8f021c5c900c0e2fea0848f62;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=4ee11b70c8e3ce2e626570487e82db5298db0d9f;hpb=edb691fcedb767093885c61d19d8d490c9c8c9c2;p=libsigrok.git diff --git a/src/hardware/mic-985xx/protocol.c b/src/hardware/mic-985xx/protocol.c index 4ee11b70..151b7c83 100644 --- a/src/hardware/mic-985xx/protocol.c +++ b/src/hardware/mic-985xx/protocol.c @@ -127,7 +127,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx) meaning.mq = SR_MQ_TEMPERATURE; meaning.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */ analog.data = &temperature; - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); g_slist_free(l); /* Humidity. */ @@ -138,7 +138,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx) meaning.mq = SR_MQ_RELATIVE_HUMIDITY; meaning.unit = SR_UNIT_PERCENTAGE; analog.data = &humidity; - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); g_slist_free(l); } @@ -213,7 +213,7 @@ static int receive_data(int fd, int revents, int idx, void *cb_data) if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { sr_info("Requested number of samples reached."); - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sdi->driver->dev_acquisition_stop(sdi); return TRUE; } @@ -221,7 +221,7 @@ static int receive_data(int fd, int revents, int idx, void *cb_data) t = (g_get_monotonic_time() - devc->starttime) / 1000; if (t > (int64_t)devc->limit_msec) { sr_info("Requested time limit reached."); - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sdi->driver->dev_acquisition_stop(sdi); return TRUE; } }