Remove unnecessary std_init() wrapper functions

[libsigrok.git] / src / hardware / appa-55ii / protocol.c

diff --git a/src/hardware/appa-55ii/protocol.c b/src/hardware/appa-55ii/protocol.c
index 84826890be9ad624ad4f29248e7827099f4d99b5..4720fd4f24d11b5c0e3b660e58229713919cdb21 100644 (file)
--- a/src/hardware/appa-55ii/protocol.c
+++ b/src/hardware/appa-55ii/protocol.c
@@ -120,10 +120,10 @@ static void appa_55ii_live_data(struct sr_dev_inst *sdi, const uint8_t *buf)
 
        packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
-       sr_session_send(devc->session_cb_data, &packet);
+       sr_session_send(sdi, &packet);
        g_slist_free(analog.channels);
 
-       devc->num_samples++;
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
 }
 
 static void appa_55ii_log_metadata(struct sr_dev_inst *sdi, const uint8_t *buf)
@@ -172,10 +172,10 @@ static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi)
 
                packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
-               sr_session_send(devc->session_cb_data, &packet);
+               sr_session_send(sdi, &packet);
                g_slist_free(analog.channels);
 
-               devc->num_samples++;
+               sr_sw_limits_update_samples_read(&devc->limits, 1);
                devc->log_buf_len -= 20;
                offset += 20;
                devc->num_log_records--;
@@ -216,7 +216,7 @@ static void appa_55ii_log_end(struct sr_dev_inst *sdi)
        if (devc->data_source != DATA_SOURCE_MEMORY)
                return;
 
-       sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data);
+       sdi->driver->dev_acquisition_stop(sdi);
 }
 
 static const uint8_t *appa_55ii_parse_data(struct sr_dev_inst *sdi,
@@ -266,7 +266,6 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data)
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
-       int64_t time;
        const uint8_t *ptr, *next_ptr, *end_ptr;
        int len;
 
@@ -301,21 +300,10 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data)
                return FALSE;
        }
 
-       if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-               sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data);
+       if (sr_sw_limits_check(&devc->limits)) {
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
        }
 
-       if (devc->limit_msec) {
-               time = (g_get_monotonic_time() - devc->start_time) / 1000;
-               if (time > (int64_t)devc->limit_msec) {
-                       sr_info("Requested time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi,
-                                       devc->session_cb_data);
-                       return TRUE;
-               }
-       }
-
        return TRUE;
 }