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/arm926ejs.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/arm926ejs.c')
-rw-r--r-- | src/target/arm926ejs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index 3765f231..c72fe105 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -626,7 +626,7 @@ int arm926ejs_soft_reset_halt(struct target *target) /** Writes a buffer, in the specified word size, with current MMU settings. */ int arm926ejs_write_memory(struct target *target, uint32_t address, - uint32_t size, uint32_t count, uint8_t *buffer) + uint32_t size, uint32_t count, const uint8_t *buffer) { int retval; struct arm926ejs_common *arm926ejs = target_to_arm926(target); @@ -693,7 +693,7 @@ int arm926ejs_write_memory(struct target *target, uint32_t address, static int arm926ejs_write_phys_memory(struct target *target, uint32_t address, uint32_t size, - uint32_t count, uint8_t *buffer) + uint32_t count, const uint8_t *buffer) { struct arm926ejs_common *arm926ejs = target_to_arm926(target); |