X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=183005e4d08e2c5817eb990e5182ce7f4bb2ba8c;hp=7e3975695404dfc5cb5e3b7587fb29010abe5639;hb=5914310f88161967cd1759e536f8069b9b15bdde;hpb=80b80ef9b43acd56358587724218131456049c59

diff --git a/src/target/target.c b/src/target/target.c
index 7e39756954..183005e4d0 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -657,16 +657,6 @@ const char *target_type_name(struct target *target)
 	return target->type->name;
 }
 
-static int target_write_memory_imp(struct target *target, uint32_t address,
-		uint32_t size, uint32_t count, const uint8_t *buffer)
-{
-	if (!target_was_examined(target)) {
-		LOG_ERROR("Target not examined yet");
-		return ERROR_FAIL;
-	}
-	return target->type->write_memory_imp(target, address, size, count, buffer);
-}
-
 static int target_read_memory_imp(struct target *target, uint32_t address,
 		uint32_t size, uint32_t count, uint8_t *buffer)
 {
@@ -963,12 +953,20 @@ static int target_read_phys_memory(struct target *target,
 int target_write_memory(struct target *target,
 		uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer)
 {
+	if (!target_was_examined(target)) {
+		LOG_ERROR("Target not examined yet");
+		return ERROR_FAIL;
+	}
 	return target->type->write_memory(target, address, size, count, buffer);
 }
 
 static int target_write_phys_memory(struct target *target,
 		uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer)
 {
+	if (!target_was_examined(target)) {
+		LOG_ERROR("Target not examined yet");
+		return ERROR_FAIL;
+	}
 	return target->type->write_phys_memory(target, address, size, count, buffer);
 }
 
@@ -1093,9 +1091,6 @@ static int target_init_one(struct command_context *cmd_ctx,
 	/* a non-invasive way(in terms of patches) to add some code that
 	 * runs before the type->write/read_memory implementation
 	 */
-	type->write_memory_imp = target->type->write_memory;
-	type->write_memory = target_write_memory_imp;
-
 	type->read_memory_imp = target->type->read_memory;
 	type->read_memory = target_read_memory_imp;