Check target error after target specific probes.

This commit is contained in:
Gareth McMullin 2012-06-21 20:54:56 +12:00
parent 6089a66dce
commit 33905d7203

View File

@ -325,11 +325,15 @@ cortexm_probe(struct target_s *target)
} }
if(stm32f1_probe(target) == 0) return 0; #define PROBE(x) \
if(stm32f4_probe(target) == 0) return 0; do { if (!(x)(target) && !target_check_error(target)) return 0; } while (0)
if(lpc11xx_probe(target) == 0) return 0;
/* if not STM32 try LMI which I don't know how to detect reliably */ PROBE(stm32f1_probe);
lmi_probe(target); PROBE(stm32f4_probe);
PROBE(lpc11xx_probe);
/* Try LMI last, as it doesn't fail. */
PROBE(lmi_probe);
#undef PROBE
return 0; return 0;
} }