Commit 76868e07 authored by Zachary T Welch's avatar Zachary T Welch
Browse files

s3c24xx: use COMMAND_HANDLER with command helper

Add S3C24XX_DEVICE_COMMAND macros to abstract common command handler
conventions.
parent d02fee19
...@@ -35,11 +35,7 @@ static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char * ...@@ -35,11 +35,7 @@ static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *
struct nand_device_s *nand) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
CALL_S3C24XX_DEVICE_COMMAND(nand, &info);
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID;
}
/* fill in the address fields for the core device */ /* fill in the address fields for the core device */
info->cmd = S3C2410_NFCMD; info->cmd = S3C2410_NFCMD;
......
...@@ -35,11 +35,7 @@ static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char * ...@@ -35,11 +35,7 @@ static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *
struct nand_device_s *nand) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
CALL_S3C24XX_DEVICE_COMMAND(nand, &info);
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID;
}
/* fill in the address fields for the core device */ /* fill in the address fields for the core device */
info->cmd = S3C2440_NFCMD; info->cmd = S3C2440_NFCMD;
......
...@@ -36,11 +36,7 @@ static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char * ...@@ -36,11 +36,7 @@ static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *
struct nand_device_s *nand) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
CALL_S3C24XX_DEVICE_COMMAND(nand, &info);
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID;
}
/* fill in the address fields for the core device */ /* fill in the address fields for the core device */
info->cmd = S3C2440_NFCMD; info->cmd = S3C2440_NFCMD;
......
...@@ -36,11 +36,7 @@ static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char * ...@@ -36,11 +36,7 @@ static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *
struct nand_device_s *nand) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
CALL_S3C24XX_DEVICE_COMMAND(nand, &info);
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID;
}
/* fill in the address fields for the core device */ /* fill in the address fields for the core device */
info->cmd = S3C2440_NFCMD; info->cmd = S3C2440_NFCMD;
......
...@@ -31,17 +31,14 @@ ...@@ -31,17 +31,14 @@
#include "s3c24xx_nand.h" #include "s3c24xx_nand.h"
s3c24xx_nand_controller_t * S3C24XX_DEVICE_COMMAND()
s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc,
struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info; s3c24xx_nand_controller_t *s3c24xx_info;
s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t)); s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t));
if (s3c24xx_info == NULL) { if (s3c24xx_info == NULL) {
LOG_ERROR("no memory for nand controller\n"); LOG_ERROR("no memory for nand controller\n");
return NULL; return -ENOMEM;
} }
nand->controller_priv = s3c24xx_info; nand->controller_priv = s3c24xx_info;
...@@ -49,10 +46,10 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, ...@@ -49,10 +46,10 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
s3c24xx_info->target = get_target(args[1]); s3c24xx_info->target = get_target(args[1]);
if (s3c24xx_info->target == NULL) { if (s3c24xx_info->target == NULL) {
LOG_ERROR("target '%s' not defined", args[1]); 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) int s3c24xx_register_commands(struct command_context_s *cmd_ctx)
......
...@@ -45,9 +45,19 @@ typedef struct s3c24xx_nand_controller_s ...@@ -45,9 +45,19 @@ typedef struct s3c24xx_nand_controller_s
#undef S3C2410_NFREG #undef S3C2410_NFREG
#define S3C2410_NFREG(x) ((x) + 0x4e000000) #define S3C2410_NFREG(x) ((x) + 0x4e000000)
s3c24xx_nand_controller_t *s3c24xx_nand_device_command( #define S3C24XX_DEVICE_COMMAND() \
struct command_context_s *cmd_ctx, char *cmd, COMMAND_HELPER(s3c24xx_nand_device_command, \
char **args, int argc, struct nand_device_s *nand); 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); int s3c24xx_register_commands(struct command_context_s *cmd_ctx);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment