X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsigrok-internal.h;h=7499e15f547d1e131c88d9487ea2f0015ac16ff6;hb=ad42cfebcbda16a4021c7e1532ccfc15074bc870;hp=8adda3b7376cbd896b47f0dd091299a4d1e1c683;hpb=b7721913feb5f4dfdbbe0ad60dd6cf931757998b;p=libsigrok.git

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 8adda3b7..7499e15f 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -1572,6 +1572,7 @@ struct sr_serial_dev_inst {
 		SER_BT_CONN_BLE122,	/**!< BLE, BLE122 module, indications */
 		SER_BT_CONN_NRF51,	/**!< BLE, Nordic nRF51, notifications */
 		SER_BT_CONN_CC254x,	/**!< BLE, TI CC254x, notifications */
+		SER_BT_CONN_AC6328,	/**!< BLE, JL AC6328B, notifications */
 		SER_BT_CONN_MAX,	/**!< sentinel */
 	} bt_conn_type;
 	char *bt_addr_local;
@@ -2163,22 +2164,13 @@ enum binary_value_type {
 
 /** Binary value specification */
 struct binary_value_spec {
-	size_t offset;			/**!< Offset into binary blob */
+	size_t offset;			/**!< Offset into binary image */
 	enum binary_value_type type;	/**!< Data type to decode */
 	float scale;			/**!< Scale factor to native units */
 };
 
-/** Binary channel definition */
-struct binary_analog_channel {
-	const char *name;		/**!< Channel name */
-	struct binary_value_spec spec;	/**!< Binary value in data stream */
-	int digits;			/**!< Significant digits */
-	enum sr_mq mq;			/**!< Measured quantity */
-	enum sr_unit unit;		/**!< Measured unit */
-};
-
 /**
- * Read extract a value from a binary blob.
+ * Read extract a value from a binary data image.
  *
  * @param[out] out Pointer to output buffer (conversion result)
  * @param[in] spec Binary value specification
@@ -2190,22 +2182,6 @@ struct binary_analog_channel {
 SR_PRIV int bv_get_value(float *out, const struct binary_value_spec *spec,
 	const void *data, size_t length);
 
-/**
- * Send an analog channel packet based on a binary analog channel
- * specification.
- *
- * @param[in] sdi Device instance
- * @param[in] ch Sigrok channel
- * @param[in] spec Channel specification
- * @param[in] data Pointer to binary blob
- * @param[in] length Size of binary blob
- *
- * @return SR_OK on success, SR_ERR_* error code on failure.
- */
-SR_PRIV int bv_send_analog_channel(const struct sr_dev_inst *sdi,
-	struct sr_channel *ch, const struct binary_analog_channel *spec,
-	const void *data, size_t length);
-
 /*--- crc.c -----------------------------------------------------------------*/
 
 #define SR_CRC16_DEFAULT_INIT 0xffffU
@@ -2776,6 +2752,10 @@ SR_API void feed_queue_logic_free(struct feed_queue_logic *q);
 SR_API struct feed_queue_analog *feed_queue_analog_alloc(
 	const struct sr_dev_inst *sdi,
 	size_t sample_count, int digits, struct sr_channel *ch);
+SR_API int feed_queue_analog_mq_unit(struct feed_queue_analog *q,
+	enum sr_mq mq, enum sr_mqflag mq_flag, enum sr_unit unit);
+SR_API int feed_queue_analog_scale_offset(struct feed_queue_analog *q,
+	const struct sr_rational *scale, const struct sr_rational *offset);
 SR_API int feed_queue_analog_submit(struct feed_queue_analog *q,
 	float data, size_t count);
 SR_API int feed_queue_analog_flush(struct feed_queue_analog *q);