X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=anykey.c;h=eaa53f627aeb2af08243316bf64c478861448e34;hp=f11b0d7b031a4a3f94deefad037c861f828cdfc7;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=20fb52e08416238c60392b410f69856cc7d98650
diff --git a/anykey.c b/anykey.c
index f11b0d7..eaa53f6 100644
--- a/anykey.c
+++ b/anykey.c
@@ -17,7 +17,6 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
#include
#ifdef _WIN32
#include
@@ -27,6 +26,7 @@
#include
#include
#include
+#include "sigrok-cli.h"
#ifdef _WIN32
static HANDLE stdin_handle;
@@ -37,18 +37,20 @@ static struct termios term_orig;
static int received_anykey(int fd, int revents, void *cb_data)
{
+ struct sr_session *session;
+
(void)fd;
(void)revents;
- (void)cb_data;
- sr_session_source_remove(STDIN_FILENO);
- sr_session_stop();
+ session = cb_data;
+ sr_session_source_remove(session, STDIN_FILENO);
+ sr_session_stop(session);
return TRUE;
}
/* Turn off buffering on stdin. */
-void add_anykey(void)
+void add_anykey(struct sr_session *session)
{
#ifdef _WIN32
stdin_handle = GetStdHandle(STD_INPUT_HANDLE);
@@ -67,7 +69,8 @@ void add_anykey(void)
tcsetattr(STDIN_FILENO, TCSADRAIN, &term);
#endif
- sr_session_source_add(STDIN_FILENO, G_IO_IN, -1, received_anykey, NULL);
+ sr_session_source_add(session, STDIN_FILENO, G_IO_IN, -1,
+ received_anykey, session);
g_message("Press any key to stop acquisition.");
}