target_t -> struct target

[openocd.git] / src / flash / s3c24xx_nand.c

diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c
index 380f320f0994f200100a3be8a4e9149d3a963842..5125fd2623eb29be7cb2810d42481e753bea5495 100644 (file)
--- a/src/flash/s3c24xx_nand.c
+++ b/src/flash/s3c24xx_nand.c
@@ -28,38 +28,28 @@
 #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,
-                           char **args, int argc,
-                           struct nand_device_s *device)
+
+S3C24XX_DEVICE_COMMAND()
 {
-       s3c24xx_nand_controller_t *s3c24xx_info;
-       
-       s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t));
+       struct s3c24xx_nand_controller *s3c24xx_info;
+
+       s3c24xx_info = malloc(sizeof(struct s3c24xx_nand_controller));
        if (s3c24xx_info == NULL) {
                LOG_ERROR("no memory for nand controller\n");
-               return NULL;
+               return -ENOMEM;
        }
 
-       device->controller_priv = s3c24xx_info;
+       nand->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]);
-               return NULL;
+               LOG_ERROR("target '%s' not defined", args[1]);
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-               
-       return s3c24xx_info;
+
+       return ERROR_OK;
 }
 
 int s3c24xx_register_commands(struct command_context_s *cmd_ctx)
@@ -67,26 +57,26 @@ int s3c24xx_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int s3c24xx_reset(struct nand_device_s *device)
+int s3c24xx_reset(struct nand_device_s *nand)
 {
-       s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
-       target_t *target = s3c24xx_info->target;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
+       struct target *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_u32(target, s3c24xx_info->cmd, 0xff);
-       
+
        return ERROR_OK;
 }
 
-int s3c24xx_command(struct nand_device_s *device, u8 command)
+int s3c24xx_command(struct nand_device_s *nand, uint8_t command)
 {
-       s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
-       target_t *target = s3c24xx_info->target;
-       
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
+       struct target *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;
@@ -97,39 +87,39 @@ int s3c24xx_command(struct nand_device_s *device, u8 command)
 }
 
 
-int s3c24xx_address(struct nand_device_s *device, u8 address)
+int s3c24xx_address(struct nand_device_s *nand, uint8_t address)
 {
-       s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
-       target_t *target = s3c24xx_info->target;
-       
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
+       struct target *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;
 }
 
-int s3c24xx_write_data(struct nand_device_s *device, u16 data)
+int s3c24xx_write_data(struct nand_device_s *nand, uint16_t data)
 {
-       s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
-       target_t *target = s3c24xx_info->target;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
+       struct target *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_u8(target, s3c24xx_info->data, data);
        return ERROR_OK;
 }
 
-int s3c24xx_read_data(struct nand_device_s *device, void *data)
+int s3c24xx_read_data(struct nand_device_s *nand, void *data)
 {
-       s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
-       target_t *target = s3c24xx_info->target;
-       
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
+       struct target *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;
@@ -139,7 +129,7 @@ int s3c24xx_read_data(struct nand_device_s *device, void *data)
        return ERROR_OK;
 }
 
-int s3c24xx_controller_ready(struct nand_device_s *device, int timeout)
+int s3c24xx_controller_ready(struct nand_device_s *nand, int timeout)
 {
        return 1;
 }