X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fs3c2410_nand.c;h=6fe8bae73f12238aab9ed35dd3085b2b1f8a7190;hp=e663507ec7969afdfde95a06e58811c8bf21ea40;hb=2f6e56e38320350bb300b363d0b3737fa8d1f3ea;hpb=e8e94ab2454566fb9a226693e5c1de2264634a48

diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c
index e663507ec7..6fe8bae73f 100644
--- a/src/flash/s3c2410_nand.c
+++ b/src/flash/s3c2410_nand.c
@@ -30,16 +30,10 @@
 
 #include "s3c24xx_nand.h"
 
-static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
-				char **args, int argc,
-				struct nand_device_s *nand)
+NAND_DEVICE_COMMAND_HANDLER(s3c2410_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 = S3C2410_NFCMD;
@@ -50,10 +44,10 @@ static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *
 	return ERROR_OK;
 }
 
-static int s3c2410_init(struct nand_device_s *nand)
+static int s3c2410_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,
 			 S3C2410_NFCONF_EN | S3C2410_NFCONF_TACLS(3) |
@@ -62,10 +56,10 @@ static int s3c2410_init(struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-static int s3c2410_write_data(struct nand_device_s *nand, uint16_t data)
+static int s3c2410_write_data(struct nand_device *nand, uint16_t data)
 {
-	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;
 
 	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -76,10 +70,10 @@ static int s3c2410_write_data(struct nand_device_s *nand, uint16_t data)
 	return ERROR_OK;
 }
 
-static int s3c2410_read_data(struct nand_device_s *nand, void *data)
+static int s3c2410_read_data(struct nand_device *nand, void *data)
 {
-	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;
 
 	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@@ -90,10 +84,10 @@ static int s3c2410_read_data(struct nand_device_s *nand, void *data)
 	return ERROR_OK;
 }
 
-static int s3c2410_nand_ready(struct nand_device_s *nand, int timeout)
+static int s3c2410_nand_ready(struct nand_device *nand, int timeout)
 {
-	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;
 	uint8_t status;
 
 	if (target->state != TARGET_HALTED) {
@@ -113,7 +107,7 @@ static int s3c2410_nand_ready(struct nand_device_s *nand, int timeout)
 	return 0;
 }
 
-nand_flash_controller_t s3c2410_nand_controller = {
+struct nand_flash_controller s3c2410_nand_controller = {
 		.name = "s3c2410",
 		.nand_device_command = &s3c2410_nand_device_command,
 		.register_commands = &s3c24xx_register_commands,