X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session.c;h=6963a233b5617f3bf7a69635031d370d118f74a4;hb=25adf5cf29d26751d3f481bd2d22fe8d034ed44c;hp=7eeab16b839a4b6ab3a275b5dc0fda5aa26915d4;hpb=ca27aa8f9d91d68bfd55fb17fea181a1ba6054a4;p=libsigrokdecode.git
diff --git a/session.c b/session.c
index 7eeab16..6963a23 100644
--- a/session.c
+++ b/session.c
@@ -18,9 +18,10 @@
* along with this program. If not, see .
*/
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include "config.h"
+#include
#include
/**
@@ -40,7 +41,7 @@
/** @cond PRIVATE */
SRD_PRIV GSList *sessions = NULL;
-int max_session_id = -1;
+SRD_PRIV int max_session_id = -1;
/** @endcond */
@@ -124,8 +125,7 @@ SRD_API int srd_session_start(struct srd_session *sess)
return ret;
}
-/** @private */
-SRD_PRIV int srd_inst_send_meta(struct srd_decoder_inst *di, int key,
+static int srd_inst_send_meta(struct srd_decoder_inst *di, int key,
GVariant *data)
{
PyObject *py_ret;
@@ -209,12 +209,13 @@ SRD_API int srd_session_metadata_set(struct srd_session *sess, int key,
/**
* Send a chunk of logic sample data to a running decoder session.
*
- * The logic samples must be arranged in probe order, in the least
- * amount of space possible. If no probes were configured, the default
- * probe set consists of all required probes + all optional probes.
+ * If no channel map has been set up, the logic samples must be arranged
+ * in channel order, in the least amount of space possible. The default
+ * channel set consists of all required channels + all optional channels.
*
- * The size of a sample in inbuf is the minimum number of bytes needed
- * to store the configured (or default) probes.
+ * The size of a sample in inbuf is the unit size passed to
+ * srd_inst_channel_set_all(). If no channel map has been configured, it is
+ * the minimum number of bytes needed to store the default channels.
*
* @param sess The session to use.
* @param start_samplenum The sample number of the first sample in this chunk.
@@ -300,7 +301,7 @@ SRD_API int srd_session_destroy(struct srd_session *sess)
* @since 0.3.0
*/
SRD_API int srd_pd_output_callback_add(struct srd_session *sess,
- int output_type, srd_pd_output_callback_t cb, void *cb_data)
+ int output_type, srd_pd_output_callback cb, void *cb_data)
{
struct srd_pd_callback *pd_cb;