hantek-dso: cosmetics

[libsigrok.git] / hardware / hantek-dso / dso.h

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 866dc2d5343fadda68a4d613711b042a5949c9d1..8d543b62921d36608d1ec4602471a269429def8b 100644 (file)
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -22,32 +22,41 @@
 #ifndef LIBSIGROK_HARDWARE_HANTEK_DSO_H
 #define LIBSIGROK_HARDWARE_HANTEK_DSO_H
 
-#define USB_INTERFACE                  0
-#define USB_CONFIGURATION              1
-#define DSO_EP_IN                      0x86
-#define DSO_EP_OUT                     0x02
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "hantek-dso: "
+#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 USB_INTERFACE           0
+#define USB_CONFIGURATION       1
+#define DSO_EP_IN               0x86
+#define DSO_EP_OUT              0x02
 
 /* FX2 renumeration delay in ms */
-#define MAX_RENUM_DELAY_MS             3000
+#define MAX_RENUM_DELAY_MS      3000
 
-#define MAX_CAPTURE_EMPTY              3
+#define MAX_CAPTURE_EMPTY       3
 
-#define DEFAULT_VOLTAGE                        VDIV_500MV
-#define DEFAULT_FRAMESIZE              FRAMESIZE_SMALL
-#define DEFAULT_TIMEBASE               TIME_100us
-#define DEFAULT_TRIGGER_SOURCE         "CH1"
-#define DEFAULT_COUPLING               COUPLING_DC
-#define DEFAULT_HORIZ_TRIGGERPOS       0.5
-#define DEFAULT_VERT_OFFSET            0.5
-#define DEFAULT_VERT_TRIGGERPOS                0.5
+#define DEFAULT_VOLTAGE         VDIV_500MV
+#define DEFAULT_FRAMESIZE       FRAMESIZE_SMALL
+#define DEFAULT_TIMEBASE        TIME_100us
+#define DEFAULT_TRIGGER_SOURCE  "CH1"
+#define DEFAULT_COUPLING        COUPLING_DC
+#define DEFAULT_HORIZ_TRIGGERPOS 0.5
+#define DEFAULT_VERT_OFFSET     0.5
+#define DEFAULT_VERT_TRIGGERPOS 0.5
 
-#define MAX_VERT_TRIGGER               0xfe
+#define MAX_VERT_TRIGGER        0xfe
 
 /* Hantek DSO-specific protocol values */
-#define EEPROM_CHANNEL_OFFSETS         0x08
+#define EEPROM_CHANNEL_OFFSETS  0x08
 
-#define FRAMESIZE_SMALL                        10240
-#define FRAMESIZE_LARGE                        32768
+#define FRAMESIZE_SMALL         10240
+#define FRAMESIZE_LARGE         32768
 
 enum control_requests {
        CTRL_READ_EEPROM = 0xa2,
@@ -163,6 +172,7 @@ struct dev_context {
        void *cb_data;
        uint64_t limit_frames;
        uint64_t num_frames;
+       GSList *enabled_probes;
        /* We can't keep track of an FX2-based device after upgrading
         * the firmware (it re-enumerates into a different device address
         * after the upgrade) this is like a global lock. No device will open
@@ -210,7 +220,7 @@ SR_PRIV int dso_init(struct dev_context *devc);
 SR_PRIV int dso_get_capturestate(struct dev_context *devc,
                uint8_t *capturestate, uint32_t *trigger_offset);
 SR_PRIV int dso_capture_start(struct dev_context *devc);
-SR_PRIV int dso_get_channeldata(struct dev_context *devc,
+SR_PRIV int dso_get_channeldata(const struct sr_dev_inst *sdi,
                libusb_transfer_cb_fn cb);
 
 #endif