diff options
| author | Tim Newsome <tim@sifive.com> | 2017-12-22 13:03:58 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2017-12-22 13:03:58 -0800 |
| commit | d2c92be73f05e7e6aab5d3d88172e9768f2301d9 (patch) | |
| tree | 9fbf82d9d4332f67831cfb098e21b6085da7f497 /src/target/arm_adi_v5.c | |
| parent | 6c719f0ab838e6804500fa8ac6917b34a78ecf3e (diff) | |
| parent | 1c2e3d41de30c5e47d3fc8eda3de0a0a8229895a (diff) | |
| download | riscv-openocd-d2c92be73f05e7e6aab5d3d88172e9768f2301d9.zip riscv-openocd-d2c92be73f05e7e6aab5d3d88172e9768f2301d9.tar.gz riscv-openocd-d2c92be73f05e7e6aab5d3d88172e9768f2301d9.tar.bz2 | |
Merge branch 'master' into update
Change-Id: Icec244b174cc0c67ab58961649a369db7f344824
Diffstat (limited to 'src/target/arm_adi_v5.c')
| -rw-r--r-- | src/target/arm_adi_v5.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index eafc2dd..2006290 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -346,8 +346,10 @@ static int mem_ap_write(struct adiv5_ap *ap, const uint8_t *buffer, uint32_t siz case 4: outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); + /* fallthrough */ case 2: outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); + /* fallthrough */ case 1: outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); } @@ -509,8 +511,10 @@ static int mem_ap_read(struct adiv5_ap *ap, uint8_t *buffer, uint32_t size, uint case 4: *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); + /* fallthrough */ case 2: *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); + /* fallthrough */ case 1: *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); } @@ -519,8 +523,10 @@ static int mem_ap_read(struct adiv5_ap *ap, uint8_t *buffer, uint32_t size, uint case 4: *buffer++ = *read_ptr >> 8 * (address++ & 3); *buffer++ = *read_ptr >> 8 * (address++ & 3); + /* fallthrough */ case 2: *buffer++ = *read_ptr >> 8 * (address++ & 3); + /* fallthrough */ case 1: *buffer++ = *read_ptr >> 8 * (address++ & 3); } @@ -1053,7 +1059,7 @@ static int dap_rom_display(struct command_context *cmd_ctx, int retval; uint64_t pid; uint32_t cid; - char tabs[7] = ""; + char tabs[16] = ""; if (depth > 16) { command_print(cmd_ctx, "\tTables too deep"); |