build: Portability fixes.

[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 e94839419f1a040fb3a1ea3a7614bca9817c2f22..a94bd8a59da2c6c51b7b418045edf6b547cab170 100644 (file)
--- a/hardware/lascar-el-usb/protocol.h
+++ b/hardware/lascar-el-usb/protocol.h
@@ -24,14 +24,7 @@
 #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
@@ -39,21 +32,20 @@
 #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 {
        void *cb_data;
-       struct sr_usb_dev_inst *usb;
        const struct elusb_profile *profile;
-       int usbfd[10];
        /* Generic EL-USB */
-       unsigned char *config;
+       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;
-       unsigned int limit_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. */
@@ -75,9 +67,14 @@ struct elusb_profile {
        int logformat;
 };
 
-SR_PRIV unsigned char *lascar_get_config(libusb_device_handle *dev_hdl);
+SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
+               unsigned char *configblock, int *configlen);
+SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address);
 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 hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
+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