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

adiv5: Cleanup and types fixes to fix some clang-tidy and stylistic lint

This commit is contained in:
dragonmux 2022-08-29 05:22:47 +01:00 committed by Piotr Esden-Tempski
parent cfa9e9858d
commit 9f9cc13401
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/target/adiv5.c
View File

@ -679,7 +679,6 @@ static void rp_rescue_setup(ADIv5_DP_t *dp)
ap->dp = dp; ap->dp = dp;
rp_rescue_probe(ap); rp_rescue_probe(ap);
return;
} }
void adiv5_dp_init(ADIv5_DP_t *dp, const uint32_t idcode) void adiv5_dp_init(ADIv5_DP_t *dp, const uint32_t idcode)
@ -797,7 +796,7 @@ void adiv5_dp_init(ADIv5_DP_t *dp, const uint32_t idcode)
/* Write request for system and debug power up */ /* Write request for system and debug power up */
adiv5_dp_write(dp, ADIV5_DP_CTRLSTAT, ctrlstat |= ADIV5_DP_CTRLSTAT_CSYSPWRUPREQ | ADIV5_DP_CTRLSTAT_CDBGPWRUPREQ); adiv5_dp_write(dp, ADIV5_DP_CTRLSTAT, ctrlstat |= ADIV5_DP_CTRLSTAT_CSYSPWRUPREQ | ADIV5_DP_CTRLSTAT_CDBGPWRUPREQ);
/* Wait for acknowledge */ /* Wait for acknowledge */
while (1) { while (true) {
ctrlstat = adiv5_dp_read(dp, ADIV5_DP_CTRLSTAT); ctrlstat = adiv5_dp_read(dp, ADIV5_DP_CTRLSTAT);
uint32_t check = ctrlstat & (ADIV5_DP_CTRLSTAT_CSYSPWRUPACK | ADIV5_DP_CTRLSTAT_CDBGPWRUPACK); uint32_t check = ctrlstat & (ADIV5_DP_CTRLSTAT_CSYSPWRUPACK | ADIV5_DP_CTRLSTAT_CDBGPWRUPACK);
if (check == (ADIV5_DP_CTRLSTAT_CSYSPWRUPACK | ADIV5_DP_CTRLSTAT_CDBGPWRUPACK)) if (check == (ADIV5_DP_CTRLSTAT_CSYSPWRUPACK | ADIV5_DP_CTRLSTAT_CDBGPWRUPACK))
@ -819,7 +818,7 @@ void adiv5_dp_init(ADIv5_DP_t *dp, const uint32_t idcode)
/* Write request for debug reset release */ /* Write request for debug reset release */
adiv5_dp_write(dp, ADIV5_DP_CTRLSTAT, ctrlstat &= ~ADIV5_DP_CTRLSTAT_CDBGRSTREQ); adiv5_dp_write(dp, ADIV5_DP_CTRLSTAT, ctrlstat &= ~ADIV5_DP_CTRLSTAT_CDBGRSTREQ);
/* Wait for acknowledge */ /* Wait for acknowledge */
while (1) { while (true) {
platform_delay(20); platform_delay(20);
ctrlstat = adiv5_dp_read(dp, ADIV5_DP_CTRLSTAT); ctrlstat = adiv5_dp_read(dp, ADIV5_DP_CTRLSTAT);
if (ctrlstat & ADIV5_DP_CTRLSTAT_CDBGRSTACK) { if (ctrlstat & ADIV5_DP_CTRLSTAT_CDBGRSTACK) {
@ -859,8 +858,8 @@ void adiv5_dp_init(ADIv5_DP_t *dp, const uint32_t idcode)
nrf51_mdm_probe(ap); nrf51_mdm_probe(ap);
efm32_aap_probe(ap); efm32_aap_probe(ap);
/* Halt the device and release from reset if reset is active!*/ /* Halt the device and release from reset if reset is active! */
if (!ap->apsel && ((ap->idr & 0xf) == ARM_AP_TYPE_AHB)) if (!ap->apsel && (ap->idr & 0xfU) == ARM_AP_TYPE_AHB)
cortexm_prepare(ap); cortexm_prepare(ap);
/* Should probe further here to make sure it's a valid target. /* Should probe further here to make sure it's a valid target.
* AP should be unref'd if not valid. * AP should be unref'd if not valid.