device: introduce common sr_channel_free() support code

[libsigrok.git] / src / libsigrok-internal.h

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index bd308472e0711ded76d2957aa9d8681b0662c32c..6f43e8da78ac63d04c3de550dcd4d9e2b347994e 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -745,7 +745,7 @@ struct drv_context {
 
 /*--- log.c -----------------------------------------------------------------*/
 
-#if defined(G_OS_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+#if defined(_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 /*
  * On MinGW, we need to specify the gnu_printf format flavor or GCC
  * will assume non-standard Microsoft printf syntax.
@@ -782,6 +782,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 void sr_channel_free(struct sr_channel *ch);
+SR_PRIV void sr_channel_free_cb(void *p);
 SR_PRIV struct sr_channel *sr_next_enabled_channel(const struct sr_dev_inst *sdi,
                struct sr_channel *cur_channel);
 
@@ -909,9 +911,6 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 SR_PRIV int sr_sessionfile_check(const char *filename);
 SR_PRIV struct sr_dev_inst *sr_session_prepare_sdi(const char *filename,
                struct sr_session **session);
-SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
-               struct sr_datafeed_packet **copy);
-SR_PRIV void sr_packet_free(struct sr_datafeed_packet *packet);
 
 /*--- session_file.c --------------------------------------------------------*/
 
@@ -963,6 +962,8 @@ SR_PRIV int std_opts_config_list(uint32_t key, GVariant **data,
        const uint32_t scanopts[], size_t scansize, const uint32_t drvopts[],
        size_t drvsize, const uint32_t devopts[], size_t devsize);
 
+extern SR_PRIV const uint32_t NO_OPTS[1];
+
 #define STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts) \
        std_opts_config_list(key, data, sdi, cg, ARRAY_AND_SIZE(scanopts), \
                ARRAY_AND_SIZE(drvopts), ARRAY_AND_SIZE(devopts))