X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=5e1d54a1e86f5d2b8f9dac4129700bab08c823c2;hb=4a090d722d7d3f2d1011fc5ff1c9a39c809f07bd;hp=8687f4329917846c1b9d155c01f71650ba66d5d1;hpb=0abee5076fd7751bd77d0fee940d617a1a40ea34;p=libsigrok.git

diff --git a/session.c b/session.c
index 8687f432..5e1d54a1 100644
--- a/session.c
+++ b/session.c
@@ -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__);
@@ -127,19 +127,24 @@ SR_API int sr_session_dev_add(struct sr_dev *dev)
 		return SR_ERR_ARG;
 	}
 
+	if (!session) {
+		sr_err("session: %s: session was NULL", __func__);
+		return SR_ERR_BUG;
+	}
+
+	/* If dev->driver is NULL, this is a virtual device. */
 	if (!dev->driver) {
-		sr_err("session: %s: dev->driver was NULL", __func__);
-		return SR_ERR_ARG;
+		sr_dbg("session: %s: dev->driver was NULL, this seems to be "
+		       "a virtual device; continuing", __func__);
+		/* Just add the device, don't run dev_open(). */
+		session->devs = g_slist_append(session->devs, dev);
+		return SR_OK;
 	}
 
+	/* dev->driver is non-NULL (i.e. we have a real device). */
 	if (!dev->driver->dev_open) {
 		sr_err("session: %s: dev->driver->dev_open was NULL",
 		       __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!session) {
-		sr_err("session: %s: session was NULL", __func__);
 		return SR_ERR_BUG;
 	}
 
@@ -154,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__);
@@ -395,6 +400,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:
@@ -403,14 +409,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;
@@ -438,11 +461,6 @@ SR_PRIV int sr_session_send(struct sr_dev *dev,
 		return SR_ERR_ARG;
 	}
 
-	if (!dev->driver) {
-		sr_err("session: %s: dev->driver was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
 	if (!packet) {
 		sr_err("session: %s: packet was NULL", __func__);
 		return SR_ERR_ARG;