Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / flash / orion_nand.c

diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index 678eb94c758a1a3974819b598a91ee6c8338a5ad..f1208a634b1151d07f375b290156ad18b9d57c77 100644 (file)
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -26,17 +26,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
 #include "nand.h"
-#include "target.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
 
+
 typedef struct orion_nand_controller_s
 {
        struct target_s *target;
@@ -137,7 +131,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
                        target_buffer_set_u32(target, code_buf + i*4, code[i]);
 
                /* write code to working area */
-                retval = target->type->write_memory(target,
+                retval = target_write_memory(target,
                                        hw->copy_area->address,
                                        4, code_size/4, code_buf);
                if (retval != ERROR_OK)
@@ -146,10 +140,9 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
 
        /* copy data to target's memory */
        target_buf = hw->copy_area->address + code_size;
-       retval = target->type->bulk_write_memory(target, target_buf,
-                                                size/4, data);
+       retval = target_bulk_write_memory(target, target_buf, size/4, data);
        if (retval == ERROR_OK && size & 3) {
-               retval = target->type->write_memory(target,
+               retval = target_write_memory(target,
                                        target_buf + (size & ~3),
                                        1, size & 3, data + (size & ~3));
        }
@@ -168,7 +161,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
        buf_set_u32(reg_params[1].value, 0, 32, target_buf);
        buf_set_u32(reg_params[2].value, 0, 32, size);
 
-       retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
+       retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
                                        hw->copy_area->address,
                                        hw->copy_area->address + code_size - 4,
                                        1000, &algo);
@@ -216,9 +209,9 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
        }
 
        device->controller_priv = hw;
-       hw->target = get_target_by_num(strtoul(args[1], NULL, 0));
+       hw->target = get_target(args[1]);
        if (!hw->target) {
-               LOG_ERROR("no target '%s' configured", args[1]);
+               LOG_ERROR("target '%s' not defined", args[1]);
                free(hw);
                return ERROR_NAND_DEVICE_INVALID;
        }