scpi-pps: don't break SCPI devices when scanning for HP-IB devices

[libsigrok.git] / src / hardware / mic-985xx / protocol.c

diff --git a/src/hardware/mic-985xx/protocol.c b/src/hardware/mic-985xx/protocol.c
index d7c69d0e315c9e49ae6e85fcc736e34886941a26..2218f32b2908d3f3538db02489fa5429a2da83b1 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -95,7 +94,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
 {
        float temperature, humidity;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog2 analog;
+       struct sr_datafeed_analog analog;
        struct sr_analog_encoding encoding;
        struct sr_analog_meaning meaning;
        struct sr_analog_spec spec;
@@ -113,10 +112,10 @@ 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_ANALOG2;
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        analog.num_samples = 1;
 
@@ -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;
 }
@@ -151,7 +150,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, int idx)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
-       int len, i, offset = 0;
+       int len, offset;
 
        devc = sdi->priv;
        serial = sdi->conn;
@@ -167,6 +166,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, int idx)
        devc->buflen += len;
 
        /* Now look for packets in that data. */
+       offset = 0;
        while ((devc->buflen - offset) >= mic_devs[idx].packet_size) {
                if (mic_devs[idx].packet_valid(devc->buf + offset)) {
                        handle_packet(devc->buf + offset, sdi, idx);
@@ -177,8 +177,8 @@ static void handle_new_data(struct sr_dev_inst *sdi, int idx)
        }
 
        /* If we have any data left, move it to the beginning of our buffer. */
-       for (i = 0; i < devc->buflen - offset; i++)
-               devc->buf[i] = devc->buf[offset + i];
+       if (offset < devc->buflen)
+               memmove(devc->buf, devc->buf + offset, devc->buflen - offset);
        devc->buflen -= offset;
 }
 
@@ -186,7 +186,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 +210,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))
+               sr_dev_acquisition_stop(sdi);
 
        return TRUE;
 }