Merge commit '7e3fe352ad4aed89522d808d76dbe868a470412e' into sam-update

# Conflicts:
#	src/platforms/common/swdptap.c
This commit is contained in:
Jason Kotzin 2022-08-01 19:54:44 -07:00
commit f1f59d3c1d

View File

@ -64,12 +64,12 @@ int adiv5_swdp_scan(void)
return -1; return -1;
/* Switch from JTAG to SWD mode */ /* Switch from JTAG to SWD mode */
swdptap_seq_out(0xFFFF, 16); swdptap_seq_out(0xFFFFFFFF, 16);
for(int i = 0; i < 50; i++) swdptap_seq_out(0xFFFFFFFF, 32);
swdptap_bit_out(1); swdptap_seq_out(0xFFFFFFFF, 18);
swdptap_seq_out(0xE79E, 16); /* 0b0111100111100111 */ swdptap_seq_out(0xE79E, 16); /* 0b0111100111100111 */
for(int i = 0; i < 50; i++) swdptap_seq_out(0xFFFFFFFF, 32);
swdptap_bit_out(1); swdptap_seq_out(0xFFFFFFFF, 18);
swdptap_seq_out(0, 16); swdptap_seq_out(0, 16);
/* Read the SW-DP IDCODE register to syncronise */ /* Read the SW-DP IDCODE register to syncronise */