Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / flash / s3c24xx_nand.c

diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c
index 380f320f0994f200100a3be8a4e9149d3a963842..a26ac2d9cb0b875294af93f6eeb8fc95ffa86341 100644 (file)
--- a/src/flash/s3c24xx_nand.c
+++ b/src/flash/s3c24xx_nand.c
@@ -28,15 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
+
 
 s3c24xx_nand_controller_t *
 s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
@@ -44,7 +37,7 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
                            struct nand_device_s *device)
 {
        s3c24xx_nand_controller_t *s3c24xx_info;
-       
+
        s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t));
        if (s3c24xx_info == NULL) {
                LOG_ERROR("no memory for nand controller\n");
@@ -53,12 +46,12 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
 
        device->controller_priv = s3c24xx_info;
 
-       s3c24xx_info->target = get_target_by_num(strtoul(args[1], NULL, 0));
+       s3c24xx_info->target = get_target(args[1]);
        if (s3c24xx_info->target == NULL) {
-               LOG_ERROR("no target '%s' configured", args[1]);
+               LOG_ERROR("target '%s' not defined", args[1]);
                return NULL;
        }
-               
+
        return s3c24xx_info;
 }
 
@@ -76,9 +69,9 @@ int s3c24xx_reset(struct nand_device_s *device)
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        target_write_u32(target, s3c24xx_info->cmd, 0xff);
-       
+
        return ERROR_OK;
 }
 
@@ -86,7 +79,7 @@ int s3c24xx_command(struct nand_device_s *device, u8 command)
 {
        s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
        target_t *target = s3c24xx_info->target;
-       
+
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
@@ -101,12 +94,12 @@ int s3c24xx_address(struct nand_device_s *device, u8 address)
 {
        s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
        target_t *target = s3c24xx_info->target;
-       
+
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        target_write_u16(target, s3c24xx_info->addr, address);
        return ERROR_OK;
 }
@@ -120,7 +113,7 @@ int s3c24xx_write_data(struct nand_device_s *device, u16 data)
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        target_write_u8(target, s3c24xx_info->data, data);
        return ERROR_OK;
 }
@@ -129,7 +122,7 @@ int s3c24xx_read_data(struct nand_device_s *device, void *data)
 {
        s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
        target_t *target = s3c24xx_info->target;
-       
+
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;