/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "sigrok.h"
#include "sigrok-internal.h"
-/* demo.c */
-extern GIOChannel channels[2];
+/* demo.c. TODO: Should not be global! */
+extern SR_PRIV GIOChannel channels[2];
struct source {
int fd;
*
* @return A pointer to the newly allocated session, or NULL upon errors.
*/
-struct sr_session *sr_session_new(void)
+SR_API struct sr_session *sr_session_new(void)
{
- if (!(session = calloc(1, sizeof(struct sr_session)))) {
+ if (!(session = g_try_malloc0(sizeof(struct sr_session)))) {
sr_err("session: %s: session malloc failed", __func__);
return NULL; /* TODO: SR_ERR_MALLOC? */
}
*
* @return SR_OK upon success, SR_ERR_BUG if no session exists.
*/
-int sr_session_destroy(void)
+SR_API int sr_session_destroy(void)
{
if (!session) {
- sr_warn("session: %s: session was NULL", __func__);
+ sr_err("session: %s: session was NULL", __func__);
return SR_ERR_BUG;
}
*
* @return SR_OK upon success, SR_ERR_BUG if no session exists.
*/
-int sr_session_device_clear(void)
+SR_API int sr_session_device_clear(void)
{
if (!session) {
- sr_warn("session: %s: session was NULL", __func__);
+ sr_err("session: %s: session was NULL", __func__);
return SR_ERR_BUG;
}
*
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
*/
-int sr_session_device_add(struct sr_device *device)
+SR_API int sr_session_device_add(struct sr_device *device)
{
int ret;
*
* @return SR_OK upon success, SR_ERR_BUG if no session exists.
*/
-int sr_session_datafeed_callback_clear(void)
+SR_API int sr_session_datafeed_callback_clear(void)
{
if (!session) {
sr_err("session: %s: session was NULL", __func__);
* @param callback TODO.
* @return SR_OK upon success, SR_ERR_BUG if no session exists.
*/
-int sr_session_datafeed_callback_add(sr_datafeed_callback callback)
+SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback callback)
{
if (!session) {
sr_err("session: %s: session was NULL", __func__);
fds = NULL;
while (session->running) {
- if (fds)
- free(fds);
+ /* TODO: Add comment. */
+ g_free(fds);
/* Construct g_poll()'s array. */
- /* TODO: Check malloc return value. */
- fds = malloc(sizeof(GPollFD) * num_sources);
- if (!fds) {
+ if (!(fds = g_try_malloc(sizeof(GPollFD) * num_sources))) {
sr_err("session: %s: fds malloc failed", __func__);
return SR_ERR_MALLOC;
}
}
}
}
- free(fds);
+ g_free(fds);
return SR_OK;
}
*
* @return SR_OK upon success, SR_ERR upon errors.
*/
-int sr_session_start(void)
+SR_API int sr_session_start(void)
{
struct sr_device *device;
GSList *l;
*
* @return SR_OK upon success, SR_ERR_BUG upon errors.
*/
-int sr_session_run(void)
+SR_API int sr_session_run(void)
{
if (!session) {
sr_err("session: %s: session was NULL; a session must be "
*
* @return SR_OK upon success, SR_ERR_BUG if no session exists.
*/
-int sr_session_halt(void)
+SR_API int sr_session_halt(void)
{
if (!session) {
sr_err("session: %s: session was NULL", __func__);
*
* @return SR_OK upon success, SR_ERR_BUG if no session exists.
*/
-int sr_session_stop(void)
+SR_API int sr_session_stop(void)
{
struct sr_device *device;
GSList *l;
}
/**
- * TODO.
+ * @brief debug helper
*
- * TODO: Various error checks.
+ * @param packet The packet to show debugging information for.
*
- * @param packet TODO.
- * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
*/
-static int datafeed_dump(struct sr_datafeed_packet *packet)
+static void datafeed_dump(struct sr_datafeed_packet *packet)
{
struct sr_datafeed_logic *logic;
- if (!packet) {
- sr_err("session: %s: packet was NULL", __func__);
- return SR_ERR_ARG;
- }
-
- /* TODO: Validity checks for packet contents. */
-
switch (packet->type) {
case SR_DF_HEADER:
sr_dbg("bus: received SR_DF_HEADER");
break;
case SR_DF_TRIGGER:
- sr_dbg("bus: received SR_DF_TRIGGER at %lu ms",
- packet->timeoffset / 1000000);
+ sr_dbg("bus: received SR_DF_TRIGGER");
break;
case SR_DF_LOGIC:
logic = packet->payload;
/* TODO: Check for logic != NULL. */
- sr_dbg("bus: received SR_DF_LOGIC at %f ms duration %f ms, "
- "%" PRIu64 " bytes", packet->timeoffset / 1000000.0,
- packet->duration / 1000000.0, logic->length);
+ sr_dbg("bus: received SR_DF_LOGIC %" PRIu64 " bytes", logic->length);
break;
case SR_DF_END:
sr_dbg("bus: received SR_DF_END");
break;
default:
- /* TODO: Abort? */
- sr_err("bus: received unknown packet type %d", packet->type);
+ sr_dbg("bus: received unknown packet type %d", packet->type);
break;
}
- return SR_OK;
}
/**
* @param packet TODO.
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
*/
-int sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
+SR_API int sr_session_bus(struct sr_device *device,
+ struct sr_datafeed_packet *packet)
{
GSList *l;
sr_datafeed_callback cb;
* the callbacks as well.
*/
for (l = session->datafeed_callbacks; l; l = l->next) {
+ if (sr_log_loglevel_get() >= SR_LOG_DBG)
+ datafeed_dump(packet);
cb = l->data;
/* TODO: Check for cb != NULL. */
- datafeed_dump(packet);
cb(device, packet);
}
/**
* TODO.
*
- * TODO: Switch to g_try_malloc0() / g_free().
* TODO: More error checks etc.
*
* @param fd TODO.
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
* SR_ERR_MALLOC upon memory allocation errors.
*/
-int sr_session_source_add(int fd, int events, int timeout,
- sr_receive_data_callback callback, void *user_data)
+SR_API int sr_session_source_add(int fd, int events, int timeout,
+ sr_receive_data_callback callback, void *user_data)
{
struct source *new_sources, *s;
/* Note: user_data can be NULL, that's not a bug. */
- new_sources = calloc(1, sizeof(struct source) * (num_sources + 1));
+ new_sources = g_try_malloc0(sizeof(struct source) * (num_sources + 1));
if (!new_sources) {
sr_err("session: %s: new_sources malloc failed", __func__);
return SR_ERR_MALLOC;
if (sources) {
memcpy(new_sources, sources,
sizeof(struct source) * num_sources);
- free(sources);
+ g_free(sources);
}
s = &new_sources[num_sources++];
* Remove the source belonging to the specified file descriptor.
*
* TODO: More error checks.
- * TODO: Switch to g_try_malloc0() / g_free().
*
* @param fd TODO.
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
* SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
* internal errors.
*/
-int sr_session_source_remove(int fd)
+SR_API int sr_session_source_remove(int fd)
{
struct source *new_sources;
int old, new;
/* TODO: Check if 'fd' valid. */
- new_sources = calloc(1, sizeof(struct source) * num_sources);
+ new_sources = g_try_malloc0(sizeof(struct source) * num_sources);
if (!new_sources) {
sr_err("session: %s: new_sources malloc failed", __func__);
return SR_ERR_MALLOC;
}
if (old != new) {
- free(sources);
+ g_free(sources);
sources = new_sources;
num_sources--;
} else {
/* Target fd was not found. */
- free(new_sources);
+ g_free(new_sources);
}
return SR_OK;
projects / libsigrok.git / blobdiff