diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-04-01 13:02:24 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-04-01 13:02:24 +0200 |
| commit | 3b7c9585db2dd49b48123d50e9e8af7bc527be52 (patch) | |
| tree | 543433d697a4131e362ff6cf158324479dd89af8 /src/target/arm7_9_common.c | |
| parent | a0b83e82f7fa1833f7ac137d052335c55d1a4223 (diff) | |
| parent | 977df18f50f0f4d2310787787c03d83c2498da1a (diff) | |
| download | openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.tar.gz openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.tar.bz2 openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.tar.xz openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.zip | |
Merge remote branch 'origin/master' into HEAD
Diffstat (limited to 'src/target/arm7_9_common.c')
| -rw-r--r-- | src/target/arm7_9_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index 778e606b..611d5d4a 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -2431,7 +2431,7 @@ int arm7_9_read_memory(struct target *target, uint32_t address, uint32_t size, u return ERROR_OK; } -int arm7_9_write_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) +int arm7_9_write_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer) { struct arm7_9_common *arm7_9 = target_to_arm7_9(target); struct arm *armv4_5 = &arm7_9->armv4_5_common; @@ -2655,7 +2655,7 @@ int arm7_9_write_memory(struct target *target, uint32_t address, uint32_t size, } static int dcc_count; -static uint8_t *dcc_buffer; +static const uint8_t *dcc_buffer; static int arm7_9_dcc_completion(struct target *target, uint32_t exit_point, int timeout_ms, void *arch_info) { @@ -2667,7 +2667,7 @@ static int arm7_9_dcc_completion(struct target *target, uint32_t exit_point, int int little = target->endianness == TARGET_LITTLE_ENDIAN; int count = dcc_count; - uint8_t *buffer = dcc_buffer; + const uint8_t *buffer = dcc_buffer; if (count > 2) { /* Handle first & last using standard embeddedice_write_reg and the middle ones w/the @@ -2720,7 +2720,7 @@ static const uint32_t dcc_code[] = 0xeafffff9 /* b w */ }; -int arm7_9_bulk_write_memory(struct target *target, uint32_t address, uint32_t count, uint8_t *buffer) +int arm7_9_bulk_write_memory(struct target *target, uint32_t address, uint32_t count, const uint8_t *buffer) { int retval; struct arm7_9_common *arm7_9 = target_to_arm7_9(target); |