X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fs3c2443_nand.c;h=82d9b8eae7bb743b05f2dc0175eaed22aca6ac5e;hp=5b685c904ed3f9dd0566fe0a8cfa71cccd970595;hb=e8e94ab2454566fb9a226693e5c1de2264634a48;hpb=6d3bed69dc023f49b51b6504d977463e722e9e9d

diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c
index 5b685c904e..82d9b8eae7 100644
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/s3c2443_nand.c
@@ -28,46 +28,16 @@
 #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);
-
-nand_flash_controller_t s3c2443_nand_controller =
-{
-	.name			= "s3c2443",
-	.nand_device_command	= s3c2443_nand_device_command,
-	.register_commands	= s3c24xx_register_commands,
-	.init			= s3c2443_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 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)
+				struct nand_device_s *nand)
 {
 	s3c24xx_nand_controller_t *info;
-	
-	info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
+
+	info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
 	if (info == NULL) {
 		return ERROR_NAND_DEVICE_INVALID;
 	}
@@ -77,13 +47,13 @@ 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 *nand)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
+	s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
 	target_t *target = s3c24xx_info->target;
 
 	target_write_u32(target, S3C2410_NFCONF,
@@ -97,3 +67,21 @@ int s3c2443_init(struct nand_device_s *device)
 
 	return ERROR_OK;
 }
+
+nand_flash_controller_t s3c2443_nand_controller = {
+		.name = "s3c2443",
+		.nand_device_command = &s3c2443_nand_device_command,
+		.register_commands = &s3c24xx_register_commands,
+		.init = &s3c2443_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,
+	};