build: Portability fixes.

[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 389df3fa5af80621acfbf7f4cadc92759101306e..08fb537317ad3a7de4b0de76c0a0e864dbff126b 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
@@ -27,25 +27,40 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "uni-t-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "uni-t-dmm"
 
 enum {
+       TECPEL_DMM_8061,
+       UNI_T_UT60A,
+       UNI_T_UT60E,
+       UNI_T_UT60G,
+       UNI_T_UT61B,
+       UNI_T_UT61C,
        UNI_T_UT61D,
+       UNI_T_UT61E,
        VOLTCRAFT_VC820,
+       VOLTCRAFT_VC830,
+       VOLTCRAFT_VC840,
+       TENMA_72_7745,
+       TENMA_72_7750,
 };
 
-#define UT_D04_CABLE_USB_VID   0x1a86
-#define UT_D04_CABLE_USB_DID   0xe008
+struct dmm_info {
+       char *vendor;
+       char *device;
+       uint32_t baudrate;
+       int packet_size;
+       gboolean (*packet_valid)(const uint8_t *);
+       int (*packet_parse)(const uint8_t *, float *,
+                           struct sr_datafeed_analog *, void *);
+       void (*dmm_details)(struct sr_datafeed_analog *, void *);
+       struct sr_dev_driver *di;
+       int (*receive_data)(int, int, void *);
+};
 
 #define CHUNK_SIZE             8
-#define NUM_DATA_BYTES         14
+
+#define DMM_BUFSIZE            256
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
@@ -61,12 +76,27 @@ struct dev_context {
        /** The current number of already received samples. */
        uint64_t num_samples;
 
-       struct sr_usb_dev_inst *usb;
+       int64_t starttime;
+
+       gboolean first_run;
 
-       uint8_t protocol_buf[14];
+       uint8_t protocol_buf[DMM_BUFSIZE];
+       uint8_t bufoffset;
+       uint8_t buflen;
 };
 
-SR_PRIV int uni_t_ut61d_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int voltcraft_vc820_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60A(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60E(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60G(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61B(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61C(int fd, int revents, void *cb_data);
+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_VC830(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TENMA_72_7745(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TENMA_72_7750(int fd, int revents, void *cb_data);
 
 #endif