aboutsummaryrefslogtreecommitdiff
path: root/src/adiv5_swdp.c
diff options
context:
space:
mode:
authorGareth McMullin2011-03-05 23:43:03 +1300
committerGareth McMullin2011-03-05 23:43:03 +1300
commit91815f2d236608f0d12d64b3e20994674088d217 (patch)
treecb6e1ea5711a3db1b4639f260cea7e4d865921b3 /src/adiv5_swdp.c
parenta139aae4792d994d4f49678aa425e62d3b84662c (diff)
Cleaned up some magic numbers in adiv5*
Diffstat (limited to 'src/adiv5_swdp.c')
-rw-r--r--src/adiv5_swdp.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/adiv5_swdp.c b/src/adiv5_swdp.c
index 432e54a..e554057 100644
--- a/src/adiv5_swdp.c
+++ b/src/adiv5_swdp.c
@@ -107,7 +107,7 @@ static uint32_t adiv5_swdp_read_ap(ADIv5_DP_t *dp, uint8_t addr)
uint32_t ret;
adiv5_swdp_low_access(dp, 1, 1, addr, 0);
- ret = adiv5_swdp_low_access(dp, 0, 1, DP_RDBUFF, 0);
+ ret = adiv5_swdp_low_access(dp, 0, 1, ADIV5_DP_RDBUFF, 0);
return ret;
}
@@ -116,13 +116,18 @@ static uint32_t adiv5_swdp_error(ADIv5_DP_t *dp)
{
uint32_t err, clr = 0;
- err = adiv5_swdp_read(dp, DP_CTRLSTAT) & 0x32;
+ err = adiv5_swdp_read(dp, ADIV5_DP_CTRLSTAT) &
+ (ADIV5_DP_CTRLSTAT_STICKYORUN | ADIV5_DP_CTRLSTAT_STICKYCMP |
+ ADIV5_DP_CTRLSTAT_STICKYERR);
- if(err & 0x02) clr |= 0x10; /* STICKORUN */
- if(err & 0x10) clr |= 0x02; /* STICKCMP */
- if(err & 0x20) clr |= 0x04; /* STICKERR */
+ if(err & ADIV5_DP_CTRLSTAT_STICKYORUN)
+ clr |= ADIV5_DP_ABORT_ORUNERRCLR;
+ if(err & ADIV5_DP_CTRLSTAT_STICKYCMP)
+ clr |= ADIV5_DP_ABORT_STKCMPCLR;
+ if(err & ADIV5_DP_CTRLSTAT_STICKYERR)
+ clr |= ADIV5_DP_ABORT_STKERRCLR;
- adiv5_swdp_write(dp, DP_ABORT, clr);
+ adiv5_swdp_write(dp, ADIV5_DP_ABORT, clr);
dp->fault = 0;
return err;