nand_device_t -> struct nand_device

[openocd.git] / src / flash / s3c24xx_nand.h

diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h
index fef34e481f6c12b9a1e425c118b22d13a3ebf59d..41c95f52512a802079e37f6699e15855acdb2e97 100644 (file)
--- a/src/flash/s3c24xx_nand.h
+++ b/src/flash/s3c24xx_nand.h
@@ -18,6 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#ifndef S3C24xx_NAND_H
+#define S3C24xx_NAND_H
+
 /*
  * S3C24XX Series OpenOCD NAND Flash controller support.
  *
@@ -27,37 +30,57 @@
 #include "nand.h"
 #include "s3c24xx_regs_nand.h"
 
-typedef struct s3c24xx_nand_controller_s
+struct s3c24xx_nand_controller
 {
-       struct target_s *target;
+       struct target *target;
 
        /* register addresses */
        uint32_t                 cmd;
        uint32_t                 addr;
        uint32_t                 data;
        uint32_t                 nfstat;
-} s3c24xx_nand_controller_t;
+};
 
 /* Default to using the un-translated NAND register based address */
 #undef S3C2410_NFREG
 #define S3C2410_NFREG(x) ((x) + 0x4e000000)
 
-extern 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 *nand, \
+                               struct s3c24xx_nand_controller **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);
 
-extern int s3c24xx_register_commands(struct command_context_s *cmd_ctx);
-extern int s3c24xx_reset(struct nand_device_s *device);
-extern int s3c24xx_command(struct nand_device_s *device, uint8_t command);
-extern int s3c24xx_address(struct nand_device_s *device, uint8_t address);
-extern int s3c24xx_write_data(struct nand_device_s *device, uint16_t data);
-extern int s3c24xx_read_data(struct nand_device_s *device, void *data);
-extern int s3c24xx_controller_ready(struct nand_device_s *device, int tout);
+int s3c24xx_reset(struct nand_device *nand);
+
+int s3c24xx_command(struct nand_device *nand, uint8_t command);
+int s3c24xx_address(struct nand_device *nand, uint8_t address);
+
+int s3c24xx_write_data(struct nand_device *nand, uint16_t data);
+int s3c24xx_read_data(struct nand_device *nand, void *data);
+
+int s3c24xx_controller_ready(struct nand_device *nand, int tout);
 
 #define s3c24xx_write_page NULL
 #define s3c24xx_read_page NULL
 
 /* code shared between different controllers */
 
-extern int s3c2440_nand_ready(struct nand_device_s *device, int timeout);
+int s3c2440_nand_ready(struct nand_device *nand, int timeout);
+
+int s3c2440_read_block_data(struct nand_device *nand,
+               uint8_t *data, int data_size);
+int s3c2440_write_block_data(struct nand_device *nand,
+               uint8_t *data, int data_size);
 
-extern int s3c2440_read_block_data(struct nand_device_s *, uint8_t *data, int data_size);
-extern int s3c2440_write_block_data(struct nand_device_s *, uint8_t *data, int data_size);
+#endif // S3C24xx_NAND_H