sr: moved sigrok.h so libsigrok/libsigrok.h

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index ffa7e0721f2e726143a29a4dac801dd22bc44f4a..89ea5ad4adf18312698c80a829dee5e4a16c1e31 100644 (file)
--- a/session.c
+++ b/session.c
@@ -22,8 +22,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /* demo.c. TODO: Should not be global! */
 extern SR_PRIV GIOChannel channels[2];
@@ -97,7 +97,7 @@ SR_API int sr_session_destroy(void)
  *
  * @return SR_OK upon success, SR_ERR_BUG if no session exists.
  */
-SR_API int sr_session_dev_clear(void)
+SR_API int sr_session_dev_remove_all(void)
 {
        if (!session) {
                sr_err("session: %s: session was NULL", __func__);
@@ -145,7 +145,7 @@ SR_API int sr_session_dev_add(struct sr_dev *dev)
        if (!dev->driver->dev_open) {
                sr_err("session: %s: dev->driver->dev_open was NULL",
                       __func__);
-               return SR_ERR_ARG;
+               return SR_ERR_BUG;
        }
 
        if ((ret = dev->driver->dev_open(dev->driver_index)) != SR_OK) {
@@ -159,11 +159,11 @@ SR_API int sr_session_dev_add(struct sr_dev *dev)
 }
 
 /**
- * Clear all datafeed callbacks in the current session.
+ * Remove all datafeed callbacks in the current session.
  *
  * @return SR_OK upon success, SR_ERR_BUG if no session exists.
  */
-SR_API int sr_session_datafeed_callback_clear(void)
+SR_API int sr_session_datafeed_callback_remove_all(void)
 {
        if (!session) {
                sr_err("session: %s: session was NULL", __func__);
@@ -217,7 +217,9 @@ static int sr_session_run_poll(void)
 
                /* Construct g_poll()'s array. */
                if (!(fds = g_try_malloc(sizeof(GPollFD) * num_sources))) {
-                       sr_err("session: %s: fds malloc failed", __func__);
+                       /* Not enough memory, or num_sources was 0. */
+                       sr_err("session: %s: fds malloc failed "
+                              "(num_sources was %d).", __func__, num_sources);
                        return SR_ERR_MALLOC;
                }
                for (i = 0; i < num_sources; i++) {
@@ -400,6 +402,7 @@ SR_API int sr_session_stop(void)
 static void datafeed_dump(struct sr_datafeed_packet *packet)
 {
        struct sr_datafeed_logic *logic;
+       struct sr_datafeed_analog *analog;
 
        switch (packet->type) {
        case SR_DF_HEADER:
@@ -408,14 +411,31 @@ static void datafeed_dump(struct sr_datafeed_packet *packet)
        case SR_DF_TRIGGER:
                sr_dbg("bus: received SR_DF_TRIGGER");
                break;
+       case SR_DF_META_LOGIC:
+               sr_dbg("bus: received SR_DF_META_LOGIC");
+               break;
        case SR_DF_LOGIC:
                logic = packet->payload;
                /* TODO: Check for logic != NULL. */
                sr_dbg("bus: received SR_DF_LOGIC %" PRIu64 " bytes", logic->length);
                break;
+       case SR_DF_META_ANALOG:
+               sr_dbg("bus: received SR_DF_META_LOGIC");
+               break;
+       case SR_DF_ANALOG:
+               analog = packet->payload;
+               /* TODO: Check for analog != NULL. */
+               sr_dbg("bus: received SR_DF_ANALOG %d samples", analog->num_samples);
+               break;
        case SR_DF_END:
                sr_dbg("bus: received SR_DF_END");
                break;
+       case SR_DF_FRAME_BEGIN:
+               sr_dbg("bus: received SR_DF_FRAME_BEGIN");
+               break;
+       case SR_DF_FRAME_END:
+               sr_dbg("bus: received SR_DF_FRAME_END");
+               break;
        default:
                sr_dbg("bus: received unknown packet type %d", packet->type);
                break;