uni-t-ut32x: improve robustness of packet parser, more diagnostics

[libsigrok.git] / src / hardware / uni-t-ut32x / protocol.h

diff --git a/src/hardware/uni-t-ut32x/protocol.h b/src/hardware/uni-t-ut32x/protocol.h
index 59f81eaf4cbf0d908e4ac9657d0c4e34d26d3d91..eb10a65b8b267a464d7f5d61329637d9fb782718 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.h
+++ b/src/hardware/uni-t-ut32x/protocol.h
@@ -35,27 +35,27 @@
 #define EP_IN (0x80 | 2)
 #define EP_OUT 2
 
-enum {
+#define PACKET_SIZE    19
+
+enum ut32x_data_source {
        DATA_SOURCE_LIVE,
        DATA_SOURCE_MEMORY,
 };
 
-enum {
+enum ut32x_cmd_code {
        CMD_GET_LIVE = 1,
        CMD_STOP = 2,
        CMD_GET_STORED = 7,
 };
 
 struct dev_context {
-       uint64_t limit_samples;
-       gboolean data_source;
-
-       uint64_t num_samples;
+       struct sr_sw_limits limits;
+       enum ut32x_data_source data_source;
        unsigned char buf[8];
        struct libusb_transfer *xfer;
 
        unsigned char packet[32];
-       int packet_len;
+       size_t packet_len;
 };
 
 SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data);