summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-09-26 19:30:31 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-10-01 10:21:33 +0200
commita60a57d8ed1cb28de1eca0e2d6d78d70bd873663 (patch)
tree36f88d78a8ad4872bde66f03a19c3986a8600db6 /src/server
parentd623832685a20d8283ccfd5ede5185a48a256883 (diff)
downloadopenocd_libswd-a60a57d8ed1cb28de1eca0e2d6d78d70bd873663.tar.gz
openocd_libswd-a60a57d8ed1cb28de1eca0e2d6d78d70bd873663.tar.bz2
openocd_libswd-a60a57d8ed1cb28de1eca0e2d6d78d70bd873663.tar.xz
openocd_libswd-a60a57d8ed1cb28de1eca0e2d6d78d70bd873663.zip
server: rely on ctrl-c to stop openocd
there was special support to support pressing 'x' to quit openocd. ctrl-c is sufficient. The main server loop is already complicated enough. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/server')
-rw-r--r--src/server/server.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/server/server.c b/src/server/server.c
index 7d8ad517..3c85cd13 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -2,7 +2,7 @@
* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007-2010 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008 by Spencer Oliver *
@@ -310,16 +310,6 @@ int server_loop(struct command_context *command_context)
}
}
-#ifndef _WIN32
-#if BUILD_ECOSBOARD == 0
- if (server_use_pipes == 0)
- {
- /* add STDIN to read_fds */
- FD_SET(fileno(stdin), &read_fds);
- }
-#endif
-#endif
-
struct timeval tv;
tv.tv_sec = 0;
if (poll_ok)
@@ -434,21 +424,7 @@ int server_loop(struct command_context *command_context)
}
}
-#ifndef _WIN32
-#if BUILD_ECOSBOARD == 0
- /* check for data on stdin if not using pipes */
- if (server_use_pipes == 0)
- {
- if (FD_ISSET(fileno(stdin), &read_fds))
- {
- if (getc(stdin) == 'x')
- {
- shutdown_openocd = 1;
- }
- }
- }
-#endif
-#else
+#ifdef _WIN32
MSG msg;
while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
{