From: Bert Vermeulen <redacted>
Date: Sun, 12 Feb 2012 23:08:23 +0000 (+0100)
Subject: sr: cleaned up session bus debug helper
X-Git-Tag: libsigrok-0.1.0~133
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=18beaeff948f5730e1ffbc1a50e8b86c7673f084;hp=bb08ee2e534a7fca22cff2f8d963d64441b6d65a;p=libsigrok.git

sr: cleaned up session bus debug helper
---

diff --git a/session.c b/session.c
index ed8cadc5..06c265a9 100644
--- a/session.c
+++ b/session.c
@@ -387,24 +387,15 @@ SR_API int sr_session_stop(void)
 }
 
 /**
- * TODO.
- *
- * TODO: Various error checks.
+ * @brief debug helper
  *
  * @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");
@@ -421,12 +412,10 @@ static int datafeed_dump(struct sr_datafeed_packet *packet)
 		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;
 }
 
 /**
@@ -462,9 +451,10 @@ SR_API int sr_session_bus(struct sr_device *device,
 	 * 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);
 	}