From 76868e071306bc83d25b89e57b785fef4637c4c8 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Tue, 10 Nov 2009 05:32:51 -0800 Subject: [PATCH] s3c24xx: use COMMAND_HANDLER with command helper Add S3C24XX_DEVICE_COMMAND macros to abstract common command handler conventions. --- src/flash/s3c2410_nand.c | 6 +----- src/flash/s3c2412_nand.c | 6 +----- src/flash/s3c2440_nand.c | 6 +----- src/flash/s3c2443_nand.c | 6 +----- src/flash/s3c24xx_nand.c | 11 ++++------- src/flash/s3c24xx_nand.h | 16 +++++++++++++--- src/target/avrt.o.RcaTm5 | 0 7 files changed, 21 insertions(+), 30 deletions(-) create mode 100644 src/target/avrt.o.RcaTm5 diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c index e663507ec7..176a1a416a 100644 --- a/src/flash/s3c2410_nand.c +++ b/src/flash/s3c2410_nand.c @@ -35,11 +35,7 @@ static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char * struct nand_device_s *nand) { s3c24xx_nand_controller_t *info; - - info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand); - if (info == NULL) { - return ERROR_NAND_DEVICE_INVALID; - } + CALL_S3C24XX_DEVICE_COMMAND(nand, &info); /* fill in the address fields for the core device */ info->cmd = S3C2410_NFCMD; diff --git a/src/flash/s3c2412_nand.c b/src/flash/s3c2412_nand.c index 5c9d319976..7b65f84da5 100644 --- a/src/flash/s3c2412_nand.c +++ b/src/flash/s3c2412_nand.c @@ -35,11 +35,7 @@ static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char * struct nand_device_s *nand) { s3c24xx_nand_controller_t *info; - - info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand); - if (info == NULL) { - return ERROR_NAND_DEVICE_INVALID; - } + CALL_S3C24XX_DEVICE_COMMAND(nand, &info); /* fill in the address fields for the core device */ info->cmd = S3C2440_NFCMD; diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c index fd1fbd0acd..c6d658d45e 100644 --- a/src/flash/s3c2440_nand.c +++ b/src/flash/s3c2440_nand.c @@ -36,11 +36,7 @@ static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char * struct nand_device_s *nand) { s3c24xx_nand_controller_t *info; - - info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand); - if (info == NULL) { - return ERROR_NAND_DEVICE_INVALID; - } + CALL_S3C24XX_DEVICE_COMMAND(nand, &info); /* fill in the address fields for the core device */ info->cmd = S3C2440_NFCMD; diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c index 82d9b8eae7..6e92021dfd 100644 --- a/src/flash/s3c2443_nand.c +++ b/src/flash/s3c2443_nand.c @@ -36,11 +36,7 @@ static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char * struct nand_device_s *nand) { s3c24xx_nand_controller_t *info; - - info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand); - if (info == NULL) { - return ERROR_NAND_DEVICE_INVALID; - } + CALL_S3C24XX_DEVICE_COMMAND(nand, &info); /* fill in the address fields for the core device */ info->cmd = S3C2440_NFCMD; diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c index 59d4d5bba2..e2bc005320 100644 --- a/src/flash/s3c24xx_nand.c +++ b/src/flash/s3c24xx_nand.c @@ -31,17 +31,14 @@ #include "s3c24xx_nand.h" -s3c24xx_nand_controller_t * -s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc, - struct nand_device_s *nand) +S3C24XX_DEVICE_COMMAND() { s3c24xx_nand_controller_t *s3c24xx_info; s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t)); if (s3c24xx_info == NULL) { LOG_ERROR("no memory for nand controller\n"); - return NULL; + return -ENOMEM; } nand->controller_priv = s3c24xx_info; @@ -49,10 +46,10 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, s3c24xx_info->target = get_target(args[1]); if (s3c24xx_info->target == NULL) { LOG_ERROR("target '%s' not defined", args[1]); - return NULL; + return ERROR_COMMAND_SYNTAX_ERROR; } - return s3c24xx_info; + return ERROR_OK; } int s3c24xx_register_commands(struct command_context_s *cmd_ctx) diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h index ed142954f2..3f304a98ea 100644 --- a/src/flash/s3c24xx_nand.h +++ b/src/flash/s3c24xx_nand.h @@ -45,9 +45,19 @@ typedef struct s3c24xx_nand_controller_s #undef S3C2410_NFREG #define S3C2410_NFREG(x) ((x) + 0x4e000000) -s3c24xx_nand_controller_t *s3c24xx_nand_device_command( - struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc, struct nand_device_s *nand); +#define S3C24XX_DEVICE_COMMAND() \ + COMMAND_HELPER(s3c24xx_nand_device_command, \ + struct nand_device_s *nand, \ + s3c24xx_nand_controller_t **info) + +S3C24XX_DEVICE_COMMAND(); + +#define CALL_S3C24XX_DEVICE_COMMAND(d, i) \ + do { \ + int retval = CALL_COMMAND_HANDLER(s3c24xx_nand_device_command, d, i); \ + if (ERROR_OK != retval) \ + return retval; \ + } while (0) int s3c24xx_register_commands(struct command_context_s *cmd_ctx); diff --git a/src/target/avrt.o.RcaTm5 b/src/target/avrt.o.RcaTm5 new file mode 100644 index 0000000000..e69de29bb2 -- 2.30.2