jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge commit '5aebef4f64d0fd4c19f794fb9725686c39a7e395' into sam-update

Browse Source
This commit is contained in:
Jason Kotzin 2022-08-01 20:21:13 -07:00
commit bb97e35f82
3 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile
View File

@ -34,9 +34,6 @@ SRC = \
gdb_hostio.c \ gdb_hostio.c \
gdb_packet.c \ gdb_packet.c \
hex_utils.c \ hex_utils.c \
jtag_scan.c \
jtagtap.c \
jtagtap_generic.c \
lmi.c \ lmi.c \
lpc_common.c \ lpc_common.c \
lpc11xx.c \ lpc11xx.c \
@ -58,15 +55,22 @@ SRC = \
stm32h7.c \ stm32h7.c \
stm32l0.c \ stm32l0.c \
stm32l4.c \ stm32l4.c \
swdptap.c \
swdptap_generic.c \
target.c \ target.c \
include $(PLATFORM_DIR)/Makefile.inc include $(PLATFORM_DIR)/Makefile.inc
ifndef TARGET ifndef TARGET
TARGET=blackmagic TARGET=blackmagic
endif endif
ifndef SWD_HL
SRC += swdptap.c swdptap_generic.c
endif
ifndef JTAG_HL
SRC += jtag_scan.c jtagtap.c jtagtap_generic.c
endif
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
$(TARGET): include/version.h $(OBJ) $(TARGET): include/version.h $(OBJ)

1
src/platforms/libftdi/Makefile.inc
View File

@ -7,4 +7,5 @@ CFLAGS += -Wno-cast-function-type
else ifneq (, $(findstring cygwin, $(SYS))) else ifneq (, $(findstring cygwin, $(SYS)))
LDFLAGS += -lusb-1.0 -lws2_32 LDFLAGS += -lusb-1.0 -lws2_32
endif endif
VPATH += platforms/pc
SRC += timing.c \ SRC += timing.c \

44
src/platforms/libftdi/gdb_if.c → src/platforms/pc/gdb_if.c
View File

@ -36,12 +36,16 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include "general.h" #include "general.h"
#include "gdb_if.h" #include "gdb_if.h"
static int gdb_if_serv, gdb_if_conn; static int gdb_if_serv, gdb_if_conn;
#define DEFAULT_PORT 2000
#define NUM_GDB_SERVER 4
int gdb_if_init(void) int gdb_if_init(void)
{ {
#if defined(_WIN32) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__CYGWIN__)
@ -50,20 +54,40 @@ int gdb_if_init(void)
#endif #endif
struct sockaddr_in addr; struct sockaddr_in addr;
int opt; int opt;
int port = DEFAULT_PORT - 1;
do {
port ++;
if (port > DEFAULT_PORT + NUM_GDB_SERVER)
return - 1;
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(2000); addr.sin_port = htons(port);
addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin_addr.s_addr = htonl(INADDR_ANY);
assert((gdb_if_serv = socket(PF_INET, SOCK_STREAM, 0)) != -1); gdb_if_serv = socket(PF_INET, SOCK_STREAM, 0);
if (gdb_if_serv == -1)
continue;
opt = 1; opt = 1;
assert(setsockopt(gdb_if_serv, SOL_SOCKET, SO_REUSEADDR, (void*)&opt, sizeof(opt)) != -1); if (setsockopt(gdb_if_serv, SOL_SOCKET, SO_REUSEADDR, (void*)&opt, sizeof(opt)) == -1) {
assert(setsockopt(gdb_if_serv, IPPROTO_TCP, TCP_NODELAY, (void*)&opt, sizeof(opt)) != -1); close(gdb_if_serv);
continue;
assert(bind(gdb_if_serv, (void*)&addr, sizeof(addr)) != -1); }
assert(listen(gdb_if_serv, 1) != -1); if (setsockopt(gdb_if_serv, IPPROTO_TCP, TCP_NODELAY, (void*)&opt, sizeof(opt)) == -1) {
close(gdb_if_serv);
DEBUG("Listening on TCP:2000\n"); continue;
}
if (bind(gdb_if_serv, (void*)&addr, sizeof(addr)) == -1) {
close(gdb_if_serv);
continue;
}
if (listen(gdb_if_serv, 1) == -1) {
close(gdb_if_serv);
continue;
}
break;
} while(1);
DEBUG("Listening on TCP: %4d\n", port);
return 0; return 0;
} }