X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fs3c2443_nand.c;h=311bb6977c8fb0b8399939dfd3d28311c5f8e5da;hp=c6effdf8af6b9b94b7d8e2926fe8ec5532fe36d8;hb=c4992c6d863d0ead91d84d19bbfe1643d720b205;hpb=8b5c5c054d7ae08990e817a52bd28a326b27e54a

diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c
index c6effdf8af..311bb6977c 100644
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/s3c2443_nand.c
@@ -31,16 +31,10 @@
 #include "s3c24xx_nand.h"
 
 
-static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
-				char **args, int argc,
-				struct nand_device_s *device)
+NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)
 {
-	s3c24xx_nand_controller_t *info;
-
-	info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
-	if (info == NULL) {
-		return ERROR_NAND_DEVICE_INVALID;
-	}
+	struct s3c24xx_nand_controller *info;
+	CALL_S3C24XX_DEVICE_COMMAND(nand, &info);
 
 	/* fill in the address fields for the core device */
 	info->cmd = S3C2440_NFCMD;
@@ -51,10 +45,10 @@ static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *
 	return ERROR_OK;
 }
 
-static int s3c2443_init(struct nand_device_s *device)
+static int s3c2443_init(struct nand_device *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;
 
 	target_write_u32(target, S3C2410_NFCONF,
 			 S3C2440_NFCONF_TACLS(3) |
@@ -68,10 +62,9 @@ static int s3c2443_init(struct nand_device_s *device)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t s3c2443_nand_controller = {
+struct nand_flash_controller 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,