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 a2bad3306ac5c89b561e37bedd909f8a65ad81bb..eb10a65b8b267a464d7f5d61329637d9fb782718 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.h
+++ b/src/hardware/uni-t-ut32x/protocol.h
@@ -29,39 +29,33 @@
 
 #define DEFAULT_DATA_SOURCE DATA_SOURCE_LIVE
 #define USB_CONN "1a86.e008"
-#define VENDOR "UNI-T"
-#define MODEL "UT32x"
 #define USB_INTERFACE 0
 #define USB_CONFIGURATION 1
 
 #define EP_IN (0x80 | 2)
 #define EP_OUT 2
 
-enum {
-    DATA_SOURCE_LIVE,
+#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,
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-       /* Acquisition settings */
-       uint64_t limit_samples;
-       gboolean data_source;
-
-       /* Operational state */
-       uint64_t num_samples;
+       struct sr_sw_limits limits;
+       enum ut32x_data_source data_source;
        unsigned char buf[8];
        struct libusb_transfer *xfer;
 
-       /* Temporary state across callbacks */
        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);