Add S3C24XX_DEVICE_COMMAND macros to abstract common command handler
conventions.
Signed-off-by: Zachary T Welch <z...@superlucidity.net>
---
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 +++++++++++++---
6 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c
index 4ec4f23..2d47fee 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 *device)
{
s3c24xx_nand_controller_t *info;
-
- info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
- if (info == NULL) {
- return ERROR_NAND_DEVICE_INVALID;
- }
+ CALL_S3C24XX_DEVICE_COMMAND(device, &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 a995acc..feae673 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 *device)
{
s3c24xx_nand_controller_t *info;
-
- info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
- if (info == NULL) {
- return ERROR_NAND_DEVICE_INVALID;
- }
+ CALL_S3C24XX_DEVICE_COMMAND(device, &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 2321382..d220456 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 *device)
{
s3c24xx_nand_controller_t *info;
-
- info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
- if (info == NULL) {
- return ERROR_NAND_DEVICE_INVALID;
- }
+ CALL_S3C24XX_DEVICE_COMMAND(device, &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 c6effdf..1a25242 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 *device)
{
s3c24xx_nand_controller_t *info;
-
- info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
- if (info == NULL) {
- return ERROR_NAND_DEVICE_INVALID;
- }
+ CALL_S3C24XX_DEVICE_COMMAND(device, &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 478d268..a52e8ed 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 *device)
+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;
}
device->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 0213df3..542bb18 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 *device);
+#define S3C24XX_DEVICE_COMMAND() \
+ COMMAND_HELPER(s3c24xx_nand_device_command, \
+ struct nand_device_s *device, \
+ 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);
--
1.6.4.4
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
