no longer use jtag_add_xxx() to set end state to TAP_IDLE. Same must be done for...

[openocd] / src / flash / s3c2443_nand.c

diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c
index 56e84b6800922ad4aa5c5c2fa0d5b878f0188de1..a50689d593fdd8caad026579dfb79ed156c7869a 100644 (file)
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/s3c2443_nand.c
@@ -1,35 +1,38 @@
-/* src/flash/s3c2443_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.             *
+ ***************************************************************************/
+
+/*
  * S3C2443 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.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #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"
 
-int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
-int s3c2443_init(struct nand_device_s *device);
-int s3c2443_nand_ready(struct nand_device_s *device, int timeout);
+
+static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
+static int s3c2443_init(struct nand_device_s *device);
 
 nand_flash_controller_t s3c2443_nand_controller =
 {
@@ -50,12 +53,12 @@ nand_flash_controller_t s3c2443_nand_controller =
        .nand_ready             = s3c2440_nand_ready,
 };
 
-int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
+static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
                                char **args, int argc,
                                struct nand_device_s *device)
 {
        s3c24xx_nand_controller_t *info;
-       
+
        info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
        if (info == NULL) {
                return ERROR_NAND_DEVICE_INVALID;
@@ -66,15 +69,14 @@ int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
        info->addr = S3C2440_NFADDR;
        info->data = S3C2440_NFDATA;
        info->nfstat = S3C2412_NFSTAT;
-       
+
        return ERROR_OK;
 }
 
-int s3c2443_init(struct nand_device_s *device)
+static int s3c2443_init(struct nand_device_s *device)
 {
        s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
        target_t *target = s3c24xx_info->target;
-       u32 version;
 
        target_write_u32(target, S3C2410_NFCONF,
                         S3C2440_NFCONF_TACLS(3) |