X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=6c54cf6d316e6351bfa50d1152679e569f9975d2;hb=a0a23863daecce5b7aaff352ad2bc5f47eb9bd0b;hp=1d93d9e5baa76d414a8397b52e5a309dbde9b813;hpb=d6a8df467de03fe211dea7a0c91f63ceb22c5480;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 1d93d9e5..6c54cf6d 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -27,6 +27,12 @@
 #include <libusb.h>
 #endif
 
+/**
+ * @file
+ *
+ * libsigrok private header file, only to be used internally.
+ */
+
 /*--- Macros ----------------------------------------------------------------*/
 
 #ifndef ARRAY_SIZE
@@ -37,9 +43,20 @@
 #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
 #endif
 
+/* Versions < 2.30.0 of glib don't have g_match_info_unref(). */
+#if !GLIB_CHECK_VERSION(2,30,0)
+#define g_match_info_unref g_match_info_free
+#endif
+
 /* Size of a datastore chunk in units */
 #define DATASTORE_CHUNKSIZE (512 * 1024)
 
+struct sr_context {
+#ifdef HAVE_LIBUSB_1_0
+	libusb_context *libusb_ctx;
+#endif
+};
+
 #ifdef HAVE_LIBUSB_1_0
 struct sr_usb_dev_inst {
 	uint8_t bus;
@@ -56,6 +73,30 @@ struct sr_serial_dev_inst {
 	int fd;
 };
 
+/* Private driver context. */
+struct drv_context {
+	GSList *instances;
+};
+
+/*--- log.c -----------------------------------------------------------------*/
+
+SR_PRIV int sr_log(int loglevel, const char *format, ...);
+SR_PRIV int sr_spew(const char *format, ...);
+SR_PRIV int sr_dbg(const char *format, ...);
+SR_PRIV int sr_info(const char *format, ...);
+SR_PRIV int sr_warn(const char *format, ...);
+SR_PRIV int sr_err(const char *format, ...);
+
+/*--- device.c --------------------------------------------------------------*/
+
+SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
+		gboolean enabled, const char *name);
+
+/* Generic device instances */
+SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
+		const char *vendor, const char *model, const char *version);
+SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi);
+
 #ifdef HAVE_LIBUSB_1_0
 /* USB-specific instances */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
@@ -68,47 +109,31 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(
 					const char *port, int fd);
 SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
 
-/*--- log.c -----------------------------------------------------------------*/
-
-SR_PRIV int sr_log(int loglevel, const char *format, ...);
-SR_PRIV int sr_spew(const char *format, ...);
-SR_PRIV int sr_dbg(const char *format, ...);
-SR_PRIV int sr_info(const char *format, ...);
-SR_PRIV int sr_warn(const char *format, ...);
-SR_PRIV int sr_err(const char *format, ...);
 
 /*--- hwdriver.c ------------------------------------------------------------*/
 
 SR_PRIV void sr_hw_cleanup_all(void);
+SR_PRIV int sr_source_remove(int fd);
+SR_PRIV int sr_source_add(int fd, int events, int timeout,
+			  sr_receive_data_callback_t cb, void *cb_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 			    struct sr_datafeed_packet *packet);
 
-/* Generic device instances */
-SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
-		const char *vendor, const char *model, const char *version);
-SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi);
-SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
-		gboolean enabled, const char *name);
-
-SR_PRIV int sr_source_remove(int fd);
-SR_PRIV int sr_source_add(int fd, int events, int timeout,
-			  sr_receive_data_callback_t cb, void *cb_data);
-
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
-SR_PRIV GSList *list_serial_ports(void);
 SR_PRIV int serial_open(const char *pathname, int flags);
 SR_PRIV int serial_close(int fd);
 SR_PRIV int serial_flush(int fd);
 SR_PRIV int serial_write(int fd, const void *buf, size_t count);
 SR_PRIV int serial_read(int fd, void *buf, size_t count);
-SR_PRIV void *serial_backup_params(int fd);
-SR_PRIV void serial_restore_params(int fd, void *backup);
 SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 			      int stopbits, int flowcontrol);
+SR_PRIV int serial_set_paramstr(int fd, const char *paramstr);
+SR_PRIV int serial_readline(int fd, char **buf, int *buflen,
+			    gint64 timeout_ms);
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/
 
@@ -120,4 +145,33 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 				  const char *filename);
 #endif
 
+/*--- hardware/common/usb.c -------------------------------------------------*/
+
+#ifdef HAVE_LIBUSB_1_0
+SR_PRIV GSList *sr_usb_connect(libusb_context *usb_ctx, const char *conn);
+SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
+#endif
+
+/*--- hardware/common/dmm/fs9922.c ------------------------------------------*/
+
+SR_PRIV int sr_dmm_parse_fs9922(const uint8_t *buf, float *floatval,
+				struct sr_datafeed_analog *analog);
+
+/*--- hardware/common/dmm/fs9721.c ------------------------------------------*/
+
+#define FS9721_PACKET_SIZE 14
+
+struct fs9721_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_c2c1_11, is_c2c1_10, is_c2c1_01, is_c2c1_00, is_sign;
+};
+
+SR_PRIV gboolean sr_fs9721_is_packet_start(uint8_t b);
+SR_PRIV gboolean sr_fs9721_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval,
+			    struct sr_datafeed_analog *analog,
+			    struct fs9721_info *info);
+
 #endif