sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #493 from UweBonnes/weak 

Remove weak attribute for less hassle with windows compiles
This commit is contained in:
UweBonnes 2019-07-18 23:49:24 +02:00 committed by GitHub
parent 9e898cc4b8 e29f2b4fb9
commit c19ca20e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -16,4 +16,4 @@ tags
*.b#*
blackmagic_upgrade
*.exe
.vscode

8
src/Makefile
View File

@ -64,12 +64,12 @@ ifndef TARGET
TARGET=blackmagic
endif
ifndef SWD_HL
SRC += swdptap.c swdptap_generic.c
ifdef NO_OWN_LL
SRC += jtagtap_generic.c swdptap_generic.c
endif
ifndef JTAG_HL
SRC += jtag_scan.c jtagtap.c jtagtap_generic.c
ifndef OWN_HL
SRC += jtag_scan.c jtagtap.c swdptap.c
endif
OBJ = $(SRC:.c=.o)

2
src/include/gdb_if.h
View File

@ -21,7 +21,7 @@
#ifndef __GDB_IF_H
#define __GDB_IF_H
#if !defined(LIBFTDI)
#if !defined(PC_HOSTED)
#include <libopencm3/usb/usbd.h>
void gdb_usb_out_cb(usbd_device *dev, uint8_t ep);
#endif

2
src/include/platform_support.h
View File

@ -24,7 +24,7 @@
# error "Include 'general.h' instead"
#endif
#if defined(LIBFTDI)
#if defined(PC_HOSTED)
void platform_init(int argc, char **argv);
#else
void platform_init(void);

4
src/include/swdptap.h
View File

@ -27,7 +27,9 @@ int swdptap_init(void);
bool swdptap_bit_in(void);
void swdptap_bit_out(bool val);
/* High level functions, provided as weak in swdptap_generic.c */
/* Low level functions, provided in swdptap_generic.c from the primitives
(indicate NO_OWN_LL in the Makefile.inc or libopencm specific in
platforms/common*/
uint32_t swdptap_seq_in(int ticks);
bool swdptap_seq_in_parity(uint32_t *data, int ticks);
void swdptap_seq_out(uint32_t MS, int ticks);

2
src/main.c
View File

