Remove unnecessary driver context checks

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

diff --git a/src/hardware/lascar-el-usb/protocol.h b/src/hardware/lascar-el-usb/protocol.h
index 82d39925db64dc276cdc0652dfae4d96be4b59e5..c4eec74b629288f844ece0ab8406456990b8a6d8 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.h
+++ b/src/hardware/lascar-el-usb/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "lascar-el-usb"
@@ -41,7 +41,6 @@
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-       void *cb_data;
        const struct elusb_profile *profile;
        /* Generic EL-USB */
        unsigned char config[MAX_CONFIGBLOCK_SIZE];
@@ -68,7 +67,7 @@ enum {
 
 struct elusb_profile {
        int modelid;
-       char *modelname;
+       const char *modelname;
        int logformat;
 };
 
@@ -76,10 +75,10 @@ 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 void LIBUSB_CALL 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);
+SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 #endif