Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 1 | /* |
Uwe Hermann | 50985c2 | 2013-04-23 22:24:30 +0200 | [diff] [blame] | 2 | * This file is part of the libsigrok project. |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 3 | * |
Bert Vermeulen | c73d2ea | 2012-02-13 14:31:51 +0100 | [diff] [blame] | 4 | * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com> |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 5 | * |
| 6 | * This program is free software: you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License as published by |
| 8 | * the Free Software Foundation, either version 3 of the License, or |
| 9 | * (at your option) any later version. |
| 10 | * |
| 11 | * This program is distributed in the hope that it will be useful, |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 | * GNU General Public License for more details. |
| 15 | * |
| 16 | * You should have received a copy of the GNU General Public License |
| 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 18 | */ |
| 19 | |
| 20 | #include <stdio.h> |
| 21 | #include <stdlib.h> |
| 22 | #include <unistd.h> |
| 23 | #include <string.h> |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 24 | #include <glib.h> |
Bert Vermeulen | 45c59c8 | 2012-07-05 00:55:07 +0200 | [diff] [blame] | 25 | #include "libsigrok.h" |
| 26 | #include "libsigrok-internal.h" |
Bert Vermeulen | aa4b110 | 2011-01-24 07:46:16 +0100 | [diff] [blame] | 27 | |
Uwe Hermann | 29a2719 | 2013-05-03 21:59:32 +0200 | [diff] [blame] | 28 | /* Message logging helpers with subsystem-specific prefix string. */ |
| 29 | #define LOG_PREFIX "session: " |
| 30 | #define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) |
| 31 | #define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) |
| 32 | #define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) |
| 33 | #define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) |
| 34 | #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) |
| 35 | #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 36 | |
Uwe Hermann | 7b870c3 | 2012-10-21 16:13:36 +0200 | [diff] [blame] | 37 | /** |
Uwe Hermann | 393fb9c | 2012-10-22 00:30:12 +0200 | [diff] [blame] | 38 | * @file |
| 39 | * |
| 40 | * Creating, using, or destroying libsigrok sessions. |
| 41 | */ |
| 42 | |
| 43 | /** |
Uwe Hermann | 7b870c3 | 2012-10-21 16:13:36 +0200 | [diff] [blame] | 44 | * @defgroup grp_session Session handling |
| 45 | * |
| 46 | * Creating, using, or destroying libsigrok sessions. |
| 47 | * |
| 48 | * @{ |
| 49 | */ |
| 50 | |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 51 | struct source { |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 52 | int timeout; |
Uwe Hermann | d08490a | 2012-02-29 21:56:24 +0100 | [diff] [blame] | 53 | sr_receive_data_callback_t cb; |
Uwe Hermann | 1f9813e | 2012-02-29 22:32:34 +0100 | [diff] [blame] | 54 | void *cb_data; |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 55 | |
| 56 | /* This is used to keep track of the object (fd, pollfd or channel) which is |
| 57 | * being polled and will be used to match the source when removing it again. |
| 58 | */ |
| 59 | gintptr poll_object; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 60 | }; |
| 61 | |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 62 | struct datafeed_callback { |
| 63 | sr_datafeed_callback_t cb; |
| 64 | void *cb_data; |
| 65 | }; |
| 66 | |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 67 | /* There can only be one session at a time. */ |
Uwe Hermann | a0ecd83 | 2011-12-28 22:55:21 +0100 | [diff] [blame] | 68 | /* 'session' is not static, it's used elsewhere (via 'extern'). */ |
Uwe Hermann | 2872d21 | 2011-02-08 17:50:29 +0100 | [diff] [blame] | 69 | struct sr_session *session; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 70 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 71 | /** |
| 72 | * Create a new session. |
| 73 | * |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 74 | * @todo Should it use the file-global "session" variable or take an argument? |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 75 | * The same question applies to all the other session functions. |
| 76 | * |
| 77 | * @return A pointer to the newly allocated session, or NULL upon errors. |
| 78 | */ |
Uwe Hermann | 1a081ca | 2012-02-01 23:40:35 +0100 | [diff] [blame] | 79 | SR_API struct sr_session *sr_session_new(void) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 80 | { |
Uwe Hermann | 133a37b | 2012-02-11 20:06:46 +0100 | [diff] [blame] | 81 | if (!(session = g_try_malloc0(sizeof(struct sr_session)))) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 82 | sr_err("Session malloc failed."); |
| 83 | return NULL; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 84 | } |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 85 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 86 | session->source_timeout = -1; |
Bert Vermeulen | 5451816 | 2013-09-21 17:44:49 +0200 | [diff] [blame] | 87 | session->running = FALSE; |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 88 | session->abort_session = FALSE; |
| 89 | g_mutex_init(&session->stop_mutex); |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 90 | |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 91 | return session; |
| 92 | } |
| 93 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 94 | /** |
| 95 | * Destroy the current session. |
| 96 | * |
| 97 | * This frees up all memory used by the session. |
| 98 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 99 | * @return SR_OK upon success, SR_ERR_BUG if no session exists. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 100 | */ |
Uwe Hermann | 1a081ca | 2012-02-01 23:40:35 +0100 | [diff] [blame] | 101 | SR_API int sr_session_destroy(void) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 102 | { |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 103 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 104 | sr_err("%s: session was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 105 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 106 | } |
| 107 | |
Lars-Peter Clausen | ed229aa | 2012-07-05 21:15:07 +0200 | [diff] [blame] | 108 | sr_session_dev_remove_all(); |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 109 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 110 | /* TODO: Error checks needed? */ |
| 111 | |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 112 | g_mutex_clear(&session->stop_mutex); |
| 113 | |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 114 | g_free(session); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 115 | session = NULL; |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 116 | |
| 117 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 118 | } |
| 119 | |
Uwe Hermann | 961009b | 2013-02-01 22:58:54 +0100 | [diff] [blame] | 120 | /** |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 121 | * Remove all the devices from the current session. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 122 | * |
| 123 | * The session itself (i.e., the struct sr_session) is not free'd and still |
| 124 | * exists after this function returns. |
| 125 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 126 | * @return SR_OK upon success, SR_ERR_BUG if no session exists. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 127 | */ |
Uwe Hermann | 01c3e9d | 2012-03-28 21:55:48 +0200 | [diff] [blame] | 128 | SR_API int sr_session_dev_remove_all(void) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 129 | { |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 130 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 131 | sr_err("%s: session was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 132 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 133 | } |
| 134 | |
Bert Vermeulen | 681803d | 2013-04-28 22:35:42 +0200 | [diff] [blame] | 135 | g_slist_free(session->devs); |
Uwe Hermann | bb7ef79 | 2012-02-17 22:25:01 +0100 | [diff] [blame] | 136 | session->devs = NULL; |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 137 | |
| 138 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 139 | } |
| 140 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 141 | /** |
Uwe Hermann | 9c5332d | 2012-10-21 16:52:56 +0200 | [diff] [blame] | 142 | * Add a device instance to the current session. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 143 | * |
Uwe Hermann | 9c5332d | 2012-10-21 16:52:56 +0200 | [diff] [blame] | 144 | * @param sdi The device instance to add to the current session. Must not |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 145 | * be NULL. Also, sdi->driver and sdi->driver->dev_open must |
| 146 | * not be NULL. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 147 | * |
| 148 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments. |
| 149 | */ |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 150 | SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 151 | { |
Bert Vermeulen | 5451816 | 2013-09-21 17:44:49 +0200 | [diff] [blame] | 152 | int ret; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 153 | |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 154 | if (!sdi) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 155 | sr_err("%s: sdi was NULL", __func__); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 156 | return SR_ERR_ARG; |
| 157 | } |
| 158 | |
Uwe Hermann | d6eb0c3 | 2012-03-18 12:57:34 +0100 | [diff] [blame] | 159 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 160 | sr_err("%s: session was NULL", __func__); |
Uwe Hermann | d6eb0c3 | 2012-03-18 12:57:34 +0100 | [diff] [blame] | 161 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 162 | } |
| 163 | |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 164 | /* If sdi->driver is NULL, this is a virtual device. */ |
| 165 | if (!sdi->driver) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 166 | sr_dbg("%s: sdi->driver was NULL, this seems to be " |
Uwe Hermann | d6eb0c3 | 2012-03-18 12:57:34 +0100 | [diff] [blame] | 167 | "a virtual device; continuing", __func__); |
| 168 | /* Just add the device, don't run dev_open(). */ |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 169 | session->devs = g_slist_append(session->devs, (gpointer)sdi); |
Uwe Hermann | d6eb0c3 | 2012-03-18 12:57:34 +0100 | [diff] [blame] | 170 | return SR_OK; |
| 171 | } |
| 172 | |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 173 | /* sdi->driver is non-NULL (i.e. we have a real device). */ |
| 174 | if (!sdi->driver->dev_open) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 175 | sr_err("%s: sdi->driver->dev_open was NULL", __func__); |
Uwe Hermann | 8ec95d2 | 2012-03-21 19:28:43 +0100 | [diff] [blame] | 176 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 177 | } |
| 178 | |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 179 | session->devs = g_slist_append(session->devs, (gpointer)sdi); |
Bert Vermeulen | aa4b110 | 2011-01-24 07:46:16 +0100 | [diff] [blame] | 180 | |
Bert Vermeulen | 5451816 | 2013-09-21 17:44:49 +0200 | [diff] [blame] | 181 | if (session->running) { |
| 182 | /* Adding a device to a running session. Start acquisition |
| 183 | * on that device now. */ |
| 184 | if ((ret = sdi->driver->dev_acquisition_start(sdi, |
| 185 | (void *)sdi)) != SR_OK) |
| 186 | sr_err("Failed to start acquisition of device in " |
| 187 | "running session: %d", ret); |
| 188 | } |
| 189 | |
Uwe Hermann | e46b8fb | 2011-01-29 16:23:12 +0100 | [diff] [blame] | 190 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 191 | } |
| 192 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 193 | /** |
Bert Vermeulen | 2bb311b | 2013-09-02 14:24:32 +0200 | [diff] [blame] | 194 | * List all device instances attached to the current session. |
| 195 | * |
| 196 | * @param devlist A pointer where the device instance list will be |
| 197 | * stored on return. If no devices are in the session, |
| 198 | * this will be NULL. Each element in the list points |
| 199 | * to a struct sr_dev_inst *. |
| 200 | * The list must be freed by the caller, but not the |
| 201 | * elements pointed to. |
| 202 | * |
| 203 | * @return SR_OK upon success, SR_ERR upon invalid arguments. |
| 204 | */ |
| 205 | SR_API int sr_session_dev_list(GSList **devlist) |
| 206 | { |
| 207 | |
| 208 | *devlist = NULL; |
| 209 | |
| 210 | if (!session) |
| 211 | return SR_ERR; |
| 212 | |
| 213 | *devlist = g_slist_copy(session->devs); |
| 214 | |
| 215 | return SR_OK; |
| 216 | } |
| 217 | |
| 218 | /** |
Uwe Hermann | 01c3e9d | 2012-03-28 21:55:48 +0200 | [diff] [blame] | 219 | * Remove all datafeed callbacks in the current session. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 220 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 221 | * @return SR_OK upon success, SR_ERR_BUG if no session exists. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 222 | */ |
Uwe Hermann | 01c3e9d | 2012-03-28 21:55:48 +0200 | [diff] [blame] | 223 | SR_API int sr_session_datafeed_callback_remove_all(void) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 224 | { |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 225 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 226 | sr_err("%s: session was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 227 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 228 | } |
| 229 | |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 230 | g_slist_free_full(session->datafeed_callbacks, g_free); |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 231 | session->datafeed_callbacks = NULL; |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 232 | |
| 233 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 234 | } |
| 235 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 236 | /** |
| 237 | * Add a datafeed callback to the current session. |
| 238 | * |
Uwe Hermann | d08490a | 2012-02-29 21:56:24 +0100 | [diff] [blame] | 239 | * @param cb Function to call when a chunk of data is received. |
Uwe Hermann | 0abee50 | 2012-03-04 15:08:11 +0100 | [diff] [blame] | 240 | * Must not be NULL. |
Uwe Hermann | 8522279 | 2013-04-16 12:48:58 +0200 | [diff] [blame] | 241 | * @param cb_data Opaque pointer passed in by the caller. |
Bert Vermeulen | a1645fc | 2012-02-13 03:36:32 +0100 | [diff] [blame] | 242 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 243 | * @return SR_OK upon success, SR_ERR_BUG if no session exists. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 244 | */ |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 245 | SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb, void *cb_data) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 246 | { |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 247 | struct datafeed_callback *cb_struct; |
| 248 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 249 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 250 | sr_err("%s: session was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 251 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 252 | } |
| 253 | |
Uwe Hermann | 0abee50 | 2012-03-04 15:08:11 +0100 | [diff] [blame] | 254 | if (!cb) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 255 | sr_err("%s: cb was NULL", __func__); |
Uwe Hermann | 0abee50 | 2012-03-04 15:08:11 +0100 | [diff] [blame] | 256 | return SR_ERR_ARG; |
| 257 | } |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 258 | |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 259 | if (!(cb_struct = g_try_malloc0(sizeof(struct datafeed_callback)))) |
| 260 | return SR_ERR_MALLOC; |
| 261 | |
| 262 | cb_struct->cb = cb; |
| 263 | cb_struct->cb_data = cb_data; |
| 264 | |
Uwe Hermann | 62c8202 | 2010-04-15 20:16:53 +0200 | [diff] [blame] | 265 | session->datafeed_callbacks = |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 266 | g_slist_append(session->datafeed_callbacks, cb_struct); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 267 | |
| 268 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 269 | } |
| 270 | |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 271 | /** |
| 272 | * Call every device in the session's callback. |
| 273 | * |
| 274 | * For sessions not driven by select loops such as sr_session_run(), |
| 275 | * but driven by another scheduler, this can be used to poll the devices |
| 276 | * from within that scheduler. |
| 277 | * |
Bert Vermeulen | f6eb2cb | 2013-07-18 15:06:06 +0200 | [diff] [blame] | 278 | * @param block If TRUE, this call will wait for any of the session's |
| 279 | * sources to fire an event on the file descriptors, or |
| 280 | * any of their timeouts to activate. In other words, this |
| 281 | * can be used as a select loop. |
| 282 | * If FALSE, all sources have their callback run, regardless |
| 283 | * of file descriptor or timeout status. |
| 284 | * |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 285 | * @return SR_OK upon success, SR_ERR on errors. |
| 286 | */ |
Uwe Hermann | 1861be0 | 2013-08-07 00:34:06 +0200 | [diff] [blame] | 287 | static int sr_session_iteration(gboolean block) |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 288 | { |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 289 | unsigned int i; |
| 290 | int ret; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 291 | |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 292 | ret = g_poll(session->pollfds, session->num_sources, |
| 293 | block ? session->source_timeout : 0); |
| 294 | for (i = 0; i < session->num_sources; i++) { |
| 295 | if (session->pollfds[i].revents > 0 || (ret == 0 |
| 296 | && session->source_timeout == session->sources[i].timeout)) { |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 297 | /* |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 298 | * Invoke the source's callback on an event, |
| 299 | * or if the poll timed out and this source |
| 300 | * asked for that timeout. |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 301 | */ |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 302 | if (!session->sources[i].cb(session->pollfds[i].fd, |
| 303 | session->pollfds[i].revents, |
| 304 | session->sources[i].cb_data)) |
| 305 | sr_session_source_remove(session->sources[i].poll_object); |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 306 | } |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 307 | /* |
| 308 | * We want to take as little time as possible to stop |
| 309 | * the session if we have been told to do so. Therefore, |
| 310 | * we check the flag after processing every source, not |
| 311 | * just once per main event loop. |
| 312 | */ |
| 313 | g_mutex_lock(&session->stop_mutex); |
| 314 | if (session->abort_session) { |
| 315 | sr_session_stop_sync(); |
| 316 | /* But once is enough. */ |
| 317 | session->abort_session = FALSE; |
| 318 | } |
| 319 | g_mutex_unlock(&session->stop_mutex); |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 320 | } |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 321 | |
| 322 | return SR_OK; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 323 | } |
| 324 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 325 | /** |
| 326 | * Start a session. |
| 327 | * |
Bert Vermeulen | a1645fc | 2012-02-13 03:36:32 +0100 | [diff] [blame] | 328 | * There can only be one session at a time. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 329 | * |
| 330 | * @return SR_OK upon success, SR_ERR upon errors. |
| 331 | */ |
Uwe Hermann | 1a081ca | 2012-02-01 23:40:35 +0100 | [diff] [blame] | 332 | SR_API int sr_session_start(void) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 333 | { |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 334 | struct sr_dev_inst *sdi; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 335 | GSList *l; |
| 336 | int ret; |
| 337 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 338 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 339 | sr_err("%s: session was NULL; a session must be " |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 340 | "created before starting it.", __func__); |
Uwe Hermann | 0abee50 | 2012-03-04 15:08:11 +0100 | [diff] [blame] | 341 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 342 | } |
| 343 | |
Uwe Hermann | bb7ef79 | 2012-02-17 22:25:01 +0100 | [diff] [blame] | 344 | if (!session->devs) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 345 | sr_err("%s: session->devs was NULL; a session " |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 346 | "cannot be started without devices.", __func__); |
Uwe Hermann | 0abee50 | 2012-03-04 15:08:11 +0100 | [diff] [blame] | 347 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 348 | } |
| 349 | |
Uwe Hermann | c714260 | 2013-02-07 09:16:28 +0100 | [diff] [blame] | 350 | sr_info("Starting."); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 351 | |
Uwe Hermann | b7c3e84 | 2012-12-31 21:05:11 +0100 | [diff] [blame] | 352 | ret = SR_OK; |
Uwe Hermann | bb7ef79 | 2012-02-17 22:25:01 +0100 | [diff] [blame] | 353 | for (l = session->devs; l; l = l->next) { |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 354 | sdi = l->data; |
| 355 | if ((ret = sdi->driver->dev_acquisition_start(sdi, sdi)) != SR_OK) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 356 | sr_err("%s: could not start an acquisition " |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 357 | "(%d)", __func__, ret); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 358 | break; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 359 | } |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 360 | } |
| 361 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 362 | /* TODO: What if there are multiple devices? Which return code? */ |
| 363 | |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 364 | return ret; |
| 365 | } |
| 366 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 367 | /** |
| 368 | * Run the session. |
| 369 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 370 | * @return SR_OK upon success, SR_ERR_BUG upon errors. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 371 | */ |
Uwe Hermann | 1a081ca | 2012-02-01 23:40:35 +0100 | [diff] [blame] | 372 | SR_API int sr_session_run(void) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 373 | { |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 374 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 375 | sr_err("%s: session was NULL; a session must be " |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 376 | "created first, before running it.", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 377 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 378 | } |
| 379 | |
Uwe Hermann | bb7ef79 | 2012-02-17 22:25:01 +0100 | [diff] [blame] | 380 | if (!session->devs) { |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 381 | /* TODO: Actually the case? */ |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 382 | sr_err("%s: session->devs was NULL; a session " |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 383 | "cannot be run without devices.", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 384 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 385 | } |
Bert Vermeulen | 5451816 | 2013-09-21 17:44:49 +0200 | [diff] [blame] | 386 | session->running = TRUE; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 387 | |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 388 | sr_info("Running."); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 389 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 390 | /* Do we have real sources? */ |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 391 | if (session->num_sources == 1 && session->pollfds[0].fd == -1) { |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 392 | /* Dummy source, freewheel over it. */ |
Bert Vermeulen | 2cbeb2b | 2012-08-03 01:04:05 +0200 | [diff] [blame] | 393 | while (session->num_sources) |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 394 | session->sources[0].cb(-1, 0, session->sources[0].cb_data); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 395 | } else { |
| 396 | /* Real sources, use g_poll() main loop. */ |
Bert Vermeulen | b483be7 | 2013-07-15 14:14:28 +0200 | [diff] [blame] | 397 | while (session->num_sources) |
| 398 | sr_session_iteration(TRUE); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 399 | } |
| 400 | |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 401 | return SR_OK; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 402 | } |
| 403 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 404 | /** |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 405 | * Stop the current session. |
| 406 | * |
Bert Vermeulen | a1645fc | 2012-02-13 03:36:32 +0100 | [diff] [blame] | 407 | * The current session is stopped immediately, with all acquisition sessions |
Uwe Hermann | c09f0b5 | 2012-02-28 23:52:30 +0100 | [diff] [blame] | 408 | * being stopped and hardware drivers cleaned up. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 409 | * |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 410 | * This must be called from within the session thread, to prevent freeing |
| 411 | * resources that the session thread will try to use. |
| 412 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 413 | * @return SR_OK upon success, SR_ERR_BUG if no session exists. |
Bert Vermeulen | 72a08bc | 2013-09-25 11:51:38 +0200 | [diff] [blame^] | 414 | * |
| 415 | * @private |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 416 | */ |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 417 | SR_PRIV int sr_session_stop_sync(void) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 418 | { |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 419 | struct sr_dev_inst *sdi; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 420 | GSList *l; |
| 421 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 422 | if (!session) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 423 | sr_err("%s: session was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 424 | return SR_ERR_BUG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 425 | } |
| 426 | |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 427 | sr_info("Stopping."); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 428 | |
Uwe Hermann | bb7ef79 | 2012-02-17 22:25:01 +0100 | [diff] [blame] | 429 | for (l = session->devs; l; l = l->next) { |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 430 | sdi = l->data; |
| 431 | if (sdi->driver) { |
| 432 | if (sdi->driver->dev_acquisition_stop) |
| 433 | sdi->driver->dev_acquisition_stop(sdi, sdi); |
Bert Vermeulen | 8c76be5 | 2012-01-08 22:05:00 +0100 | [diff] [blame] | 434 | } |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 435 | } |
Bert Vermeulen | 5451816 | 2013-09-21 17:44:49 +0200 | [diff] [blame] | 436 | session->running = FALSE; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 437 | |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 438 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 439 | } |
| 440 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 441 | /** |
Alexandru Gagniuc | 33c6e4c | 2013-02-02 00:50:00 -0600 | [diff] [blame] | 442 | * Stop the current session. |
| 443 | * |
| 444 | * The current session is stopped immediately, with all acquisition sessions |
| 445 | * being stopped and hardware drivers cleaned up. |
| 446 | * |
| 447 | * If the session is run in a separate thread, this function will not block |
| 448 | * until the session is finished executing. It is the caller's responsibility |
| 449 | * to wait for the session thread to return before assuming that the session is |
| 450 | * completely decommissioned. |
| 451 | * |
| 452 | * @return SR_OK upon success, SR_ERR_BUG if no session exists. |
| 453 | */ |
| 454 | SR_API int sr_session_stop(void) |
| 455 | { |
| 456 | if (!session) { |
| 457 | sr_err("%s: session was NULL", __func__); |
| 458 | return SR_ERR_BUG; |
| 459 | } |
| 460 | |
| 461 | g_mutex_lock(&session->stop_mutex); |
| 462 | session->abort_session = TRUE; |
| 463 | g_mutex_unlock(&session->stop_mutex); |
| 464 | |
| 465 | return SR_OK; |
| 466 | } |
| 467 | |
| 468 | /** |
Bert Vermeulen | a1645fc | 2012-02-13 03:36:32 +0100 | [diff] [blame] | 469 | * Debug helper. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 470 | * |
Bert Vermeulen | 996b0c7 | 2012-02-13 02:13:51 +0100 | [diff] [blame] | 471 | * @param packet The packet to show debugging information for. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 472 | */ |
Joel Holdsworth | bf53457 | 2012-12-13 21:07:53 +0000 | [diff] [blame] | 473 | static void datafeed_dump(const struct sr_datafeed_packet *packet) |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 474 | { |
Joel Holdsworth | bf53457 | 2012-12-13 21:07:53 +0000 | [diff] [blame] | 475 | const struct sr_datafeed_logic *logic; |
| 476 | const struct sr_datafeed_analog *analog; |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 477 | |
| 478 | switch (packet->type) { |
| 479 | case SR_DF_HEADER: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 480 | sr_dbg("bus: Received SR_DF_HEADER packet."); |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 481 | break; |
| 482 | case SR_DF_TRIGGER: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 483 | sr_dbg("bus: Received SR_DF_TRIGGER packet."); |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 484 | break; |
Bert Vermeulen | c71bac3 | 2013-01-20 16:37:23 +0100 | [diff] [blame] | 485 | case SR_DF_META: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 486 | sr_dbg("bus: Received SR_DF_META packet."); |
Bert Vermeulen | ee7489d | 2012-04-22 18:11:31 +0200 | [diff] [blame] | 487 | break; |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 488 | case SR_DF_LOGIC: |
| 489 | logic = packet->payload; |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 490 | sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes).", |
| 491 | logic->length); |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 492 | break; |
Bert Vermeulen | ee7489d | 2012-04-22 18:11:31 +0200 | [diff] [blame] | 493 | case SR_DF_ANALOG: |
| 494 | analog = packet->payload; |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 495 | sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).", |
| 496 | analog->num_samples); |
Bert Vermeulen | ee7489d | 2012-04-22 18:11:31 +0200 | [diff] [blame] | 497 | break; |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 498 | case SR_DF_END: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 499 | sr_dbg("bus: Received SR_DF_END packet."); |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 500 | break; |
Bert Vermeulen | 6ea7669 | 2012-04-30 19:55:06 +0200 | [diff] [blame] | 501 | case SR_DF_FRAME_BEGIN: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 502 | sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet."); |
Bert Vermeulen | 6ea7669 | 2012-04-30 19:55:06 +0200 | [diff] [blame] | 503 | break; |
| 504 | case SR_DF_FRAME_END: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 505 | sr_dbg("bus: Received SR_DF_FRAME_END packet."); |
Bert Vermeulen | 6ea7669 | 2012-04-30 19:55:06 +0200 | [diff] [blame] | 506 | break; |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 507 | default: |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 508 | sr_dbg("bus: Received unknown packet type: %d.", packet->type); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 509 | break; |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 510 | } |
Bert Vermeulen | 7d2afd6 | 2011-06-20 11:42:43 +0200 | [diff] [blame] | 511 | } |
| 512 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 513 | /** |
Bert Vermeulen | a1645fc | 2012-02-13 03:36:32 +0100 | [diff] [blame] | 514 | * Send a packet to whatever is listening on the datafeed bus. |
| 515 | * |
| 516 | * Hardware drivers use this to send a data packet to the frontend. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 517 | * |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 518 | * @param sdi TODO. |
Uwe Hermann | 31ccebc | 2012-02-29 22:08:45 +0100 | [diff] [blame] | 519 | * @param packet The datafeed packet to send to the session bus. |
Uwe Hermann | 44dae53 | 2012-02-17 20:44:19 +0100 | [diff] [blame] | 520 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 521 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments. |
Uwe Hermann | b4bd708 | 2012-10-19 10:07:22 +0200 | [diff] [blame] | 522 | * |
| 523 | * @private |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 524 | */ |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 525 | SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, |
Joel Holdsworth | bf53457 | 2012-12-13 21:07:53 +0000 | [diff] [blame] | 526 | const struct sr_datafeed_packet *packet) |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 527 | { |
| 528 | GSList *l; |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 529 | struct datafeed_callback *cb_struct; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 530 | |
Bert Vermeulen | de4d3f9 | 2012-07-22 15:31:56 +0200 | [diff] [blame] | 531 | if (!sdi) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 532 | sr_err("%s: sdi was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 533 | return SR_ERR_ARG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 534 | } |
| 535 | |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 536 | if (!packet) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 537 | sr_err("%s: packet was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 538 | return SR_ERR_ARG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 539 | } |
| 540 | |
Uwe Hermann | 62c8202 | 2010-04-15 20:16:53 +0200 | [diff] [blame] | 541 | for (l = session->datafeed_callbacks; l; l = l->next) { |
Bert Vermeulen | 18beaef | 2012-02-13 00:08:23 +0100 | [diff] [blame] | 542 | if (sr_log_loglevel_get() >= SR_LOG_DBG) |
| 543 | datafeed_dump(packet); |
Martin Ling | 2726474 | 2013-04-15 21:08:55 +0100 | [diff] [blame] | 544 | cb_struct = l->data; |
| 545 | cb_struct->cb(sdi, packet, cb_struct->cb_data); |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 546 | } |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 547 | |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 548 | return SR_OK; |
Uwe Hermann | a1bb33a | 2010-04-02 20:18:27 +0200 | [diff] [blame] | 549 | } |
| 550 | |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 551 | /** |
| 552 | * Add an event source for a file descriptor. |
| 553 | * |
| 554 | * @param pollfd The GPollFD. |
| 555 | * @param timeout Max time to wait before the callback is called, ignored if 0. |
| 556 | * @param cb Callback function to add. Must not be NULL. |
| 557 | * @param cb_data Data for the callback function. Can be NULL. |
| 558 | * @param poll_object TODO. |
| 559 | * |
| 560 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 561 | * SR_ERR_MALLOC upon memory allocation errors. |
| 562 | */ |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 563 | static int _sr_session_source_add(GPollFD *pollfd, int timeout, |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 564 | sr_receive_data_callback_t cb, void *cb_data, gintptr poll_object) |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 565 | { |
| 566 | struct source *new_sources, *s; |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 567 | GPollFD *new_pollfds; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 568 | |
Uwe Hermann | d08490a | 2012-02-29 21:56:24 +0100 | [diff] [blame] | 569 | if (!cb) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 570 | sr_err("%s: cb was NULL", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 571 | return SR_ERR_ARG; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 572 | } |
| 573 | |
Uwe Hermann | 1f9813e | 2012-02-29 22:32:34 +0100 | [diff] [blame] | 574 | /* Note: cb_data can be NULL, that's not a bug. */ |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 575 | |
Bert Vermeulen | 2ac2e62 | 2012-07-22 15:32:35 +0200 | [diff] [blame] | 576 | new_pollfds = g_try_realloc(session->pollfds, |
| 577 | sizeof(GPollFD) * (session->num_sources + 1)); |
Lars-Peter Clausen | 0687dfc | 2012-06-30 20:54:43 +0200 | [diff] [blame] | 578 | if (!new_pollfds) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 579 | sr_err("%s: new_pollfds malloc failed", __func__); |
Lars-Peter Clausen | 0687dfc | 2012-06-30 20:54:43 +0200 | [diff] [blame] | 580 | return SR_ERR_MALLOC; |
| 581 | } |
| 582 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 583 | new_sources = g_try_realloc(session->sources, sizeof(struct source) * |
Bert Vermeulen | 2ac2e62 | 2012-07-22 15:32:35 +0200 | [diff] [blame] | 584 | (session->num_sources + 1)); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 585 | if (!new_sources) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 586 | sr_err("%s: new_sources malloc failed", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 587 | return SR_ERR_MALLOC; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 588 | } |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 589 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 590 | new_pollfds[session->num_sources] = *pollfd; |
| 591 | s = &new_sources[session->num_sources++]; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 592 | s->timeout = timeout; |
Uwe Hermann | d08490a | 2012-02-29 21:56:24 +0100 | [diff] [blame] | 593 | s->cb = cb; |
Uwe Hermann | 1f9813e | 2012-02-29 22:32:34 +0100 | [diff] [blame] | 594 | s->cb_data = cb_data; |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 595 | s->poll_object = poll_object; |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 596 | session->pollfds = new_pollfds; |
| 597 | session->sources = new_sources; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 598 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 599 | if (timeout != session->source_timeout && timeout > 0 |
| 600 | && (session->source_timeout == -1 || timeout < session->source_timeout)) |
| 601 | session->source_timeout = timeout; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 602 | |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 603 | return SR_OK; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 604 | } |
| 605 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 606 | /** |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 607 | * Add an event source for a file descriptor. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 608 | * |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 609 | * @param fd The file descriptor. |
| 610 | * @param events Events to check for. |
| 611 | * @param timeout Max time to wait before the callback is called, ignored if 0. |
| 612 | * @param cb Callback function to add. Must not be NULL. |
| 613 | * @param cb_data Data for the callback function. Can be NULL. |
Uwe Hermann | 44dae53 | 2012-02-17 20:44:19 +0100 | [diff] [blame] | 614 | * |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 615 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 616 | * SR_ERR_MALLOC upon memory allocation errors. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 617 | */ |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 618 | SR_API int sr_session_source_add(int fd, int events, int timeout, |
| 619 | sr_receive_data_callback_t cb, void *cb_data) |
| 620 | { |
| 621 | GPollFD p; |
| 622 | |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 623 | p.fd = fd; |
| 624 | p.events = events; |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 625 | |
| 626 | return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)fd); |
| 627 | } |
| 628 | |
| 629 | /** |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 630 | * Add an event source for a GPollFD. |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 631 | * |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 632 | * @param pollfd The GPollFD. |
| 633 | * @param timeout Max time to wait before the callback is called, ignored if 0. |
| 634 | * @param cb Callback function to add. Must not be NULL. |
| 635 | * @param cb_data Data for the callback function. Can be NULL. |
| 636 | * |
| 637 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 638 | * SR_ERR_MALLOC upon memory allocation errors. |
| 639 | */ |
| 640 | SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout, |
| 641 | sr_receive_data_callback_t cb, void *cb_data) |
| 642 | { |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 643 | return _sr_session_source_add(pollfd, timeout, cb, |
| 644 | cb_data, (gintptr)pollfd); |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 645 | } |
| 646 | |
| 647 | /** |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 648 | * Add an event source for a GIOChannel. |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 649 | * |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 650 | * @param channel The GIOChannel. |
| 651 | * @param events Events to poll on. |
| 652 | * @param timeout Max time to wait before the callback is called, ignored if 0. |
| 653 | * @param cb Callback function to add. Must not be NULL. |
| 654 | * @param cb_data Data for the callback function. Can be NULL. |
| 655 | * |
| 656 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 657 | * SR_ERR_MALLOC upon memory allocation errors. |
| 658 | */ |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 659 | SR_API int sr_session_source_add_channel(GIOChannel *channel, int events, |
| 660 | int timeout, sr_receive_data_callback_t cb, void *cb_data) |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 661 | { |
| 662 | GPollFD p; |
| 663 | |
| 664 | #ifdef _WIN32 |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 665 | g_io_channel_win32_make_pollfd(channel, events, &p); |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 666 | #else |
| 667 | p.fd = g_io_channel_unix_get_fd(channel); |
| 668 | p.events = events; |
| 669 | #endif |
| 670 | |
| 671 | return _sr_session_source_add(&p, timeout, cb, cb_data, (gintptr)channel); |
| 672 | } |
| 673 | |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 674 | /** |
| 675 | * Remove the source belonging to the specified channel. |
| 676 | * |
| 677 | * @todo Add more error checks and logging. |
| 678 | * |
| 679 | * @param channel The channel for which the source should be removed. |
| 680 | * |
| 681 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 682 | * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon |
| 683 | * internal errors. |
| 684 | */ |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 685 | static int _sr_session_source_remove(gintptr poll_object) |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 686 | { |
| 687 | struct source *new_sources; |
Lars-Peter Clausen | 0687dfc | 2012-06-30 20:54:43 +0200 | [diff] [blame] | 688 | GPollFD *new_pollfds; |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 689 | unsigned int old; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 690 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 691 | if (!session->sources || !session->num_sources) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 692 | sr_err("%s: sources was NULL", __func__); |
Uwe Hermann | 0abee50 | 2012-03-04 15:08:11 +0100 | [diff] [blame] | 693 | return SR_ERR_BUG; |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 694 | } |
| 695 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 696 | for (old = 0; old < session->num_sources; old++) { |
| 697 | if (session->sources[old].poll_object == poll_object) |
Lars-Peter Clausen | 2bccd32 | 2012-06-30 20:54:42 +0200 | [diff] [blame] | 698 | break; |
| 699 | } |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 700 | |
Lars-Peter Clausen | 2bccd32 | 2012-06-30 20:54:42 +0200 | [diff] [blame] | 701 | /* fd not found, nothing to do */ |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 702 | if (old == session->num_sources) |
Lars-Peter Clausen | 2bccd32 | 2012-06-30 20:54:42 +0200 | [diff] [blame] | 703 | return SR_OK; |
| 704 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 705 | session->num_sources -= 1; |
Lars-Peter Clausen | 2bccd32 | 2012-06-30 20:54:42 +0200 | [diff] [blame] | 706 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 707 | if (old != session->num_sources) { |
| 708 | memmove(&session->pollfds[old], &session->pollfds[old+1], |
| 709 | (session->num_sources - old) * sizeof(GPollFD)); |
| 710 | memmove(&session->sources[old], &session->sources[old+1], |
| 711 | (session->num_sources - old) * sizeof(struct source)); |
Lars-Peter Clausen | 2bccd32 | 2012-06-30 20:54:42 +0200 | [diff] [blame] | 712 | } |
| 713 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 714 | new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * session->num_sources); |
| 715 | if (!new_pollfds && session->num_sources > 0) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 716 | sr_err("%s: new_pollfds malloc failed", __func__); |
Lars-Peter Clausen | 0687dfc | 2012-06-30 20:54:43 +0200 | [diff] [blame] | 717 | return SR_ERR_MALLOC; |
| 718 | } |
| 719 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 720 | new_sources = g_try_realloc(session->sources, sizeof(struct source) * session->num_sources); |
| 721 | if (!new_sources && session->num_sources > 0) { |
Uwe Hermann | a421dc1 | 2013-01-29 12:55:00 +0100 | [diff] [blame] | 722 | sr_err("%s: new_sources malloc failed", __func__); |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 723 | return SR_ERR_MALLOC; |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 724 | } |
| 725 | |
Lars-Peter Clausen | b7e9411 | 2012-07-06 23:23:31 +0200 | [diff] [blame] | 726 | session->pollfds = new_pollfds; |
| 727 | session->sources = new_sources; |
Uwe Hermann | e0508e6 | 2012-01-07 17:08:54 +0100 | [diff] [blame] | 728 | |
| 729 | return SR_OK; |
Bert Vermeulen | 544a458 | 2011-01-30 02:40:55 +0100 | [diff] [blame] | 730 | } |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 731 | |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 732 | /** |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 733 | * Remove the source belonging to the specified file descriptor. |
| 734 | * |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 735 | * @param fd The file descriptor for which the source should be removed. |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 736 | * |
| 737 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 738 | * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon |
| 739 | * internal errors. |
| 740 | */ |
| 741 | SR_API int sr_session_source_remove(int fd) |
| 742 | { |
| 743 | return _sr_session_source_remove((gintptr)fd); |
| 744 | } |
| 745 | |
| 746 | /** |
| 747 | * Remove the source belonging to the specified poll descriptor. |
| 748 | * |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 749 | * @param pollfd The poll descriptor for which the source should be removed. |
| 750 | * |
| 751 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 752 | * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon |
| 753 | * internal errors. |
| 754 | */ |
| 755 | SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd) |
| 756 | { |
| 757 | return _sr_session_source_remove((gintptr)pollfd); |
| 758 | } |
| 759 | |
Uwe Hermann | 6b2d8d3 | 2012-10-21 23:24:42 +0200 | [diff] [blame] | 760 | /** |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 761 | * Remove the source belonging to the specified channel. |
| 762 | * |
Uwe Hermann | 1a895c6 | 2012-07-05 01:47:44 +0200 | [diff] [blame] | 763 | * @param channel The channel for which the source should be removed. |
Lars-Peter Clausen | aac0ea2 | 2012-06-30 20:54:44 +0200 | [diff] [blame] | 764 | * |
| 765 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or |
| 766 | * SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon |
| 767 | * internal errors. |
| 768 | */ |
| 769 | SR_API int sr_session_source_remove_channel(GIOChannel *channel) |
| 770 | { |
| 771 | return _sr_session_source_remove((gintptr)channel); |
| 772 | } |
Uwe Hermann | 7b870c3 | 2012-10-21 16:13:36 +0200 | [diff] [blame] | 773 | |
| 774 | /** @} */ |