X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fprotocol.c;h=65490537609f03f936f261f8ad12065e2621cfe9;hb=eac48b34917cf19c2b5ba52ccea85ec94bb5830f;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..65490537 100644
--- a/src/hardware/mic-985xx/protocol.c
+++ b/src/hardware/mic-985xx/protocol.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -113,7 +112,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
return SR_ERR;
}
- sr_analog_init(&analog, &encoding, &meaning, &spec, 3);
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
/* Common values for both channels. */
packet.type = SR_DF_ANALOG;
@@ -127,7 +126,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,11 +137,11 @@ 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);
}
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
return SR_OK;
}
@@ -186,7 +185,6 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- int64_t t;
static gboolean first_time = TRUE;
struct sr_serial_dev_inst *serial;
@@ -211,20 +209,8 @@ 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);
- return TRUE;
- }
-
- if (devc->limit_msec) {
- 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);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->limits))
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}