X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=6f70c78f226c57cca2e7564e2a1be35e10428862;hb=609bfd753c4a813791a6f678f545940c6d331c20;hp=bd1b7289e979d3b760c819bec1356b25fe638ae9;hpb=33c6e4c5a428115965f980e88e6415fb782658e9;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index bd1b7289..6f70c78f 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -43,11 +43,6 @@
 #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
-
 struct sr_context {
 #ifdef HAVE_LIBUSB_1_0
 	libusb_context *libusb_ctx;
@@ -117,25 +112,28 @@ SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data);
 SR_PRIV void sr_config_free(struct sr_config *src);
 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);
+		sr_receive_data_callback_t cb, void *cb_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
-			    const struct sr_datafeed_packet *packet);
+		const struct sr_datafeed_packet *packet);
 SR_PRIV int sr_session_stop_sync(void);
 
 /*--- std.c -----------------------------------------------------------------*/
 
 typedef int (*dev_close_t)(struct sr_dev_inst *sdi);
+typedef void (*std_dev_clear_t)(void *priv);
 
 SR_PRIV int std_hw_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
-			const char *prefix);
+		const char *prefix);
 SR_PRIV int std_hw_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
-			void *cb_data, dev_close_t hw_dev_close_fn,
-			struct sr_serial_dev_inst *serial, const char *prefix);
+		void *cb_data, dev_close_t hw_dev_close_fn,
+		struct sr_serial_dev_inst *serial, const char *prefix);
 SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
-				       const char *prefix);
+		const char *prefix);
+SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
+		std_dev_clear_t clear_private);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/