* 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 *
(char *)&flag, /* the cast is historical cruft */
sizeof(int)); /* length of option value */
- LOG_INFO("accepting '%s' connection from %i", service->name, c->sin.sin_port);
+ LOG_INFO("accepting '%s' connection from %i", service->name, service->port);
if ((retval = service->new_connection(c)) != ERROR_OK)
{
close_socket(c->fd);
{
struct service *service;
- bool poll = true;
+ bool poll_ok = true;
/* used in select() */
fd_set read_fds;
}
}
-#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)
+ if (poll_ok)
{
/* we're just polling this iteration, this is faster on embedded
* hosts */
FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */
/* We timed out/there was nothing to do, timeout rather than poll next time */
- poll = false;
+ poll_ok = false;
} else
{
/* There was something to do, next time we'll just poll */
- poll = true;
+ poll_ok = true;
}
for (service = services; service; service = service->next)
}
}
-#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))
{