* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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 <inttypes.h>
#include <glib.h>
/**
/** @cond PRIVATE */
SRD_PRIV GSList *sessions = NULL;
-int max_session_id = -1;
+SRD_PRIV int max_session_id = -1;
/** @endcond */
return SRD_ERR_ARG;
}
- if (!(*sess = g_try_malloc(sizeof(struct srd_session))))
- return SRD_ERR_MALLOC;
+ *sess = g_malloc(sizeof(struct srd_session));
(*sess)->session_id = ++max_session_id;
(*sess)->di_list = (*sess)->callbacks = NULL;
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;
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));
/**
* 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 'unitsize' bytes. 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.
* @param end_samplenum The sample number of the last sample in this chunk.
* @param inbuf Pointer to sample data.
* @param inbuflen Length in bytes of the buffer.
+ * @param unitsize The number of bytes per sample.
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*
- * @since 0.3.0
+ * @since 0.4.0
*/
SRD_API int srd_session_send(struct srd_session *sess,
uint64_t start_samplenum, uint64_t end_samplenum,
- const uint8_t *inbuf, uint64_t inbuflen)
+ const uint8_t *inbuf, uint64_t inbuflen, uint64_t unitsize)
{
GSList *d;
int ret;
return SRD_ERR_ARG;
}
- srd_dbg("Calling decode() on all instances with starting sample "
- "number %" PRIu64 ", %" PRIu64 " bytes at 0x%p",
- start_samplenum, inbuflen, inbuf);
-
for (d = sess->di_list; d; d = d->next) {
if ((ret = srd_inst_decode(d->data, start_samplenum,
- end_samplenum, inbuf, inbuflen)) != SRD_OK)
+ end_samplenum, inbuf, inbuflen, unitsize)) != SRD_OK)
return ret;
}
* @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;
srd_dbg("Registering new callback for output type %d.", output_type);
- if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback)))) {
- srd_err("Failed to g_malloc() struct srd_pd_callback.");
- return SRD_ERR_MALLOC;
- }
-
+ pd_cb = g_malloc(sizeof(struct srd_pd_callback));
pd_cb->output_type = output_type;
pd_cb->cb = cb;
pd_cb->cb_data = cb_data;