es519xx: correctly handle the voltage factor in diode mode

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index c76f5983b7bddccf1d9388d0334ad0822c7fea5d..646164cf8b2d2cc46f2082ca636ea09064fa5881 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -50,6 +50,42 @@
 #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
 #endif
 
+/**
+ * Read a 16 bits big endian integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding integer
+ */
+#define RB16(x)  ((((const uint8_t*)(x))[0] <<  8) |  \
+                   ((const uint8_t*)(x))[1])
+
+/**
+ * Read a 16 bits little endian integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding integer
+ */
+#define RL16(x)  ((((const uint8_t*)(x))[1] <<  8) |  \
+                   ((const uint8_t*)(x))[0])
+
+/**
+ * Read a 32 bits big endian integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding integer
+ */
+#define RB32(x)  ((((const uint8_t*)(x))[0] << 24) |  \
+                  (((const uint8_t*)(x))[1] << 16) |  \
+                  (((const uint8_t*)(x))[2] <<  8) |  \
+                   ((const uint8_t*)(x))[3])
+
+/**
+ * Read a 32 bits little endian integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding integer
+ */
+#define RL32(x)  ((((const uint8_t*)(x))[3] << 24) |  \
+                  (((const uint8_t*)(x))[2] << 16) |  \
+                  (((const uint8_t*)(x))[1] <<  8) |  \
+                   ((const uint8_t*)(x))[0])
+
 /* Portability fixes for FreeBSD. */
 #ifdef __FreeBSD__
 #define LIBUSB_CLASS_APPLICATION 0xfe
@@ -126,6 +162,16 @@ SR_PRIV int sr_info(const char *format, ...);
 SR_PRIV int sr_warn(const char *format, ...);
 SR_PRIV int sr_err(const char *format, ...);
 
+/* Message logging helpers with subsystem-specific prefix string. */
+#ifndef NO_LOG_WRAPPERS
+#define sr_log(l, s, args...) sr_log(l, "%s: " s, LOG_PREFIX, ## args)
+#define sr_spew(s, args...) sr_spew("%s: " s, LOG_PREFIX, ## args)
+#define sr_dbg(s, args...) sr_dbg("%s: " s, LOG_PREFIX, ## args)
+#define sr_info(s, args...) sr_info("%s: " s, LOG_PREFIX, ## args)
+#define sr_warn(s, args...) sr_warn("%s: " s, LOG_PREFIX, ## args)
+#define sr_err(s, args...) sr_err("%s: " s, LOG_PREFIX, ## args)
+#endif
+
 /*--- device.c --------------------------------------------------------------*/
 
 SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
@@ -325,8 +371,9 @@ struct sr_scpi_dev_inst {
                int timeout, sr_receive_data_callback_t cb, void *cb_data);
        int (*source_remove)(void *priv);
        int (*send)(void *priv, const char *command);
-       int (*receive)(void *priv, char **scpi_response);
-       int (*read)(void *priv, char *buf, int maxlen);
+       int (*read_begin)(void *priv);
+       int (*read_data)(void *priv, char *buf, int maxlen);
+       int (*read_complete)(void *priv);
        int (*close)(void *priv);
        void (*free)(void *priv);
        void *priv;
@@ -340,9 +387,9 @@ SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
                const char *format, ...);
 SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
                const char *format, va_list args);
-SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi,
-                       char **scpi_response);
-SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);
+SR_PRIV int sr_scpi_read_begin(struct sr_scpi_dev_inst *scpi);
+SR_PRIV int sr_scpi_read_data(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);
+SR_PRIV int sr_scpi_read_complete(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi);
 SR_PRIV void sr_scpi_free(struct sr_scpi_dev_inst *scpi);