aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2022-02-02 23:55:50 +0100
committerAntonio Borneo <borneo.antonio@gmail.com>2022-02-14 15:13:34 +0000
commit37d506ae55587ecb6f20f56bc9b5a6f5edc1872f (patch)
treeab523123dc387c10ca6cfcc0d7c372a41645b8b2
parent2c0a65baa2f17a15fcb5bb014e5dda33fecddaf8 (diff)
downloadriscv-openocd-37d506ae55587ecb6f20f56bc9b5a6f5edc1872f.zip
riscv-openocd-37d506ae55587ecb6f20f56bc9b5a6f5edc1872f.tar.gz
riscv-openocd-37d506ae55587ecb6f20f56bc9b5a6f5edc1872f.tar.bz2
server: remove remaining crust from dropped eCos code
Commit 39650e2273bc ("ecosboard: delete bit-rotted eCos code") has removed eCos code but has left some empty function that was used during non-eCos build to replace eCos mutex. Drop the functions and the file that contain them. Change-Id: I31bc0237ea699c11bd70921660f960ee406ffa80 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: https://review.openocd.org/c/openocd/+/6835 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
-rw-r--r--src/server/Makefile.am1
-rw-r--r--src/server/server.c2
-rw-r--r--src/server/server.h9
-rw-r--r--src/server/server_stubs.c30
4 files changed, 0 insertions, 42 deletions
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index fb5248b..e3699f1 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -6,7 +6,6 @@ noinst_LTLIBRARIES += %D%/libserver.la
%D%/server.h \
%D%/telnet_server.h \
%D%/gdb_server.h \
- %D%/server_stubs.c \
%D%/tcl_server.c \
%D%/tcl_server.h \
%D%/rtt_server.c \
diff --git a/src/server/server.c b/src/server/server.c
index 3f579bf..1569f5a 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -487,10 +487,8 @@ int server_loop(struct command_context *command_context)
timeout_ms = polling_period;
tv.tv_usec = timeout_ms * 1000;
/* Only while we're sleeping we'll let others run */
- openocd_sleep_prelude();
kept_alive();
retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv);
- openocd_sleep_postlude();
}
if (retval == -1) {
diff --git a/src/server/server.h b/src/server/server.h
index de18d2b..bacd111 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -98,15 +98,6 @@ int connection_write(struct connection *connection, const void *data, int len);
int connection_read(struct connection *connection, void *data, int len);
/**
- * Used by server_loop(), defined in server_stubs.c
- */
-void openocd_sleep_prelude(void);
-/**
- * Used by server_loop(), defined in server_stubs.c
- */
-void openocd_sleep_postlude(void);
-
-/**
* Defines an extended command handler function declaration to enable
* access to (and manipulation of) the server port number.
* Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter
diff --git a/src/server/server_stubs.c b/src/server/server_stubs.c
deleted file mode 100644
index a4c0172..0000000
--- a/src/server/server_stubs.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 Zachary T Welch <zw@superlucidity.net> *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "server.h"
-
-void openocd_sleep_prelude(void)
-{
- /* no-op */
-}
-void openocd_sleep_postlude(void)
-{
- /* no-op */
-}