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

Clean up PLATFORM_HAS_DEBUG 

Use only for firmware platforms.
This commit is contained in:
Uwe Bonnes 2020-04-18 17:38:17 +02:00
parent 9a46c6fd25
commit c3d509e6c0
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/libftdi/platform.h
View File

@ -36,8 +36,6 @@
#define FT2232_VID 0x0403 #define FT2232_VID 0x0403
#define FT2232_PID 0x6010 #define FT2232_PID 0x6010
#define PLATFORM_HAS_DEBUG
#define PLATFORM_IDENT() "FTDI/MPSSE" #define PLATFORM_IDENT() "FTDI/MPSSE"
#define SET_RUN_STATE(state) #define SET_RUN_STATE(state)
#define SET_IDLE_STATE(state) #define SET_IDLE_STATE(state)

1
src/platforms/pc-hosted/platform.h
View File

@ -32,7 +32,6 @@
# endif # endif
#endif #endif
#define PLATFORM_HAS_DEBUG
#define PLATFORM_HAS_POWER_SWITCH #define PLATFORM_HAS_POWER_SWITCH
#define PLATFORM_MAX_MSG_SIZE (256) #define PLATFORM_MAX_MSG_SIZE (256)
#define PLATFORM_IDENT() "PC-HOSTED" #define PLATFORM_IDENT() "PC-HOSTED"

2
src/platforms/pc-stlinkv2/platform.h
View File

@ -33,8 +33,6 @@
# endif # endif
#endif #endif
#define PLATFORM_HAS_DEBUG
#define PLATFORM_IDENT() "StlinkV2/3" #define PLATFORM_IDENT() "StlinkV2/3"
#define SET_RUN_STATE(state) #define SET_RUN_STATE(state)
void stlink_check_detach(int state); void stlink_check_detach(int state);

10
src/target/adiv5.c
View File

@ -74,7 +74,7 @@ enum cid_class {
cidc_unknown = 0x10 cidc_unknown = 0x10
}; };
#ifdef PLATFORM_HAS_DEBUG #ifdef ENABLE_DEBUG
/* The reserved ones only have an R in them, to save a bit of space. */ /* The reserved ones only have an R in them, to save a bit of space. */
static const char * const cidc_debug_strings[] = static const char * const cidc_debug_strings[] =
{ {
@ -111,7 +111,7 @@ enum arm_arch {
aa_end aa_end
}; };
#ifdef PLATFORM_HAS_DEBUG #ifdef ENABLE_DEBUG
#define PIDR_PN_BIT_STRINGS(...) __VA_ARGS__ #define PIDR_PN_BIT_STRINGS(...) __VA_ARGS__
#else #else
#define PIDR_PN_BIT_STRINGS(...) #define PIDR_PN_BIT_STRINGS(...)
@ -155,7 +155,7 @@ static const struct {
uint16_t part_number; uint16_t part_number;
enum arm_arch arch; enum arm_arch arch;
enum cid_class cidc; enum cid_class cidc;
#ifdef PLATFORM_HAS_DEBUG #ifdef ENABLE_DEBUG
const char *type; const char *type;
const char *full; const char *full;
#endif #endif
@ -277,7 +277,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
uint64_t pidr = adiv5_ap_read_pidr(ap, addr); uint64_t pidr = adiv5_ap_read_pidr(ap, addr);
uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET); uint32_t cidr = adiv5_ap_read_id(ap, addr + CIDR0_OFFSET);
bool res = false; bool res = false;
#if defined(ENABLE_DEBUG) && defined(PLATFORM_HAS_DEBUG) #if defined(ENABLE_DEBUG)
char indent[recursion + 1]; char indent[recursion + 1];
for(int i = 0; i < recursion; i++) indent[i] = ' '; for(int i = 0; i < recursion; i++) indent[i] = ' ';
@ -303,7 +303,7 @@ static bool adiv5_component_probe(ADIv5_AP_t *ap, uint32_t addr, int recursion,
/* ROM table */ /* ROM table */
if (cid_class == cidc_romtab) { if (cid_class == cidc_romtab) {
/* Check SYSMEM bit */ /* Check SYSMEM bit */
#if defined(ENABLE_DEBUG) && defined(PLATFORM_HAS_DEBUG) #if defined(ENABLE_DEBUG)
uint32_t memtype = adiv5_mem_read32(ap, addr | ADIV5_ROM_MEMTYPE) & uint32_t memtype = adiv5_mem_read32(ap, addr | ADIV5_ROM_MEMTYPE) &
ADIV5_ROM_MEMTYPE_SYSMEM; ADIV5_ROM_MEMTYPE_SYSMEM;

2
src/target/efm32.c
View File

@ -720,7 +720,7 @@ static int efm32_flash_write(struct target_flash *f,
int ret = cortexm_run_stub(t, SRAM_BASE, dest, STUB_BUFFER_BASE, len, int ret = cortexm_run_stub(t, SRAM_BASE, dest, STUB_BUFFER_BASE, len,
device->msc_addr); device->msc_addr);
#ifdef PLATFORM_HAS_DEBUG #ifdef ENABLE_DEBUG
/* Check the MSC_IF */ /* Check the MSC_IF */
uint32_t msc = device->msc_addr; uint32_t msc = device->msc_addr;
uint32_t msc_if = target_mem_read32(t, EFM32_MSC_IF(msc)); uint32_t msc_if = target_mem_read32(t, EFM32_MSC_IF(msc));