Factor handle_bp_command into pieces:

[fw/openocd] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index a8753ac9c5a1f0fbd5408f14f623a4541e769cd8..d72680d1b763499646635c47a4cea7c7791db44e 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -27,20 +27,10 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_ELF_H
-#include <elf.h>
-#endif
-
 #include "image.h"
-
-#include "types.h"
-#include "replacements.h"
+#include "target.h"
 #include "log.h"
 
-#include "fileio.h"
-#include "target.h"
 
 /* convert ELF header field to host endianness */
 #define field16(elf,field)\
@@ -83,15 +73,15 @@ static int autodetect_image_type(image_t *image, char *url)
                LOG_DEBUG("ELF image detected.");
                image->type = IMAGE_ELF;
        }
-       else if  ((buffer[0]==':') /* record start byte */
-               &&(isxdigit(buffer[1]))
-               &&(isxdigit(buffer[2]))
-               &&(isxdigit(buffer[3]))
-               &&(isxdigit(buffer[4]))
-               &&(isxdigit(buffer[5]))
-               &&(isxdigit(buffer[6]))
-               &&(buffer[7]=='0') /* record type : 00 -> 05 */
-               &&(buffer[8]>='0')&&(buffer[8]<'6'))
+       else if ((buffer[0]==':') /* record start byte */
+               &&(isxdigit(buffer[1]))
+               &&(isxdigit(buffer[2]))
+               &&(isxdigit(buffer[3]))
+               &&(isxdigit(buffer[4]))
+               &&(isxdigit(buffer[5]))
+               &&(isxdigit(buffer[6]))
+               &&(buffer[7]=='0') /* record type : 00 -> 05 */
+               &&(buffer[8]>='0')&&(buffer[8]<'6'))
        {
                LOG_DEBUG("IHEX image detected.");
                image->type = IMAGE_IHEX;
@@ -113,7 +103,7 @@ static int autodetect_image_type(image_t *image, char *url)
        return ERROR_OK;
 }
 
-int identify_image_type(image_t *image, char *type_string, char *url)
+static int identify_image_type(image_t *image, char *type_string, char *url)
 {
        if (type_string)
        {
@@ -154,7 +144,7 @@ int identify_image_type(image_t *image, char *type_string, char *url)
        return ERROR_OK;
 }
 
-int image_ihex_buffer_complete(image_t *image)
+static int image_ihex_buffer_complete(image_t *image)
 {
        image_ihex_t *ihex = image->type_private;
        fileio_t *fileio = &ihex->fileio;
@@ -217,7 +207,9 @@ int image_ihex_buffer_complete(image_t *image)
 
                        while (count-- > 0)
                        {
-                               sscanf(&lpszLine[bytes_read], "%2x", (u32*)&ihex->buffer[cooked_bytes]);
+                               unsigned value;
+                               sscanf(&lpszLine[bytes_read], "%2x", &value);
+                               ihex->buffer[cooked_bytes] = (u8)value;
                                cal_checksum += (u8)ihex->buffer[cooked_bytes];
                                bytes_read += 2;
                                cooked_bytes += 1;
@@ -344,7 +336,7 @@ int image_ihex_buffer_complete(image_t *image)
        return ERROR_IMAGE_FORMAT_ERROR;
 }
 
-int image_elf_read_headers(image_t *image)
+static int image_elf_read_headers(image_t *image)
 {
        image_elf_t *elf = image->type_private;
        u32 read_bytes;
@@ -381,7 +373,6 @@ int image_elf_read_headers(image_t *image)
                return ERROR_IMAGE_FORMAT_ERROR;
        }
 
-
        elf->endianness = elf->header->e_ident[EI_DATA];
        if ((elf->endianness!=ELFDATA2LSB)
                 &&(elf->endianness!=ELFDATA2MSB))
@@ -446,7 +437,7 @@ int image_elf_read_headers(image_t *image)
        return ERROR_OK;
 }
 
-int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8 *buffer, u32 *size_read)
+static int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8 *buffer, u32 *size_read)
 {
        image_elf_t *elf = image->type_private;
        Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private;
@@ -487,7 +478,7 @@ int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8
        return ERROR_OK;
 }
 
-int image_mot_buffer_complete(image_t *image)
+static int image_mot_buffer_complete(image_t *image)
 {
        image_mot_t *mot = image->type_private;
        fileio_t *fileio = &mot->fileio;
@@ -595,7 +586,9 @@ int image_mot_buffer_complete(image_t *image)
 
                        while (count-- > 0)
                        {
-                               sscanf(&lpszLine[bytes_read], "%2x", (u32*)&mot->buffer[cooked_bytes]);
+                               unsigned value;
+                               sscanf(&lpszLine[bytes_read], "%2x", &value);
+                               mot->buffer[cooked_bytes] = (u8)value;
                                cal_checksum += (u8)mot->buffer[cooked_bytes];
                                bytes_read += 2;
                                cooked_bytes += 1;
@@ -718,6 +711,14 @@ int image_open(image_t *image, char *url, char *type_string)
        }
        else if (image->type == IMAGE_MEMORY)
        {
+               target_t *target = get_target(url);
+
+               if (target == NULL)
+               {
+                       LOG_ERROR("target '%s' not defined", url);
+                       return ERROR_FAIL;
+               }
+
                image_memory_t *image_memory;
 
                image->num_sections = 1;
@@ -728,7 +729,7 @@ int image_open(image_t *image, char *url, char *type_string)
 
                image_memory = image->type_private = malloc(sizeof(image_memory_t));
 
-               image_memory->target = get_target_by_num(strtoul(url, NULL, 0));;
+               image_memory->target = target;
                image_memory->cache = NULL;
                image_memory->cache_address = 0x0;
        }
@@ -1035,5 +1036,3 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
        *checksum = crc;
        return ERROR_OK;
 }
-
-