GSourceFunc callback, void *user_data)
{
struct fd_source *fsource;
- const char *name;
unsigned int revents;
gboolean keep;
fsource = (struct fd_source *)source;
- name = g_source_get_name(source);
revents = fsource->pollfd.revents;
- if (revents != 0) {
- sr_spew("%s: %s " G_POLLFD_FORMAT ", revents 0x%.2X",
- __func__, name, fsource->pollfd.fd, revents);
- } else {
- sr_spew("%s: %s " G_POLLFD_FORMAT ", timed out",
- __func__, name, fsource->pollfd.fd);
- }
if (!callback) {
sr_err("Callback not set, cannot dispatch event.");
return G_SOURCE_REMOVE;
sr_session_dev_remove_all(session);
g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
+ sr_session_datafeed_callback_remove_all(session);
+
g_hash_table_unref(session->event_sources);
g_mutex_clear(&session->main_mutex);
return SR_OK;
}
+/**
+ * Remove a device instance from a session.
+ *
+ * @param session The session to remove from. Must not be NULL.
+ * @param sdi The device instance to remove from a session. Must not
+ * be NULL. Also, sdi->driver and sdi->driver->dev_open must
+ * not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ *
+ * @since 0.4.0
+ */
+SR_API int sr_session_dev_remove(struct sr_session *session,
+ struct sr_dev_inst *sdi)
+{
+ if (!sdi) {
+ sr_err("%s: sdi was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+
+ if (!session) {
+ sr_err("%s: session was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+
+ /* If sdi->session is not session, the device is not in this
+ * session. */
+ if (sdi->session != session) {
+ sr_err("%s: not assigned to this session", __func__);
+ return SR_ERR_ARG;
+ }
+
+ session->devs = g_slist_remove(session->devs, sdi);
+ sdi->session = NULL;
+
+ return SR_OK;
+}
+
/**
* Remove all datafeed callbacks in a session.
*