X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=3ab181b3f87c80e2eb6a8d60e634aee8368b08bc;hb=81b3ce374c3b6d48e5ed321ac7a871ce4248a0bb;hp=9060e2a77b707a913363aa4ea1662b317b6699a0;hpb=76372c5a9ce25d94ee992a5c84b8135f0d945293;p=libsigrok.git

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 9060e2a7..3ab181b3 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,7 +170,19 @@
                          ((uint8_t*)(p))[2] = (uint8_t)((x)>>16); \
                          ((uint8_t*)(p))[3] = (uint8_t)((x)>>24); } while (0)
 
-#define PI 3.1415926535897932384626433832795
+/**
+ * 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__
@@ -342,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.
@@ -932,6 +963,59 @@ 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);
 
+/*--- modbus/modbus.c -------------------------------------------------------*/
+
+struct sr_modbus_dev_inst {
+	const char *name;
+	const char *prefix;
+	int priv_size;
+	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 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_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_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 ------------------------------------------------*/
 
 /**