From 81fbc637185fb0007dbe84c866794800851295b5 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Mon, 9 Nov 2009 03:10:11 -0800 Subject: src/flash: remove 'extern' and wrap headers Removes 'extern' keywords from function prototypes in the flash headers. Wraps long lines to fit into 80 columns. Adds multiple inclusion protection for s3c2xx_nand.h. --- src/flash/s3c24xx_nand.h | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) (limited to 'src/flash/s3c24xx_nand.h') diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h index fef34e48..0213df30 100644 --- 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. * @@ -42,22 +45,32 @@ typedef struct s3c24xx_nand_controller_s #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); +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); + +int s3c24xx_register_commands(struct command_context_s *cmd_ctx); + +int s3c24xx_reset(struct nand_device_s *device); -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_command(struct nand_device_s *device, uint8_t command); +int s3c24xx_address(struct nand_device_s *device, uint8_t address); + +int s3c24xx_write_data(struct nand_device_s *device, uint16_t data); +int s3c24xx_read_data(struct nand_device_s *device, void *data); + +int s3c24xx_controller_ready(struct nand_device_s *device, 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_s *device, int timeout); + +int s3c2440_read_block_data(struct nand_device_s *device, + uint8_t *data, int data_size); +int s3c2440_write_block_data(struct nand_device_s *device, + 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 -- cgit v1.2.3