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