s3c24xx: use COMMAND_HANDLER with command helper

Add S3C24XX_DEVICE_COMMAND macros to abstract common command handler
conventions.

diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c
index e663507ec7969afdfde95a06e58811c8bf21ea40..176a1a416a7be7833b6cf4801df557848221ee03 100644 (file)
--- 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 5c9d319976e8b0da9c172c12699d4d8abc62c206..7b65f84da5409586394017eb12e15d9ccecde1a0 100644 (file)
--- 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 fd1fbd0acdff5999c168e82c87b94bf1ea36b498..c6d658d45eeae903193e0c0b44f6c9b7c4238bb0 100644 (file)
--- 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 82d9b8eae7bb743b05f2dc0175eaed22aca6ac5e..6e92021dfd0ea6f6afb267b5f897a8943cc304f2 100644 (file)
--- 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 59d4d5bba2a1efb8006785836c8cd1003fdae52e..e2bc00532071e900c37b5a6abf4e77dc4ff2c9ca 100644 (file)
--- 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 ed142954f2b371b3f201160478f968cda1a9d949..3f304a98ea807cba4fc472324e6b83ce79cb559f 100644 (file)
--- 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 (file)
index 0000000..e69de29