imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Øyvind Harboe 2010-09-26 19:30:31 +02:00
parent d623832685
commit a60a57d8ed
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/server/server.c
View File

@ -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))
{