- fix line-endings

git-svn-id: svn://svn.berlios.de/openocd/trunk@362 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 178 insertions, 178 deletions

diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c
index f08e7610..a6b9b04d 100644
--- a/src/flash/s3c2440_nand.c
+++ b/src/flash/s3c2440_nand.c
@@ -1,178 +1,178 @@
-/* src/flash/s3c2440_nand.c

- *

- * S3C2440 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 s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);

-int s3c2440_init(struct nand_device_s *device);

-int s3c2440_nand_ready(struct nand_device_s *device, int timeout);

-

-nand_flash_controller_t s3c2440_nand_controller =

-{

-	.name			= "s3c2440",

-	.nand_device_command	= s3c2440_nand_device_command,

-	.register_commands	= s3c24xx_register_commands,

-	.init			= s3c2440_init,

-	.reset			= s3c24xx_reset,

-	.command		= s3c24xx_command,

-	.address		= s3c24xx_address,

-	.write_data		= s3c24xx_write_data,

-	.read_data		= s3c24xx_read_data,

-	.write_page		= s3c24xx_write_page,

-	.read_page		= s3c24xx_read_page,

-	.write_block_data	= s3c2440_write_block_data,

-	.read_block_data	= s3c2440_read_block_data,

-	.controller_ready	= s3c24xx_controller_ready,

-	.nand_ready		= s3c2440_nand_ready,

-};

-

-int s3c2440_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;

-	}

-

-	/* fill in the address fields for the core device */

-	info->cmd = S3C2440_NFCMD;

-	info->addr = S3C2440_NFADDR;

-	info->data = S3C2440_NFDATA;

-	info->nfstat = S3C2440_NFSTAT;

-		

-	return ERROR_OK;

-}

-

-int s3c2440_init(struct nand_device_s *device)

-{

-	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;

-	target_t *target = s3c24xx_info->target;

-

-	target_write_u32(target, S3C2410_NFCONF,

-			 S3C2440_NFCONF_TACLS(3) |

-			 S3C2440_NFCONF_TWRPH0(7) |

-			 S3C2440_NFCONF_TWRPH1(7));

-

-	target_write_u32(target, S3C2440_NFCONT,

-			 S3C2440_NFCONT_INITECC | S3C2440_NFCONT_ENABLE);

-

-	return ERROR_OK;

-}

-

-int s3c2440_nand_ready(struct nand_device_s *device, int timeout)

-{

-	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;

-	target_t *target = s3c24xx_info->target;

-	u8 status;

-

-	if (target->state != TARGET_HALTED) {

-		ERROR("target must be halted to use S3C24XX NAND flash controller");

-		return ERROR_NAND_OPERATION_FAILED;

-	}

-	

-	do {		

-		target_read_u8(target, s3c24xx_info->nfstat, &status);

-		

-		if (status & S3C2440_NFSTAT_READY)

-			return 1;

-

-		usleep(1000);

-	} while (timeout-- > 0);

-

-

-	return 0;

-}

-

-/* use the fact we can read/write 4 bytes in one go via a single 32bit op */

-

-int s3c2440_read_block_data(struct nand_device_s *device, u8 *data, int data_size)

-{

-	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;

-	target_t *target = s3c24xx_info->target;

-	u32 nfdata = s3c24xx_info->data;

-	u32 tmp;

-

-	INFO("%s: reading data: %p, %p, %d\n", __func__, device, data, data_size);

-

-	if (target->state != TARGET_HALTED) {

-		ERROR("target must be halted to use S3C24XX NAND flash controller");

-		return ERROR_NAND_OPERATION_FAILED;

-	}

-

-	while (data_size >= 4) {	  

-		target_read_u32(target, nfdata, &tmp);

-

-		data[0] = tmp;

-		data[1] = tmp >> 8;

-		data[2] = tmp >> 16;

-		data[3] = tmp >> 24;

-

-		data_size -= 4;

-		data += 4;

-	}

-

-	while (data_size > 0) {

-		target_read_u8(target, nfdata, data);

-

-		data_size -= 1;

-		data += 1;

-	}

-

-	return ERROR_OK;

-}

-

-int s3c2440_write_block_data(struct nand_device_s *device, u8 *data, int data_size)

-{

-	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;

-	target_t *target = s3c24xx_info->target;

-	u32 nfdata = s3c24xx_info->data;

-	u32 tmp;

-

-	if (target->state != TARGET_HALTED) {

-		ERROR("target must be halted to use S3C24XX NAND flash controller");

-		return ERROR_NAND_OPERATION_FAILED;

-	}

-

-	while (data_size >= 4) {	  

-		tmp = le_to_h_u32(data);

-		target_write_u32(target, nfdata, tmp);

-

-		data_size -= 4;

-		data += 4;

-	}

-

-	while (data_size > 0) {

-		target_write_u8(target, nfdata, *data);

-

-		data_size -= 1;

-		data += 1;

-	}

-

-	return ERROR_OK;

-}

