RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libdebugger: Move to separate library

Browse Source 
Always build remote TCP support since it depends only on the POSIX
socket API.  It works with the legacy network stack and libbsd.  Move it
to a separate libdebugger.a library to allow an easy use with libbsd via
"-ldebugger -lbsd" otherwise we would have a cyclic dependency between
libbsd.a and librtemscpu.a.

Update #3419.
This commit is contained in:
Sebastian Huber
2018-04-30 09:09:27 +02:00
parent 97a48209e2
commit dd8e4b760b
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/libdebugger/Makefile.am
View File

@@ -2,20 +2,20 @@ include $(top_srcdir)/automake/compile.am
if LIBDEBUGGER
noinst_LIBRARIES = libdebugger.a
project_lib_LIBRARIES = libdebugger.a
libdebugger_a_SOURCES = \
rtems-debugger-block.c \
rtems-debugger-cmd.c \
rtems-debugger-remote.c \
rtems-debugger-server.c \
rtems-debugger-target.c \
rtems-debugger-remote-tcp.c \
rtems-debugger-threads.c \
rtems-debugger-@RTEMS_CPU@.c
if LIBNETWORKING
libdebugger_a_SOURCES += \
rtems-debugger-remote-tcp.c
endif
$(PROJECT_LIB)/libdebugger.a: libdebugger.a
$(INSTALL_DATA) $< $(PROJECT_LIB)/libdebugger.a
TMPINSTALL_FILES = $(PROJECT_LIB)/libdebugger.a
endif

6
cpukit/libdebugger/rtems-debugger-remote-tcp.c
View File

@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016 Chris Johns <chrisj@rtems.org>.
* All rights reserved.
* Copyright (c) 2016 Chris Johns <chrisj@rtems.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -38,7 +37,7 @@
#include <rtems/debugger/rtems-debugger-server.h>
#include <rtems/debugger/rtems-debugger-remote.h>
#include "rtems-debugger-remote-tcp.h"
#include <rtems/rtems-debugger-remote-tcp.h>
/**
* Debugger default server port. 'RT' as ASCII.
@@ -277,6 +276,7 @@ tcp_remote_disconnect(rtems_debugger_remote* remote)
tcp = (rtems_debugger_remote_tcp*) remote->data;
close(tcp->fd);
tcp->fd = -1;
rtems_debugger_unlock();

48
cpukit/libdebugger/rtems-debugger-remote-tcp.h
View File

@@ -1,48 +0,0 @@
/*
* Copyright (c) 2016 Chris Johns <chrisj@rtems.org>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Debugger for RTEMS.
*/
#ifndef _RTEMS_DEBUGGER_REMOTE_TCP_h
#define _RTEMS_DEBUGGER_REMOTE_TCP_h
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**
* Register a remote with the server.
*/
int rtems_debugger_register_tcp_remote(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif