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>

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index fb5248bfdecedca5bc717fa9f46f97c3b4292ebb..e3699f181bfbb6cf6099b5ff8198454ba56d0eed 100644 (file)
--- 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 3f579bfc641a79bf02477d03389b34360d7674ad..1569f5a2caae330957eee40df3599fbfff6a4f1e 100644 (file)
--- 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 de18d2b4b66680ad0baca4d39f592b08f25aea6d..bacd1116a15354364bae92acfc48552ac6d2c2da 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -97,15 +97,6 @@ int server_register_commands(struct command_context *context);
 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.

diff --git a/src/server/server_stubs.c b/src/server/server_stubs.c
deleted file mode 100644 (file)
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 */
-}