target read/write is no longer attempted for target_xxx() functions when the target...

[openocd] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index ee387dbda5844d38739209f10dc041bbf36d9922..fe8044141e00b3417ba7e00b5c06d568b3c95c75 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -466,6 +466,7 @@ static int default_mmu(struct target_s *target, int *enabled)
 
 static int default_examine(struct command_context_s *cmd_ctx, struct target_s *target)
 {
+       target->type->examined = 1;
        return ERROR_OK;
 }
 
@@ -895,6 +896,11 @@ int target_arch_state(struct target_s *target)
 int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer)
 {
        int retval;
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
        
        LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address);
        
@@ -959,7 +965,12 @@ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buff
 int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer)
 {
        int retval;
-       
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
+
        LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address);
        
        if (((address % 2) == 0) && (size == 2))
@@ -1012,6 +1023,11 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32*
        int retval;
        int i;
        u32 checksum = 0;
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
        
        if ((retval = target->type->checksum_memory(target, address,
                size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
@@ -1049,6 +1065,11 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32*
 int target_read_u32(struct target_s *target, u32 address, u32 *value)
 {
        u8 value_buf[4];
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
 
        int retval = target->type->read_memory(target, address, 4, 1, value_buf);
        
@@ -1069,7 +1090,12 @@ int target_read_u32(struct target_s *target, u32 address, u32 *value)
 int target_read_u16(struct target_s *target, u32 address, u16 *value)
 {
        u8 value_buf[2];
-       
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
+
        int retval = target->type->read_memory(target, address, 2, 1, value_buf);
        
        if (retval == ERROR_OK)
@@ -1089,6 +1115,11 @@ int target_read_u16(struct target_s *target, u32 address, u16 *value)
 int target_read_u8(struct target_s *target, u32 address, u8 *value)
 {
        int retval = target->type->read_memory(target, address, 1, 1, value);
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
 
        if (retval == ERROR_OK)
        {
@@ -1107,6 +1138,11 @@ int target_write_u32(struct target_s *target, u32 address, u32 value)
 {
        int retval;
        u8 value_buf[4];
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
 
        LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value);
 
@@ -1123,7 +1159,12 @@ int target_write_u16(struct target_s *target, u32 address, u16 value)
 {
        int retval;
        u8 value_buf[2];
-       
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
+
        LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value);
 
        target_buffer_set_u16(target, value_buf, value);        
@@ -1138,7 +1179,12 @@ int target_write_u16(struct target_s *target, u32 address, u16 value)
 int target_write_u8(struct target_s *target, u32 address, u8 value)
 {
        int retval;
-       
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
+
        LOG_DEBUG("address: 0x%8.8x, value: 0x%2.2x", address, value);
 
        if ((retval = target->type->read_memory(target, address, 1, 1, &value)) != ERROR_OK)