Centralise duplicated logging helper defines.

[libsigrok.git] / hardware / lascar-el-usb / protocol.h

diff --git a/hardware/lascar-el-usb/protocol.h b/hardware/lascar-el-usb/protocol.h
index 4aa2e2d6f13d2b5d3eb2168a9bbd10cc792ca03f..4386ef4b5214e5c4afe1e16be1ecb25e85be087a 100644 (file)
--- a/hardware/lascar-el-usb/protocol.h
+++ b/hardware/lascar-el-usb/protocol.h
@@ -24,33 +24,35 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "lascar-el-usb: "
-#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 "lascar-el-usb"
+
+#define LASCAR_VENDOR "Lascar"
+#define LASCAR_INTERFACE 0
+#define LASCAR_EP_IN 0x82
+#define LASCAR_EP_OUT 2
+/* Max 100ms for a device to positively identify. */
+#define SCAN_TIMEOUT 100000
+#define MAX_CONFIGBLOCK_SIZE 256
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-       /** The current sampling limit (in number of samples). */
-       uint64_t limit_samples;
-
-       /** The current sampling limit (in ms). */
-       uint64_t limit_msec;
-
-       /** Opaque pointer passed in by the frontend. */
        void *cb_data;
-
-       /** The current number of already received samples. */
-       uint64_t num_samples;
-
-       struct sr_usb_dev_inst *usb;
        const struct elusb_profile *profile;
-       /* Only requires 3 really. */
-       int usbfd[10];
+       /* Generic EL-USB */
+       unsigned char config[MAX_CONFIGBLOCK_SIZE];
+       unsigned int log_size;
+       unsigned int rcvd_bytes;
+       unsigned int sample_size;
+       unsigned int logged_samples;
+       unsigned int rcvd_samples;
+       uint64_t limit_samples;
+       /* Model-specific */
+       /* EL-USB-CO: these are something like scaling and calibration values
+        * fixed per device, used to convert the sample values to CO ppm. */
+       float co_high;
+       float co_low;
+       /* Temperature units as stored in the device config. */
+       int temp_unit;
 };
 
 enum {
@@ -65,6 +67,13 @@ struct elusb_profile {
        int logformat;
 };
 
-SR_PRIV int lascar_el_usb_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
+               unsigned char *configblock, int *configlen);
+SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data);
+SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer);
+SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi);
+SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi);
+SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi);
+SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 #endif