Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / flash / lpc3180_nand_controller.c

diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c
index 50846b92b261271ce953fe1782924f1b68be7c86..06048085b5823d080227885955c296914bb429a6 100644 (file)
--- a/src/flash/lpc3180_nand_controller.c
+++ b/src/flash/lpc3180_nand_controller.c
@@ -71,10 +71,10 @@ static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *
        lpc3180_info = malloc(sizeof(lpc3180_nand_controller_t));
        device->controller_priv = lpc3180_info;
 
-       lpc3180_info->target = get_target_by_num(strtoul(args[1], NULL, 0));
+       lpc3180_info->target = get_target(args[1]);
        if (!lpc3180_info->target)
        {
-               LOG_ERROR("no target '%s' configured", args[1]);
+               LOG_ERROR("target '%s' not defined", args[1]);
                return ERROR_NAND_DEVICE_INVALID;
        }
 
@@ -602,8 +602,8 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
                        /* write MLC_ECC_ENC_REG to start encode cycle */
                        target_write_u32(target, 0x200b8008, 0x0);
 
-                       target->type->write_memory(target, 0x200a8000, 4, 128, page_buffer + (quarter * 512));
-                       target->type->write_memory(target, 0x200a8000, 1, 6, oob_buffer + (quarter * 6));
+                       target_write_memory(target, 0x200a8000, 4, 128, page_buffer + (quarter * 512));
+                       target_write_memory(target, 0x200a8000, 1, 6, oob_buffer + (quarter * 6));
 
                        /* write MLC_ECC_AUTO_ENC_REG to start auto encode */
                        target_write_u32(target, 0x200b8010, 0x0);
@@ -759,12 +759,12 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
 
                        if (data)
                        {
-                               target->type->read_memory(target, 0x200a8000, 4, 128, page_buffer + page_bytes_done);
+                               target_read_memory(target, 0x200a8000, 4, 128, page_buffer + page_bytes_done);
                        }
 
                        if (oob)
                        {
-                               target->type->read_memory(target, 0x200a8000, 4, 4, oob_buffer + oob_bytes_done);
+                               target_read_memory(target, 0x200a8000, 4, 4, oob_buffer + oob_bytes_done);
                        }
 
                        page_bytes_done += 512;