X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Fs3c24xx_nand.c;h=17de5d414be4bc348f4e1d3befc98cd6aa0e5a1e;hb=6aa82891b60dc4a332ac548c13fc8d207bf171b0;hp=59d4d5bba2a1efb8006785836c8cd1003fdae52e;hpb=e8e94ab2454566fb9a226693e5c1de2264634a48;p=fw%2Fopenocd

diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c
index 59d4d5bba..17de5d414 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;
+	struct s3c24xx_nand_controller *s3c24xx_info;
 
-	s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t));
+	s3c24xx_info = malloc(sizeof(struct s3c24xx_nand_controller));
 	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)
@@ -62,7 +59,7 @@ int s3c24xx_register_commands(struct command_context_s *cmd_ctx)
 
 int s3c24xx_reset(struct nand_device_s *nand)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
+	struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
 	target_t *target = s3c24xx_info->target;
 
 	if (target->state != TARGET_HALTED) {
@@ -77,7 +74,7 @@ int s3c24xx_reset(struct nand_device_s *nand)
 
 int s3c24xx_command(struct nand_device_s *nand, uint8_t command)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
+	struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
 	target_t *target = s3c24xx_info->target;
 
 	if (target->state != TARGET_HALTED) {
@@ -92,7 +89,7 @@ int s3c24xx_command(struct nand_device_s *nand, uint8_t command)
 
 int s3c24xx_address(struct nand_device_s *nand, uint8_t address)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
+	struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
 	target_t *target = s3c24xx_info->target;
 
 	if (target->state != TARGET_HALTED) {
@@ -106,7 +103,7 @@ int s3c24xx_address(struct nand_device_s *nand, uint8_t address)
 
 int s3c24xx_write_data(struct nand_device_s *nand, uint16_t data)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
+	struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
 	target_t *target = s3c24xx_info->target;
 
 	if (target->state != TARGET_HALTED) {
@@ -120,7 +117,7 @@ int s3c24xx_write_data(struct nand_device_s *nand, uint16_t data)
 
 int s3c24xx_read_data(struct nand_device_s *nand, void *data)
 {
-	s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
+	struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
 	target_t *target = s3c24xx_info->target;
 
 	if (target->state != TARGET_HALTED) {