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. Signed-off-by: Zachary T Welch <z...@superlucidity.net> --- src/flash/flash.h | 34 +++++++++++++++++++--------------- src/flash/mflash.h | 4 ++-- src/flash/nand.h | 27 +++++++++++++++++---------- src/flash/non_cfi.h | 2 +- src/flash/ocl/at91sam7x/dcc.h | 4 ++-- src/flash/ocl/at91sam7x/samflash.h | 8 ++++---- src/flash/s3c24xx_nand.h | 35 ++++++++++++++++++++++++----------- 7 files changed, 69 insertions(+), 45 deletions(-)
diff --git a/src/flash/flash.h b/src/flash/flash.h index 05c4b2c..fd3c4c2 100644 --- a/src/flash/flash.h +++ b/src/flash/flash.h @@ -127,7 +127,8 @@ typedef struct flash_driver_s * * @returns ERROR_OK if successful; otherwise, an error code. */ - int (*flash_bank_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); + int (*flash_bank_command)(struct command_context_s *cmd_ctx, + char *cmd, char **args, int argc, struct flash_bank_s *bank); /** * Bank/sector erase routine (target-specific). When @@ -166,7 +167,8 @@ typedef struct flash_driver_s * @param count The number of bytes to write. * @returns ERROR_OK if successful; otherwise, an error code. */ - int (*write)(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count); + int (*write)(struct flash_bank_s *bank, + uint8_t *buffer, uint32_t offset, uint32_t count); /** * Probe to determine what kind of flash is present. @@ -265,15 +267,16 @@ typedef struct flash_bank_s } flash_bank_t; /// Registers the 'flash' subsystem commands -extern int flash_register_commands(struct command_context_s *cmd_ctx); +int flash_register_commands(struct command_context_s *cmd_ctx); /// Initializes the 'flash' subsystem drivers -extern int flash_init_drivers(struct command_context_s *cmd_ctx); +int flash_init_drivers(struct command_context_s *cmd_ctx); /** * Erases @a length bytes in the @a target flash, starting at @a addr. * @returns ERROR_OK if successful; otherwise, an error code. */ -extern int flash_erase_address_range(struct target_s *target, uint32_t addr, uint32_t length); +int flash_erase_address_range(struct target_s *target, + uint32_t addr, uint32_t length); /** * Writes @a image into the @a target flash. The @a written parameter * will contain the @@ -284,35 +287,36 @@ extern int flash_erase_address_range(struct target_s *target, uint32_t addr, uin * erase the corresponding banks or sectors before programming. * @returns ERROR_OK if successful; otherwise, an error code. */ -extern int flash_write(struct target_s *target, struct image_s *image, uint32_t *written, int erase); +int flash_write(struct target_s *target, + struct image_s *image, uint32_t *written, int erase); /** * Forces targets to re-examine their erase/protection state. * This routine must be called when the system may modify the status. */ -extern void flash_set_dirty(void); +void flash_set_dirty(void); /// @returns The number of flash banks currently defined. -extern int flash_get_bank_count(void); +int flash_get_bank_count(void); /** * Provides default erased-bank check handling. Checks to see if * the flash driver knows they are erased; if things look uncertain, * this routine will call default_flash_mem_blank_check() to confirm. * @returns ERROR_OK if successful; otherwise, an error code. */ -extern int default_flash_blank_check(struct flash_bank_s *bank); +int default_flash_blank_check(struct flash_bank_s *bank); /** * Provides a default blank flash memory check. Ensures the contents * of the given bank have truly been erased. * @param bank The flash bank. * @returns ERROR_OK if successful; otherwise, an error code. */ -extern int default_flash_mem_blank_check(struct flash_bank_s *bank); +int default_flash_mem_blank_check(struct flash_bank_s *bank); /** * Returns a flash bank by the specified flash_bank_s bank_number, @a num. * @param num The flash bank number. * @returns A flash_bank_t for flash bank @a num, or NULL */ -extern flash_bank_t *get_flash_bank_by_num(int num); +flash_bank_t *get_flash_bank_by_num(int num); /** * Retreives @a bank from a command argument, reporting errors parsing * the bank identifier or retreiving the specified bank. @@ -321,21 +325,21 @@ extern flash_bank_t *get_flash_bank_by_num(int num); * @param bank On output, contians a pointer to the bank or NULL. * @returns ERROR_OK on success, or an error indicating the problem. */ -int flash_command_get_bank_by_num( - struct command_context_s *cmd_ctx, char *str, flash_bank_t **bank); +int flash_command_get_bank_by_num(struct command_context_s *cmd_ctx, + char *str, flash_bank_t **bank); /** * Returns the flash bank like get_flash_bank_by_num(), without probing. * @param num The flash bank number. * @returns A flash_bank_t for flash bank @a num, or NULL. */ -extern flash_bank_t *get_flash_bank_by_num_noprobe(int num); +flash_bank_t *get_flash_bank_by_num_noprobe(int num); /** * Returns the flash bank located at a specified address. * @param target The target, presumed to contain one or more banks. * @param addr An address that is within the range of the bank. * @returns The flash_bank_t located at @a addr, or NULL. */ -extern flash_bank_t *get_flash_bank_by_addr(struct target_s *target, uint32_t addr); +flash_bank_t *get_flash_bank_by_addr(struct target_s *target, uint32_t addr); #define ERROR_FLASH_BANK_INVALID (-900) #define ERROR_FLASH_SECTOR_INVALID (-901) diff --git a/src/flash/mflash.h b/src/flash/mflash.h index bfaf743..1b54307 100644 --- a/src/flash/mflash.h +++ b/src/flash/mflash.h @@ -141,8 +141,8 @@ typedef struct mflash_bank_s mg_drv_info_t *drv_info; } mflash_bank_t; -extern int mflash_register_commands(struct command_context_s *cmd_ctx); -extern int mflash_init_drivers(struct command_context_s *cmd_ctx); +int mflash_register_commands(struct command_context_s *cmd_ctx); +int mflash_init_drivers(struct command_context_s *cmd_ctx); #define MG_MFLASH_SECTOR_SIZE (0x200) /* 512Bytes = 2^9 */ #define MG_MFLASH_SECTOR_SIZE_MASK (0x200-1) diff --git a/src/flash/nand.h b/src/flash/nand.h index d867494..16558c2 100644 --- a/src/flash/nand.h +++ b/src/flash/nand.h @@ -206,16 +206,23 @@ enum oob_formats NAND_OOB_YAFFS2 = 0x100,/* when writing, use YAFFS2 OOB layout */ }; -/* Function prototypes */ -extern nand_device_t *get_nand_device_by_num(int num); -extern int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); -extern int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); -extern int nand_read_status(struct nand_device_s *device, uint8_t *status); -extern int nand_calculate_ecc(struct nand_device_s *device, const uint8_t *dat, uint8_t *ecc_code); -extern int nand_calculate_ecc_kw(struct nand_device_s *device, const uint8_t *dat, uint8_t *ecc_code); - -extern int nand_register_commands(struct command_context_s *cmd_ctx); -extern int nand_init(struct command_context_s *cmd_ctx); + +nand_device_t *get_nand_device_by_num(int num); + +int nand_read_page_raw(struct nand_device_s *device, uint32_t page, + uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); +int nand_write_page_raw(struct nand_device_s *device, uint32_t page, + uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); + +int nand_read_status(struct nand_device_s *device, uint8_t *status); + +int nand_calculate_ecc(struct nand_device_s *device, + const uint8_t *dat, uint8_t *ecc_code); +int nand_calculate_ecc_kw(struct nand_device_s *device, + const uint8_t *dat, uint8_t *ecc_code); + +int nand_register_commands(struct command_context_s *cmd_ctx); +int nand_init(struct command_context_s *cmd_ctx); /// helper for parsing a nand device command argument string int nand_command_get_device_by_num(struct command_context_s *cmd_ctx, diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h index 48cee92..14a6df7 100644 --- a/src/flash/non_cfi.h +++ b/src/flash/non_cfi.h @@ -35,6 +35,6 @@ typedef struct non_cfi_s uint8_t status_poll_mask; } non_cfi_t; -extern void cfi_fixup_non_cfi(flash_bank_t *bank); +void cfi_fixup_non_cfi(flash_bank_t *bank); #endif /* NON_CFI_H */ diff --git a/src/flash/ocl/at91sam7x/dcc.h b/src/flash/ocl/at91sam7x/dcc.h index f41b1d2..f7d6d22 100644 --- a/src/flash/ocl/at91sam7x/dcc.h +++ b/src/flash/ocl/at91sam7x/dcc.h @@ -23,9 +23,9 @@ #include "platform.h" /* debug channel read (debugger->MCU) */ -extern uint32 dcc_rd(void); +uint32 dcc_rd(void); /* debug channel write (MCU->debugger) */ -extern int dcc_wr(uint32 data); +int dcc_wr(uint32 data); #endif diff --git a/src/flash/ocl/at91sam7x/samflash.h b/src/flash/ocl/at91sam7x/samflash.h index 136e314..f544942 100644 --- a/src/flash/ocl/at91sam7x/samflash.h +++ b/src/flash/ocl/at91sam7x/samflash.h @@ -34,15 +34,15 @@ extern unsigned int flash_page_count; extern unsigned int flash_page_size; /* words */ /* detect chip and set loader parameters */ -extern int flash_init(void); +int flash_init(void); /* program single flash page */ -extern int flash_page_program(uint32 *data, int page_num); +int flash_page_program(uint32 *data, int page_num); /* erase whole chip */ -extern int flash_erase_all(void); +int flash_erase_all(void); /* verify written data */ -extern int flash_verify(uint32 adr, unsigned int len, uint8 *src); +int flash_verify(uint32 adr, unsigned int len, uint8 *src); #endif diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h index fef34e4..0213df3 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
_______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
