X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=9c00d9bd383f4e3eb0f2eb70a414d9505b4b245f;hb=825da8b20f8eb879cd6b3e7911b4aa7b35a5b9ed;hp=e4eef91ec3b718bcef4a2041376b376011fbf844;hpb=abc4b3356d184401cb62aaa521d1c80ebd7d6f0f;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index e4eef91e..9c00d9bd 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -17,8 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSIGROK_SIGROK_INTERNAL_H
-#define LIBSIGROK_SIGROK_INTERNAL_H
+/** @file
+  * @internal
+  */
+
+#ifndef LIBSIGROK_LIBSIGROK_INTERNAL_H
+#define LIBSIGROK_LIBSIGROK_INTERNAL_H
 
 #include <stdarg.h>
 #include <glib.h>
@@ -60,9 +64,13 @@ struct sr_context {
 };
 
 #ifdef HAVE_LIBUSB_1_0
+/** USB device instance */
 struct sr_usb_dev_inst {
+	/** USB bus */
 	uint8_t bus;
+	/** Device address on USB bus */
 	uint8_t address;
+	/** libusb device handle */
 	struct libusb_device_handle *devhdl;
 };
 #endif
@@ -72,10 +80,13 @@ struct sr_usb_dev_inst {
 #define SERIAL_PARITY_EVEN SP_PARITY_EVEN
 #define SERIAL_PARITY_ODD  SP_PARITY_ODD
 struct sr_serial_dev_inst {
+	/** Port name, e.g. '/dev/tty42'. */
 	char *port;
+	/** Comm params for serial_set_paramstr(). */
 	char *serialcomm;
-	int fd;
+	/** Port is non-blocking. */
 	int nonblocking;
+	/** libserialport port handle */
 	struct sp_port *data;
 };
 #endif
@@ -87,6 +98,7 @@ struct sr_usbtmc_dev_inst {
 
 /* Private driver context. */
 struct drv_context {
+	/** sigrok context */
 	struct sr_context *sr_ctx;
 	GSList *instances;
 };
@@ -165,7 +177,9 @@ struct sr_session {
 	 * an async fashion. We need to make sure the session is stopped from
 	 * within the session thread itself.
 	 */
+	/** Mutex protecting access to abort_session. */
 	GMutex stop_mutex;
+	/** Abort current session. See sr_session_stop(). */
 	gboolean abort_session;
 };
 
@@ -182,7 +196,8 @@ typedef void (*std_dev_clear_t)(void *priv);
 SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
 		const char *prefix);
 #ifdef HAVE_LIBSERIALPORT
-SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
+SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
 		void *cb_data, dev_close_t dev_close_fn,
 		struct sr_serial_dev_inst *serial, const char *prefix);
 #endif
@@ -190,6 +205,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 		const char *prefix);
 SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 		std_dev_clear_t clear_private);
+SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi);
 
 /*--- strutil.c -------------------------------------------------------------*/
 
@@ -230,6 +246,7 @@ SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_devic
 				      const char **serial_options);
 SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
 		int timeout, sr_receive_data_callback_t cb, void *cb_data);
+SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial);
 #endif
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/
@@ -443,6 +460,14 @@ SR_PRIV void sr_fs9721_01_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *info);
 
+/*--- hardware/common/dmm/m2110.c -----------------------------------------*/
+
+#define BBCGM_M2110_PACKET_SIZE 9
+
+SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval,
+			     struct sr_datafeed_analog *analog, void *info);
+
 /*--- hardware/common/dmm/metex14.c -----------------------------------------*/
 
 #define METEX14_PACKET_SIZE 14