X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fs3c2412_nand.c;h=2ca4cd31f91797e6bb9915ec01ab28160f374558;hb=4088b1e622cff0673f2859de5ee611da736bdba7;hp=5c9d319976e8b0da9c172c12699d4d8abc62c206;hpb=e8e94ab2454566fb9a226693e5c1de2264634a48;p=openocd.git

diff --git a/src/flash/s3c2412_nand.c b/src/flash/s3c2412_nand.c
index 5c9d319976..2ca4cd31f9 100644
--- a/src/flash/s3c2412_nand.c
+++ b/src/flash/s3c2412_nand.c
@@ -30,16 +30,10 @@
 
 #include "s3c24xx_nand.h"
 
-static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
-				char **args, int argc,
-				struct nand_device_s *nand)
+NAND_DEVICE_COMMAND_HANDLER(s3c2412_nand_device_command)
 {
-	s3c24xx_nand_controller_t *info;
-
-	info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
-	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;
@@ -50,10 +44,10 @@ static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *
 	return ERROR_OK;
 }
 
-static int s3c2412_init(struct nand_device_s *nand)
+static int s3c2412_init(struct nand_device *nand)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = nand->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) |
@@ -67,7 +61,7 @@ static int s3c2412_init(struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t s3c2412_nand_controller = {
+struct nand_flash_controller s3c2412_nand_controller = {
 		.name = "s3c2412",
 		.nand_device_command = &s3c2412_nand_device_command,
 		.register_commands = &s3c24xx_register_commands,