*
* @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__);
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;
}
}
/**
- * 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__);
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:
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;
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;