X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=86a6326a76f52e881315cea54f3ccdb9b26084bd;hb=92248e7821d6ed98390088dab3a4edd329ef414a;hp=b4b32f23ac2a6df21edd845dabe9dc8a3b2e3efe;hpb=bbc42811d0c29e37e449d38d897b8e9cecdc8ba3;p=libsigrok.git

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index b4b32f23..86a6326a 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -113,6 +113,20 @@
                   ((unsigned)((const uint8_t*)(x))[1] <<  8) |  \
                    (unsigned)((const uint8_t*)(x))[0]))
 
+/**
+ * Read a 32 bits big endian float out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding float
+ */
+#define RBFL(x)  ((union { uint32_t u; float f; }) { .u = RB32(x) }.f)
+
+/**
+ * Read a 32 bits little endian float out of memory.
+ * @param x a pointer to the input memory
+ * @return the corresponding float
+ */
+#define RLFL(x)  ((union { uint32_t u; float f; }) { .u = RL32(x) }.f)
+
 /**
  * Write a 8 bits unsigned integer to memory.
  * @param p a pointer to the output memory
@@ -156,6 +170,20 @@
                          ((uint8_t*)(p))[2] = (uint8_t)((x)>>16); \
                          ((uint8_t*)(p))[3] = (uint8_t)((x)>>24); } while (0)
 
+/**
+ * Write a 32 bits float to memory stored as big endian.
+ * @param p a pointer to the output memory
+ * @param x the input float
+ */
+#define WBFL(p, x)  WB32(p, (union { uint32_t u; float f; }) { .f = x }.u)
+
+/**
+ * Write a 32 bits float to memory stored as little endian.
+ * @param p a pointer to the output memory
+ * @param x the input float
+ */
+#define WLFL(p, x)  WL32(p, (union { uint32_t u; float f; }) { .f = x }.u)
+
 /* Portability fixes for FreeBSD. */
 #ifdef __FreeBSD__
 #define LIBUSB_CLASS_APPLICATION 0xfe
