X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsigrok-internal.h;h=3413f9208fae0377e3633ef2c329bc9239394cdf;hb=e6b15cb5e609c9263f501d3b12965206feddb42b;hp=84ad295ef61de0ee1204e83c54299668cf6fe1b6;hpb=2c24077466a299ead689c90f01f55f6d86c7386b;p=libsigrok.git

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 84ad295e..3413f920 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -76,6 +76,15 @@ struct zip_stat;
 #define RL16(x)  (((unsigned)((const uint8_t*)(x))[1] <<  8) | \
                    (unsigned)((const uint8_t*)(x))[0])
 
+/**
+ * Read a 16 bits big endian signed integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding signed integer
+ */
+#define RB16S(x)  ((int16_t) \
+                  (((unsigned)((const uint8_t*)(x))[0] <<  8) | \
+                    (unsigned)((const uint8_t*)(x))[1]))
+
 /**
  * Read a 16 bits little endian signed integer out of memory.
  * @param x a pointer to the input memory
@@ -105,6 +114,17 @@ struct zip_stat;
                   ((unsigned)((const uint8_t*)(x))[1] <<  8) |  \
                    (unsigned)((const uint8_t*)(x))[0])
 
+/**
+ * Read a 32 bits big endian signed integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding signed integer
+ */
+#define RB32S(x)  ((int32_t) \
+                 (((unsigned)((const uint8_t*)(x))[0] << 24) | \
+                  ((unsigned)((const uint8_t*)(x))[1] << 16) | \
+                  ((unsigned)((const uint8_t*)(x))[2] <<  8) | \
+                   (unsigned)((const uint8_t*)(x))[3]))
+
 /**
  * Read a 32 bits little endian signed integer out of memory.
  * @param x a pointer to the input memory
@@ -116,6 +136,20 @@ struct zip_stat;
                   ((unsigned)((const uint8_t*)(x))[1] <<  8) |  \
                    (unsigned)((const uint8_t*)(x))[0]))
 
+/**
+ * Read a 64 bits big endian unsigned integer out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding unsigned integer
+ */
+#define RB64(x)  (((uint64_t)((const uint8_t*)(x))[0] << 56) | \
+                  ((uint64_t)((const uint8_t*)(x))[1] << 48) |  \
+                  ((uint64_t)((const uint8_t*)(x))[2] << 40) |  \
+                  ((uint64_t)((const uint8_t*)(x))[3] << 32) |  \
+                  ((uint64_t)((const uint8_t*)(x))[4] << 24) |  \
+                  ((uint64_t)((const uint8_t*)(x))[5] << 16) |  \
+                  ((uint64_t)((const uint8_t*)(x))[6] <<  8) |  \
+                   (uint64_t)((const uint8_t*)(x))[7])
+
 /**
  * Read a 32 bits big endian float out of memory.
  * @param x a pointer to the input memory
@@ -1036,6 +1070,22 @@ SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog_old *analog, void *in
 SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog_old *analog, void *info);
 SR_PRIV void sr_fs9721_max_c_min(struct sr_datafeed_analog_old *analog, void *info);
 
+/*--- hardware/dmm/dtm0660.c ------------------------------------------------*/
+
+#define DTM0660_PACKET_SIZE 15
+
+struct dtm0660_info {
+	gboolean is_ac, is_dc, is_auto, is_rs232, is_micro, is_nano, is_kilo;
+	gboolean is_diode, is_milli, is_percent, is_mega, is_beep, is_farad;
+	gboolean is_ohm, is_rel, is_hold, is_ampere, is_volt, is_hz, is_bat;
+	gboolean is_degf, is_degc, is_c2c1_01, is_c2c1_00, is_apo, is_min;
+	gboolean is_minmax, is_max, is_sign;
+};
+
+SR_PRIV gboolean sr_dtm0660_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval,
+			struct sr_datafeed_analog_old *analog, void *info);
+
 /*--- hardware/dmm/m2110.c --------------------------------------------------*/
 
 #define BBCGM_M2110_PACKET_SIZE 9