X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=2ea7dbef29e50fcc64ab2c9876f2f62e8767e0de;hb=115f82939661da6ad2d26d5ceca709bbc0ad25b5;hp=21bd3d4d814f7ee5a867ae5179d6cc0ae5627ffe;hpb=2726474a619e5d9a9bfcf797a5e306f4496a4545;p=libsigrok.git

diff --git a/session.c b/session.c
index 21bd3d4d..2ea7dbef 100644
--- a/session.c
+++ b/session.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
@@ -116,48 +116,6 @@ SR_API int sr_session_destroy(void)
 	return SR_OK;
 }
 
-/**
- * Close a device instance.
- *
- * @param sdi The device instance to close. Must not be NULL. Also,
- *            sdi->driver, sdi->driver->priv, and sdi->priv must not be NULL.
- */
-static void sr_dev_close(struct sr_dev_inst *sdi)
-{
-	int ret;
-
-	if (!sdi) {
-		sr_err("Invalid device instance, can't close device.");
-		return;
-	}
-
-	/* In the drivers sdi->priv is a 'struct dev_context *devc'. */
-	if (!sdi->priv) {
-		/*
-		 * Should be sr_err() in theory, but the 'demo' driver has
-		 * NULL for sdi->priv, so we use sr_dbg() until that's fixed.
-		 */
-		sr_dbg("Invalid device context, can't close device.");
-		return;
-	}
-
-	if (!sdi->driver) {
-		sr_err("Invalid driver, can't close device.");
-		return;
-	}
-
-	if (!sdi->driver->priv) {
-		sr_err("Driver not initialized, can't close device.");
-		return;
-	}
-
-	sr_spew("Closing '%s' device instance %d.", sdi->driver->name,
-		sdi->index);
-
-	if ((ret = sdi->driver->dev_close(sdi)) < 0)
-		sr_err("Failed to close device instance: %d.", ret);
-}
-
 /**
  * Remove all the devices from the current session.
  *
@@ -190,7 +148,6 @@ SR_API int sr_session_dev_remove_all(void)
  */
 SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
 {
-	int ret;
 
 	if (!sdi) {
 		sr_err("%s: sdi was NULL", __func__);
@@ -217,11 +174,6 @@ SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
 		return SR_ERR_BUG;
 	}
 
-	if ((ret = sdi->driver->dev_open((struct sr_dev_inst *)sdi)) != SR_OK) {
-		sr_err("%s: dev_open failed (%d)", __func__, ret);
-		return ret;
-	}
-
 	session->devs = g_slist_append(session->devs, (gpointer)sdi);
 
 	return SR_OK;
@@ -250,6 +202,7 @@ SR_API int sr_session_datafeed_callback_remove_all(void)
  *
  * @param cb Function to call when a chunk of data is received.
  *           Must not be NULL.
+ * @param cb_data Opaque pointer passed in by the caller.
  *
  * @return SR_OK upon success, SR_ERR_BUG if no session exists.
  */