+/* src/flash/s3c2440_nand.c
+ *
+ * S3C2440 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 s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
+int s3c2440_init(struct nand_device_s *device);
+int s3c2440_nand_ready(struct nand_device_s *device, int timeout);
+
+nand_flash_controller_t s3c2440_nand_controller =
+{
+	.name			= "s3c2440",
+	.nand_device_command	= s3c2440_nand_device_command,
+	.register_commands	= s3c24xx_register_commands,
+	.init			= s3c2440_init,
+	.reset			= s3c24xx_reset,
+	.command		= s3c24xx_command,
+	.address		= s3c24xx_address,
+	.write_data		= s3c24xx_write_data,
+	.read_data		= s3c24xx_read_data,
+	.write_page		= s3c24xx_write_page,
+	.read_page		= s3c24xx_read_page,
+	.write_block_data	= s3c2440_write_block_data,
+	.read_block_data	= s3c2440_read_block_data,
+	.controller_ready	= s3c24xx_controller_ready,
+	.nand_ready		= s3c2440_nand_ready,
+};
+
+int s3c2440_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;
+	}
+
+	/* fill in the address fields for the core device */
+	info->cmd = S3C2440_NFCMD;
+	info->addr = S3C2440_NFADDR;
+	info->data = S3C2440_NFDATA;
+	info->nfstat = S3C2440_NFSTAT;
+		
+	return ERROR_OK;
+}
+
+int s3c2440_init(struct nand_device_s *device)
+{
+	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
+	target_t *target = s3c24xx_info->target;
+
+	target_write_u32(target, S3C2410_NFCONF,
+			 S3C2440_NFCONF_TACLS(3) |
+			 S3C2440_NFCONF_TWRPH0(7) |
+			 S3C2440_NFCONF_TWRPH1(7));
+
+	target_write_u32(target, S3C2440_NFCONT,
+			 S3C2440_NFCONT_INITECC | S3C2440_NFCONT_ENABLE);
+
+	return ERROR_OK;
+}
+
+int s3c2440_nand_ready(struct nand_device_s *device, int timeout)
+{
+	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
+	target_t *target = s3c24xx_info->target;
+	u8 status;
+
+	if (target->state != TARGET_HALTED) {
+		ERROR("target must be halted to use S3C24XX NAND flash controller");
+		return ERROR_NAND_OPERATION_FAILED;
+	}
+	
+	do {		
+		target_read_u8(target, s3c24xx_info->nfstat, &status);
+		
+		if (status & S3C2440_NFSTAT_READY)
+			return 1;
+
+		usleep(1000);
+	} while (timeout-- > 0);
+
+
+	return 0;
+}
+
+/* use the fact we can read/write 4 bytes in one go via a single 32bit op */
+
+int s3c2440_read_block_data(struct nand_device_s *device, u8 *data, int data_size)
+{
+	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
+	target_t *target = s3c24xx_info->target;
+	u32 nfdata = s3c24xx_info->data;
+	u32 tmp;
+
+	INFO("%s: reading data: %p, %p, %d\n", __func__, device, data, data_size);
+
+	if (target->state != TARGET_HALTED) {
+		ERROR("target must be halted to use S3C24XX NAND flash controller");
+		return ERROR_NAND_OPERATION_FAILED;
+	}
+
+	while (data_size >= 4) {	  
+		target_read_u32(target, nfdata, &tmp);
+
+		data[0] = tmp;
+		data[1] = tmp >> 8;
+		data[2] = tmp >> 16;
+		data[3] = tmp >> 24;
+
+		data_size -= 4;
+		data += 4;
+	}
+
+	while (data_size > 0) {
+		target_read_u8(target, nfdata, data);
+
+		data_size -= 1;
+		data += 1;
+	}
+
+	return ERROR_OK;
+}
+
+int s3c2440_write_block_data(struct nand_device_s *device, u8 *data, int data_size)
+{
+	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
+	target_t *target = s3c24xx_info->target;
+	u32 nfdata = s3c24xx_info->data;
+	u32 tmp;
+
+	if (target->state != TARGET_HALTED) {
+		ERROR("target must be halted to use S3C24XX NAND flash controller");
+		return ERROR_NAND_OPERATION_FAILED;
+	}
+
+	while (data_size >= 4) {	  
+		tmp = le_to_h_u32(data);
+		target_write_u32(target, nfdata, tmp);
+
+		data_size -= 4;
+		data += 4;
+	}
+
+	while (data_size > 0) {
+		target_write_u8(target, nfdata, *data);
+
+		data_size -= 1;
+		data += 1;
+	}
+
+	return ERROR_OK;
+}