@ -33,7 +33,7 @@
int
main(int argc, char **argv)
{
#if defined(LIBFTDI)
#if defined(PC_HOSTED)
platform_init(argc, argv);
#else
(void) argc;

0
src/platforms/stm32/jtagtap.c → src/platforms/common/jtagtap.c
View File

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

@ -1,5 +1,5 @@
SYS = $(shell $(CC) -dumpmachine)
CFLAGS += -DLIBFTDI -DENABLE_DEBUG
CFLAGS += -DPC_HOSTED -DENABLE_DEBUG
LDFLAGS += -lftdi1
ifneq (, $(findstring mingw, $(SYS)))
LDFLAGS += -lusb-1.0 -lws2_32

5
src/platforms/pc-stlinkv2/Makefile.inc
View File

@ -1,6 +1,6 @@
TARGET=blackmagic_stlinkv2
SYS = $(shell $(CC) -dumpmachine)
CFLAGS += -DLIBFTDI -DSTLINKV2 -DJTAG_HL -DENABLE_DEBUG
CFLAGS += -DPC_HOSTED -DSTLINKV2 -DJTAG_HL -DENABLE_DEBUG
CFLAGS +=-I ./target
LDFLAGS += -lusb-1.0
ifneq (, $(findstring mingw, $(SYS)))
@ -11,5 +11,4 @@ LDFLAGS += -lws2_32
endif
VPATH += platforms/pc
SRC += timing.c stlinkv2.c
SWD_HL = 1
JTAG_HL = 1
OWN_HL = 1

6
src/platforms/pc-stlinkv2/stlinkv2.c
View File

@ -82,6 +82,7 @@
#define STLINK_SWD_AP_WDATA_ERROR 0x18
#define STLINK_SWD_AP_STICKY_ERROR 0x19
#define STLINK_SWD_AP_STICKYORUN_ERROR 0x1a
#define STLINK_BAD_AP_ERROR 0x1d
#define STLINK_JTAG_UNKNOWN_CMD 0x42
#define STLINK_CORE_RUNNING 0x80
@ -455,6 +456,9 @@ static int stlink_usb_error_check(uint8_t *data, bool verbose)
if (verbose)
DEBUG("STLINK_SWD_AP_STICKYORUN_ERROR\n");
return STLINK_ERROR_FAIL;
case STLINK_BAD_AP_ERROR:
/* ADIV5 probe 256 APs, most of them are non exisitant.*/
return STLINK_ERROR_FAIL;
case STLINK_JTAG_UNKNOWN_CMD :
if (verbose)
DEBUG("STLINK_JTAG_UNKNOWN_CMD\n");
@ -1055,7 +1059,7 @@ bool adiv5_ap_setup(int ap)
return true;
}
void div5_ap_cleanup(int ap)
void adiv5_ap_cleanup(int ap)
{
uint8_t cmd[16] = {
STLINK_DEBUG_COMMAND,

23
src/target/adiv5.c
View File

@ -390,9 +390,8 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
}
return res;
}
bool __attribute__((weak)) adiv5_ap_setup(int i) {(void)i; return true;}
void __attribute__((weak)) adiv5_ap_cleanup(int i) {(void)i;}
bool adiv5_ap_setup(int i);
void adiv5_ap_cleanup(int i);
ADIv5_AP_t *adiv5_new_ap(ADIv5_DP_t *dp, uint8_t apsel)
{
@ -528,6 +527,11 @@ void adiv5_dp_init(ADIv5_DP_t *dp)
#define ALIGNOF(x) (((x) & 3) == 0 ? ALIGN_WORD : \
(((x) & 1) == 0 ? ALIGN_HALFWORD : ALIGN_BYTE))
#if !defined(JTAG_HL)
bool adiv5_ap_setup(int i) {(void)i; return true;}
void adiv5_ap_cleanup(int i) {(void)i;}
/* Program the CSW and TAR for sequencial access at a given width */
static void ap_mem_access_setup(ADIv5_AP_t *ap, uint32_t addr, enum align align)
{
@ -567,8 +571,7 @@ static void * extract(void *dest, uint32_t src, uint32_t val, enum align align)
return (uint8_t *)dest + (1 << align);
}
void __attribute__((weak))
adiv5_mem_read(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
void adiv5_mem_read(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
{
uint32_t tmp;
uint32_t osrc = src;
@ -598,8 +601,7 @@ adiv5_mem_read(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
extract(dest, src, tmp, align);
}
void __attribute__((weak))
adiv5_mem_write_sized(ADIv5_AP_t *ap, uint32_t dest, const void *src,
void adiv5_mem_write_sized(ADIv5_AP_t *ap, uint32_t dest, const void *src,
size_t len, enum align align)
{
uint32_t odest = dest;
@ -634,16 +636,14 @@ adiv5_mem_write_sized(ADIv5_AP_t *ap, uint32_t dest, const void *src,
}
}
void __attribute__((weak))
adiv5_ap_write(ADIv5_AP_t *ap, uint16_t addr, uint32_t value)
void adiv5_ap_write(ADIv5_AP_t *ap, uint16_t addr, uint32_t value)
{
adiv5_dp_write(ap->dp, ADIV5_DP_SELECT,
((uint32_t)ap->apsel << 24)|(addr & 0xF0));
adiv5_dp_write(ap->dp, addr, value);
}
uint32_t __attribute__((weak))
adiv5_ap_read(ADIv5_AP_t *ap, uint16_t addr)
uint32_t adiv5_ap_read(ADIv5_AP_t *ap, uint16_t addr)
{
uint32_t ret;
adiv5_dp_write(ap->dp, ADIV5_DP_SELECT,
@ -651,6 +651,7 @@ adiv5_ap_read(ADIv5_AP_t *ap, uint16_t addr)
ret = adiv5_dp_read(ap->dp, addr);
return ret;
}
#endif
void adiv5_mem_write(ADIv5_AP_t *ap, uint32_t dest, const void *src, size_t len)
{

9
src/target/jtagtap_generic.c
View File

@ -24,8 +24,7 @@
#include "general.h"
#include "jtagtap.h"
void __attribute__((weak))
jtagtap_tms_seq(uint32_t MS, int ticks)
void jtagtap_tms_seq(uint32_t MS, int ticks)
{
while(ticks--) {
jtagtap_next(MS & 1, 1);
@ -33,8 +32,7 @@ jtagtap_tms_seq(uint32_t MS, int ticks)
}
}
void __attribute__((weak))
jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks)
void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks)
{
uint8_t index = 1;
while(ticks--) {
@ -50,8 +48,7 @@ jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int
}
}
void __attribute__((weak))
jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks)
void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks)
{
uint8_t index = 1;
while(ticks--) {

12
src/target/swdptap_generic.c
View File

@ -20,8 +20,7 @@
#include "general.h"
#include "swdptap.h"
uint32_t __attribute__((weak))
swdptap_seq_in(int ticks)
uint32_t swdptap_seq_in(int ticks)
{
uint32_t index = 1;
uint32_t ret = 0;
@ -35,8 +34,7 @@ swdptap_seq_in(int ticks)
return ret;
}
bool __attribute__((weak))
swdptap_seq_in_parity(uint32_t *ret, int ticks)
bool swdptap_seq_in_parity(uint32_t *ret, int ticks)
{
uint32_t index = 1;
uint8_t parity = 0;
@ -55,8 +53,7 @@ swdptap_seq_in_parity(uint32_t *ret, int ticks)
return parity;
}
void __attribute__((weak))
swdptap_seq_out(uint32_t MS, int ticks)
void swdptap_seq_out(uint32_t MS, int ticks)
{
while (ticks--) {
swdptap_bit_out(MS & 1);
@ -64,8 +61,7 @@ swdptap_seq_out(uint32_t MS, int ticks)
}
}
void __attribute__((weak))
swdptap_seq_out_parity(uint32_t MS, int ticks)
void swdptap_seq_out_parity(uint32_t MS, int ticks)
{
uint8_t parity = 0;

2
src/target/target.c
View File

@ -314,7 +314,7 @@ void target_detach(target *t)
{
t->detach(t);
t->attached = false;
#if defined(LIBFTDI)
#if defined(PC_HOSTED)
# include "platform.h"
platform_buffer_flush();
#endif