uni-t-dmm: Add support for the Voltcraft VC-840.

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

diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index 73fa75825825498e37ddfe50a604c143109e8256..a367336abae6bb2c7f31724df541aaec37e33ed4 100644 (file)
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2012-2013 Uwe Hermann <uwe@hermann-uwe.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,10 +39,12 @@
 /* Note: When adding entries here, don't forget to update DMM_COUNT. */
 enum {
        UNI_T_UT61D,
+       UNI_T_UT61E,
        VOLTCRAFT_VC820,
+       VOLTCRAFT_VC840,
 };
 
-#define DMM_COUNT 2
+#define DMM_COUNT 4
 
 struct dmm_info {
        char *vendor;
@@ -60,11 +62,9 @@ struct dmm_info {
 
 extern SR_PRIV struct dmm_info udmms[DMM_COUNT];
 
-#define UT_D04_CABLE_USB_VID   0x1a86
-#define UT_D04_CABLE_USB_DID   0xe008
-
 #define CHUNK_SIZE             8
-#define NUM_DATA_BYTES         14
+
+#define DMM_BUFSIZE            256
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
@@ -80,12 +80,16 @@ struct dev_context {
        /** The current number of already received samples. */
        uint64_t num_samples;
 
-       struct sr_usb_dev_inst *usb;
+       gboolean first_run;
 
-       uint8_t protocol_buf[14];
+       uint8_t protocol_buf[DMM_BUFSIZE];
+       uint8_t bufoffset;
+       uint8_t buflen;
 };
 
 SR_PRIV int receive_data_UNI_T_UT61D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61E(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
 
 #endif