ir_nec: Update to recent PD API changes.

[libsigrokdecode.git] / session.c

diff --git a/session.c b/session.c
index 109ede10516251c8079d40ce67575532013867f4..8df71576600072802be025119984190e3c45798f 100644 (file)
--- a/session.c
+++ b/session.c
@@ -21,6 +21,7 @@
 #include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode-internal.h"
 #include "config.h"
+#include <inttypes.h>
 #include <glib.h>
 
 /**
@@ -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;
@@ -170,10 +170,27 @@ SRD_API int srd_session_metadata_set(struct srd_session *sess, int key,
                return SRD_ERR_ARG;
        }
 
+       if (!key) {
+               srd_err("Invalid key.");
+               return SRD_ERR_ARG;
+       }
+
+       if (!data) {
+               srd_err("Invalid value.");
+               return SRD_ERR_ARG;
+       }
+
+       /* Hardcoded to samplerate/uint64 for now. */
+
        if (key != SRD_CONF_SAMPLERATE) {
                srd_err("Unknown config key %d.", key);
                return SRD_ERR_ARG;
        }
+       if (!g_variant_is_of_type(data, G_VARIANT_TYPE_UINT64)) {
+               srd_err("Invalid value type: expected uint64, got %s",
+                               g_variant_get_type_string(data));
+               return SRD_ERR_ARG;
+       }
 
        srd_dbg("Setting session %d samplerate to %"PRIu64".",
                        sess->session_id, g_variant_get_uint64(data));
@@ -192,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
+ * If no probe map has been set up, the logic samples must be arranged
+ * in probe order, in the least amount of space possible. The default
  * probe set consists of all required probes + all optional probes.
  *
- * 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_probe_set_all(). If no probe map has been configured, it is
+ * the minimum number of bytes needed to store the default probes.
  *
  * @param sess The session to use.
  * @param start_samplenum The sample number of the first sample in this chunk.