str9x_flash_bank_t -> struct str9x_flash_bank
[fw/openocd] / src / flash / s3c24xx_nand.c
index 6bde224fa303cf9e8d9e257e177ce7c290fbb2a1..17de5d414be4bc348f4e1d3befc98cd6aa0e5a1e 100644 (file)
@@ -1,14 +1,26 @@
-/* src/flash/s3c24xx_nand.c
- *
+/***************************************************************************
+ *   Copyright (C) 2007, 2008 by Ben Dooks                                 *
+ *   ben@fluff.org                                                         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+/*
  * S3C24XX Series OpenOCD NAND Flash controller support.
  *
- * Copyright 2007,2008 Ben Dooks <ben@fluff.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
  * Many thanks to Simtec Electronics for sponsoring this work.
  */
 
 #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) {
-               ERROR("no memory for nand controller\n");
-               return NULL;
+               LOG_ERROR("no memory for nand controller\n");
+               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) {
-               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)
@@ -55,28 +57,28 @@ 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;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
        target_t *target = s3c24xx_info->target;
 
        if (target->state != TARGET_HALTED) {
-               ERROR("target must be halted to use S3C24XX NAND flash controller");
+               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;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
        target_t *target = s3c24xx_info->target;
-       
+
        if (target->state != TARGET_HALTED) {
-               ERROR("target must be halted to use S3C24XX NAND flash controller");
+               LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
 
@@ -85,41 +87,41 @@ 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;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
        target_t *target = s3c24xx_info->target;
-       
+
        if (target->state != TARGET_HALTED) {
-               ERROR("target must be halted to use S3C24XX NAND flash controller");
+               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;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
        target_t *target = s3c24xx_info->target;
 
        if (target->state != TARGET_HALTED) {
-               ERROR("target must be halted to use S3C24XX NAND flash controller");
+               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;
+       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
        target_t *target = s3c24xx_info->target;
-       
+
        if (target->state != TARGET_HALTED) {
-               ERROR("target must be halted to use S3C24XX NAND flash controller");
+               LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
 
@@ -127,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;
 }