@@ -340,6 +368,11 @@ struct sr_output {
 	 */
 	const struct sr_dev_inst *sdi;
 
+	/**
+	 * The name of the file that the data should be written to.
+	 */
+	const char *filename;
+
 	/**
 	 * A generic pointer which can be used by the module to keep internal
 	 * state between calls into its callback functions.
@@ -379,6 +412,13 @@ struct sr_output_module {
 	 */
 	const char *const *exts;
 
+	/**
+	 * Bitfield containing flags that describe certain properties
+	 * this output module may or may not have.
+	 * @see sr_output_flags
+	 */
+	const uint64_t flags;
+
 	/**
 	 * Returns a NULL-terminated list of options this module can take.
 	 * Can be NULL, if the module has no options.
@@ -592,6 +632,8 @@ enum {
 
 SR_PRIV struct sr_channel *sr_channel_new(struct sr_dev_inst *sdi,
 		int index, int type, gboolean enabled, const char *name);
+SR_PRIV struct sr_channel *sr_next_enabled_channel(const struct sr_dev_inst *sdi,
+		struct sr_channel *cur_channel);
 
 /** Device instance data */
 struct sr_dev_inst {
@@ -676,20 +718,19 @@ struct sr_session {
 	GSList *datafeed_callbacks;
 	GSList *transforms;
 	struct sr_trigger *trigger;
-	GTimeVal starttime;
-	gboolean running;
 
-	unsigned int num_sources;
+	gboolean running;
 
 	/*
-	 * Both "sources" and "pollfds" are of the same size and contain pairs
-	 * of descriptor and callback function. We can not embed the GPollFD
-	 * into the source struct since we want to be able to pass the array
-	 * of all poll descriptors to g_poll().
+	 * Event sources and poll FDs are stored in the same order in the
+	 * the sources and pollfds arrays. However, each source may cover
+	 * any number of associated poll FDs, so the indices do not match.
+	 *
+	 * We cannot embed the GPollFD into the source struct since we want
+	 * to be able to pass the array of all poll descriptors to g_poll().
 	 */
-	struct source *sources;
-	GPollFD *pollfds;
-	int source_timeout;
+	GArray *sources;
+	GArray *pollfds;
 
 	/*
 	 * These are our synchronization primitives for stopping the session in
@@ -702,6 +743,12 @@ struct sr_session {
 	gboolean abort_session;
 };
 
+SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
+		const GPollFD *pollfds, int num_fds, int timeout,
+		sr_receive_data_callback cb, void *cb_data,
+		gintptr poll_object);
+SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
+		gintptr poll_object);
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
 SR_PRIV int sr_session_stop_sync(struct sr_session *session);
@@ -826,109 +873,66 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 #ifdef HAVE_LIBUSB_1_0
 SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn);
 SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
+SR_PRIV void sr_usb_close(struct sr_usb_dev_inst *usb);
 SR_PRIV int usb_source_add(struct sr_session *session, struct sr_context *ctx,
 		int timeout, sr_receive_data_callback cb, void *cb_data);
 SR_PRIV int usb_source_remove(struct sr_session *session, struct sr_context *ctx);
 SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len);
 #endif
 
-/*--- hardware/scpi.c -------------------------------------------------------*/
-
-#define SCPI_CMD_IDN "*IDN?"
-#define SCPI_CMD_OPC "*OPC?"
-
-enum {
-	SCPI_CMD_SET_TRIGGER_SOURCE,
-	SCPI_CMD_SET_TIMEBASE,
-	SCPI_CMD_SET_VERTICAL_DIV,
-	SCPI_CMD_SET_TRIGGER_SLOPE,
-	SCPI_CMD_SET_COUPLING,
-	SCPI_CMD_SET_HORIZ_TRIGGERPOS,
-	SCPI_CMD_GET_ANALOG_CHAN_STATE,
-	SCPI_CMD_GET_DIG_CHAN_STATE,
-	SCPI_CMD_GET_TIMEBASE,
-	SCPI_CMD_GET_VERTICAL_DIV,
-	SCPI_CMD_GET_VERTICAL_OFFSET,
-	SCPI_CMD_GET_TRIGGER_SOURCE,
-	SCPI_CMD_GET_HORIZ_TRIGGERPOS,
-	SCPI_CMD_GET_TRIGGER_SLOPE,
-	SCPI_CMD_GET_COUPLING,
-	SCPI_CMD_SET_ANALOG_CHAN_STATE,
-	SCPI_CMD_SET_DIG_CHAN_STATE,
-	SCPI_CMD_GET_DIG_POD_STATE,
-	SCPI_CMD_SET_DIG_POD_STATE,
-	SCPI_CMD_GET_ANALOG_DATA,
-	SCPI_CMD_GET_DIG_DATA,
-	SCPI_CMD_GET_SAMPLE_RATE,
-	SCPI_CMD_GET_SAMPLE_RATE_LIVE,
-};
 
-struct sr_scpi_hw_info {
-	char *manufacturer;
-	char *model;
-	char *serial_number;
-	char *firmware_version;
-};
+/*--- modbus/modbus.c -------------------------------------------------------*/
 
-struct sr_scpi_dev_inst {
+struct sr_modbus_dev_inst {
 	const char *name;
 	const char *prefix;
 	int priv_size;
-	GSList *(*scan)(struct drv_context *drvc);
-	int (*dev_inst_new)(void *priv, struct drv_context *drvc,
-		const char *resource, char **params, const char *serialcomm);
+	GSList *(*scan)(int modbusaddr);
+	int (*dev_inst_new)(void *priv, const char *resource,
+		char **params, const char *serialcomm, int modbusaddr);
 	int (*open)(void *priv);
 	int (*source_add)(struct sr_session *session, void *priv, int events,
 		int timeout, sr_receive_data_callback cb, void *cb_data);
 	int (*source_remove)(struct sr_session *session, void *priv);
-	int (*send)(void *priv, const char *command);
-	int (*read_begin)(void *priv);
-	int (*read_data)(void *priv, char *buf, int maxlen);
-	int (*read_complete)(void *priv);
+	int (*send)(void *priv, const uint8_t *buffer, int buffer_size);
+	int (*read_begin)(void *priv, uint8_t *function_code);
+	int (*read_data)(void *priv, uint8_t *buf, int maxlen);
+	int (*read_end)(void *priv);
 	int (*close)(void *priv);
 	void (*free)(void *priv);
 	unsigned int read_timeout_ms;
 	void *priv;
 };
 
-SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
-		struct sr_dev_inst *(*probe_device)(struct sr_scpi_dev_inst *scpi));
-SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
-		const char *resource, const char *serialcomm);
-SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi);
-SR_PRIV int sr_scpi_source_add(struct sr_session *session,
-		struct sr_scpi_dev_inst *scpi, int events, int timeout,
+SR_PRIV GSList *sr_modbus_scan(struct drv_context *drvc, GSList *options,
+		struct sr_dev_inst *(*probe_device)(struct sr_modbus_dev_inst *modbus));
+SR_PRIV struct sr_modbus_dev_inst *modbus_dev_inst_new(const char *resource,
+		const char *serialcomm, int modbusaddr);
+SR_PRIV int sr_modbus_open(struct sr_modbus_dev_inst *modbus);
+SR_PRIV int sr_modbus_source_add(struct sr_session *session,
+		struct sr_modbus_dev_inst *modbus, int events, int timeout,
 		sr_receive_data_callback cb, void *cb_data);
-SR_PRIV int sr_scpi_source_remove(struct sr_session *session,
-		struct sr_scpi_dev_inst *scpi);
-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_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);
-
-SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
-			const char *command, char **scpi_response);
-SR_PRIV int sr_scpi_get_bool(struct sr_scpi_dev_inst *scpi,
-			const char *command, gboolean *scpi_response);
-SR_PRIV int sr_scpi_get_int(struct sr_scpi_dev_inst *scpi,
-			const char *command, int *scpi_response);
-SR_PRIV int sr_scpi_get_float(struct sr_scpi_dev_inst *scpi,
-			const char *command, float *scpi_response);
-SR_PRIV int sr_scpi_get_double(struct sr_scpi_dev_inst *scpi,
-			const char *command, double *scpi_response);
-SR_PRIV int sr_scpi_get_opc(struct sr_scpi_dev_inst *scpi);
-SR_PRIV int sr_scpi_get_floatv(struct sr_scpi_dev_inst *scpi,
-			const char *command, GArray **scpi_response);
-SR_PRIV int sr_scpi_get_uint8v(struct sr_scpi_dev_inst *scpi,
-			const char *command, GArray **scpi_response);
-SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
-			struct sr_scpi_hw_info **scpi_response);
-SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
+SR_PRIV int sr_modbus_source_remove(struct sr_session *session,
+		struct sr_modbus_dev_inst *modbus);
+SR_PRIV int sr_modbus_request(struct sr_modbus_dev_inst *modbus,
+                              uint8_t *request, int request_size);
+SR_PRIV int sr_modbus_reply(struct sr_modbus_dev_inst *modbus,
+                            uint8_t *reply, int reply_size);
+SR_PRIV int sr_modbus_request_reply(struct sr_modbus_dev_inst *modbus,
+                                    uint8_t *request, int request_size,
+                                    uint8_t *reply, int reply_size);
+SR_PRIV int sr_modbus_read_coils(struct sr_modbus_dev_inst *modbus,
+                                 int address, int nb_coils, uint8_t *coils);
+SR_PRIV int sr_modbus_read_holding_registers(struct sr_modbus_dev_inst *modbus,
+                                             int address, int nb_registers,
+                                             uint16_t *registers);
+SR_PRIV int sr_modbus_write_coil(struct sr_modbus_dev_inst *modbus,
+                                 int address, int value);
+SR_PRIV int sr_modbus_write_multiple_registers(struct sr_modbus_dev_inst*modbus,
+                                               int address, int nb_registers,
+                                               uint16_t *registers);
+SR_PRIV int sr_modbus_close(struct sr_modbus_dev_inst *modbus);
+SR_PRIV void sr_modbus_free(struct sr_modbus_dev_inst *modbus);
 
 /*--- hardware/dmm/es519xx.c ------------------------------------------------*/
 
@@ -1130,4 +1134,17 @@ SR_PRIV gboolean sr_ut372_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval,
 		struct sr_datafeed_analog *analog, void *info);
 
+/*--- hardware/scale/kern.c -------------------------------------------------*/
+
+struct kern_info {
+	gboolean is_gram, is_carat, is_ounce, is_pound, is_troy_ounce;
+	gboolean is_pennyweight, is_grain, is_tael, is_momme, is_tola;
+	gboolean is_percentage, is_piece, is_unstable, is_stable, is_error;
+	int buflen;
+};
+
+SR_PRIV gboolean sr_kern_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval,
+		struct sr_datafeed_analog *analog, void *info);
+
 #endif