From 310be8a838c9db6b67bc4d6d7d3c7ff41b32af4c Mon Sep 17 00:00:00 2001 From: zwelch Date: Thu, 18 Jun 2009 07:06:25 +0000 Subject: [PATCH] Transform 'u8' to 'uint8_t' in src/flash - Replace '\([^_]\)u8' with '\1uint8_t'. - Replace '^u8' with 'uint8_t'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2275 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/aduc702x.c | 18 ++--- src/flash/at91sam7.c | 22 +++--- src/flash/at91sam7.h | 8 +-- src/flash/avrf.c | 16 ++--- src/flash/cfi.c | 102 ++++++++++++++-------------- src/flash/cfi.h | 90 ++++++++++++------------ src/flash/davinci_nand.c | 52 +++++++------- src/flash/ecos.c | 8 +-- src/flash/flash.c | 12 ++-- src/flash/flash.h | 2 +- src/flash/lpc2000.c | 8 +-- src/flash/lpc288x.c | 6 +- src/flash/lpc3180_nand_controller.c | 34 +++++----- src/flash/mflash.c | 64 ++++++++--------- src/flash/mflash.h | 2 +- src/flash/nand.c | 48 ++++++------- src/flash/nand.h | 22 +++--- src/flash/nand_ecc.c | 10 +-- src/flash/nand_ecc_kw.c | 2 +- src/flash/non_cfi.h | 4 +- src/flash/ocl.c | 4 +- src/flash/orion_nand.c | 12 ++-- src/flash/pic32mx.c | 10 +-- src/flash/s3c2410_nand.c | 2 +- src/flash/s3c2440_nand.c | 6 +- src/flash/s3c24xx_nand.c | 4 +- src/flash/s3c24xx_nand.h | 8 +-- src/flash/stellaris.c | 12 ++-- src/flash/stellaris.h | 2 +- src/flash/stm32x.c | 20 +++--- src/flash/str7x.c | 10 +-- src/flash/str9x.c | 18 ++--- src/flash/str9xpec.c | 52 +++++++------- src/flash/str9xpec.h | 2 +- src/flash/tms470.c | 6 +- 35 files changed, 349 insertions(+), 349 deletions(-) diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c index 6268b1cde8..c9b38e5eaa 100644 --- a/src/flash/aduc702x.c +++ b/src/flash/aduc702x.c @@ -33,9 +33,9 @@ static int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char * static int aduc702x_register_commands(struct command_context_s *cmd_ctx); static int aduc702x_erase(struct flash_bank_s *bank, int first, int last); static int aduc702x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int aduc702x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); -static int aduc702x_write_single(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); -static int aduc702x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int aduc702x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); +static int aduc702x_write_single(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); +static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int aduc702x_probe(struct flash_bank_s *bank); static int aduc702x_info(struct flash_bank_s *bank, char *buf, int buf_size); static int aduc702x_protect_check(struct flash_bank_s *bank); @@ -193,7 +193,7 @@ static int aduc702x_protect(struct flash_bank_s *bank, int set, int first, int l return ERROR_FLASH_OPERATION_FAILED; } -static int aduc702x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { aduc702x_flash_bank_t *aduc702x_info = bank->driver_priv; target_t *target = bank->target; @@ -250,7 +250,7 @@ static int aduc702x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offse }; target_write_buffer(target, aduc702x_info->write_algorithm->address, - sizeof(aduc702x_flash_write_code), (u8*)aduc702x_flash_write_code); + sizeof(aduc702x_flash_write_code), (uint8_t*)aduc702x_flash_write_code); /* memory buffer */ while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) @@ -322,10 +322,10 @@ static int aduc702x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offse /* All-JTAG, single-access method. Very slow. Used only if there is no * working area available. */ -static int aduc702x_write_single(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int aduc702x_write_single(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { u32 x; - u8 b; + uint8_t b; target_t *target = bank->target; aduc702x_set_write_enable(target, 1); @@ -363,7 +363,7 @@ static int aduc702x_write_single(struct flash_bank_s *bank, u8 *buffer, u32 offs return ERROR_OK; } -int aduc702x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +int aduc702x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { int retval; @@ -420,7 +420,7 @@ static int aduc702x_set_write_enable(target_t *target, int enable) * so in some cases may slow things down without a usleep after the first read */ static int aduc702x_check_flash_completion(target_t* target, unsigned int timeout_ms) { - u8 v = 4; + uint8_t v = 4; long long endtime = timeval_ms() + timeout_ms; while (1) { diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c index 82e98ef4c7..369a3d21d8 100644 --- a/src/flash/at91sam7.c +++ b/src/flash/at91sam7.c @@ -47,7 +47,7 @@ static int at91sam7_register_commands(struct command_context_s *cmd_ctx); static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int at91sam7_erase(struct flash_bank_s *bank, int first, int last); static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last); -static int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int at91sam7_probe(struct flash_bank_s *bank); //static int at91sam7_auto_probe(struct flash_bank_s *bank); static int at91sam7_erase_check(struct flash_bank_s *bank); @@ -57,7 +57,7 @@ static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size); static u32 at91sam7_get_flash_status(target_t *target, int bank_number); static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode); static u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout); -static int at91sam7_flash_command(struct flash_bank_s *bank, u8 cmd, u16 pagen); +static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, u16 pagen); static int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); flash_driver_t at91sam7_flash = @@ -274,7 +274,7 @@ static u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeo } /* Send one command to the AT91SAM flash controller */ -static int at91sam7_flash_command(struct flash_bank_s *bank, u8 cmd, u16 pagen) +static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, u16 pagen) { u32 fcr; at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv; @@ -312,7 +312,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank) u16 bnk, sec; u16 arch; u32 cidr; - u8 banks_num = 0; + uint8_t banks_num = 0; u16 num_nvmbits = 0; u16 sectors_num = 0; u16 pages_per_sector = 0; @@ -624,7 +624,7 @@ static int at91sam7_erase_check(struct flash_bank_s *bank) u16 retval; u32 blank; u16 fast_check; - u8 *buffer; + uint8_t *buffer; u16 nSector; u16 nByte; @@ -686,7 +686,7 @@ static int at91sam7_erase_check(struct flash_bank_s *bank) static int at91sam7_protect_check(struct flash_bank_s *bank) { - u8 lock_pos, gpnvm_pos; + uint8_t lock_pos, gpnvm_pos; u32 status; at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv; @@ -861,8 +861,8 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last) at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv; int sec; u32 nbytes, pos; - u8 *buffer; - u8 erase_all; + uint8_t *buffer; + uint8_t erase_all; if (at91sam7_info->cidr == 0) { @@ -901,7 +901,7 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last) { /* allocate and clean buffer */ nbytes = (last - first + 1) * bank->sectors[first].size; - buffer = malloc(nbytes * sizeof(u8)); + buffer = malloc(nbytes * sizeof(uint8_t)); for (pos=0; posdriver_priv; @@ -1127,7 +1127,7 @@ static int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char { flash_bank_t *bank; int bit; - u8 flashcmd; + uint8_t flashcmd; u32 status; at91sam7_flash_bank_t *at91sam7_info; int retval; diff --git a/src/flash/at91sam7.h b/src/flash/at91sam7.h index 5e652bf06d..aba10ce2ef 100644 --- a/src/flash/at91sam7.h +++ b/src/flash/at91sam7.h @@ -40,7 +40,7 @@ typedef struct at91sam7_flash_bank_s char *target_name; /* flash auto-detection */ - u8 flash_autodetection; + uint8_t flash_autodetection; /* flash geometry */ u16 pages_per_sector; @@ -53,15 +53,15 @@ typedef struct at91sam7_flash_bank_s u16 num_nvmbits; u16 num_nvmbits_on; u16 nvmbits; - u8 securitybit; + uint8_t securitybit; /* 0: not init * 1: fmcn for nvbits (1uS) * 2: fmcn for flash (1.5uS) */ - u8 flashmode; + uint8_t flashmode; /* main clock status */ - u8 mck_valid; + uint8_t mck_valid; u32 mck_freq; /* external clock frequency */ diff --git a/src/flash/avrf.c b/src/flash/avrf.c index 301ce2658c..fa0df1f17e 100644 --- a/src/flash/avrf.c +++ b/src/flash/avrf.c @@ -60,7 +60,7 @@ static int avrf_register_commands(struct command_context_s *cmd_ctx); static int avrf_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int avrf_erase(struct flash_bank_s *bank, int first, int last); static int avrf_protect(struct flash_bank_s *bank, int set, int first, int last); -static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int avrf_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int avrf_probe(struct flash_bank_s *bank); static int avrf_auto_probe(struct flash_bank_s *bank); //static int avrf_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -69,13 +69,13 @@ static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size); static int avrf_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -extern int avr_jtag_sendinstr(jtag_tap_t *tap, u8 *ir_in, u8 ir_out); +extern int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out); extern int avr_jtag_senddat(jtag_tap_t *tap, u32 *dr_in, u32 dr_out, int len); -extern int mcu_write_ir(jtag_tap_t *tap, u8 *ir_in, u8 *ir_out, int ir_len, int rti); -extern int mcu_write_dr(jtag_tap_t *tap, u8 *ir_in, u8 *ir_out, int dr_len, int rti); -extern int mcu_write_ir_u8(jtag_tap_t *tap, u8 *ir_in, u8 ir_out, int ir_len, int rti); -extern int mcu_write_dr_u8(jtag_tap_t *tap, u8 *ir_in, u8 ir_out, int dr_len, int rti); +extern int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti); +extern int mcu_write_dr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int dr_len, int rti); +extern int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti); +extern int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti); extern int mcu_write_ir_u16(jtag_tap_t *tap, u16 *ir_in, u16 ir_out, int ir_len, int rti); extern int mcu_write_dr_u16(jtag_tap_t *tap, u16 *ir_in, u16 ir_out, int dr_len, int rti); extern int mcu_write_ir_u32(jtag_tap_t *tap, u32 *ir_in, u32 ir_out, int ir_len, int rti); @@ -161,7 +161,7 @@ static int avr_jtagprg_chiperase(avr_common_t *avr) return ERROR_OK; } -static int avr_jtagprg_writeflashpage(avr_common_t *avr, u8 *page_buf, u32 buf_size, u32 addr, u32 page_size) +static int avr_jtagprg_writeflashpage(avr_common_t *avr, uint8_t *page_buf, u32 buf_size, u32 addr, u32 page_size) { u32 i, poll_value; @@ -249,7 +249,7 @@ static int avrf_protect(struct flash_bank_s *bank, int set, int first, int last) return ERROR_OK; } -static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int avrf_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { target_t *target = bank->target; avr_common_t *avr = target->arch_info; diff --git a/src/flash/cfi.c b/src/flash/cfi.c index 432c8cc4b2..322b0c7a87 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -33,7 +33,7 @@ static int cfi_register_commands(struct command_context_s *cmd_ctx); static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int cfi_erase(struct flash_bank_s *bank, int first, int last); static int cfi_protect(struct flash_bank_s *bank, int set, int first, int last); -static int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int cfi_probe(struct flash_bank_s *bank); static int cfi_auto_probe(struct flash_bank_s *bank); static int cfi_protect_check(struct flash_bank_s *bank); @@ -131,7 +131,7 @@ static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset) } -static void cfi_command(flash_bank_t *bank, u8 cmd, u8 *cmd_buf) +static void cfi_command(flash_bank_t *bank, uint8_t cmd, uint8_t *cmd_buf) { int i; @@ -161,10 +161,10 @@ static void cfi_command(flash_bank_t *bank, u8 cmd, u8 *cmd_buf) * flash banks are expected to be made of similar chips * the query result should be the same for all */ -static u8 cfi_query_u8(flash_bank_t *bank, int sector, u32 offset) +static uint8_t cfi_query_u8(flash_bank_t *bank, int sector, u32 offset) { target_t *target = bank->target; - u8 data[CFI_MAX_BUS_WIDTH]; + uint8_t data[CFI_MAX_BUS_WIDTH]; target_read_memory(target, flash_address(bank, sector, offset), bank->bus_width, 1, data); @@ -178,10 +178,10 @@ static u8 cfi_query_u8(flash_bank_t *bank, int sector, u32 offset) * in case of a bank made of multiple chips, * the individual values are ORed */ -static u8 cfi_get_u8(flash_bank_t *bank, int sector, u32 offset) +static uint8_t cfi_get_u8(flash_bank_t *bank, int sector, u32 offset) { target_t *target = bank->target; - u8 data[CFI_MAX_BUS_WIDTH]; + uint8_t data[CFI_MAX_BUS_WIDTH]; int i; target_read_memory(target, flash_address(bank, sector, offset), bank->bus_width, 1, data); @@ -195,7 +195,7 @@ static u8 cfi_get_u8(flash_bank_t *bank, int sector, u32 offset) } else { - u8 value = 0; + uint8_t value = 0; for (i = 0; i < bank->bus_width / bank->chip_width; i++) value |= data[bank->bus_width - 1 - i]; @@ -207,11 +207,11 @@ static u16 cfi_query_u16(flash_bank_t *bank, int sector, u32 offset) { target_t *target = bank->target; cfi_flash_bank_t *cfi_info = bank->driver_priv; - u8 data[CFI_MAX_BUS_WIDTH * 2]; + uint8_t data[CFI_MAX_BUS_WIDTH * 2]; if(cfi_info->x16_as_x8) { - u8 i; + uint8_t i; for(i=0;i<2;i++) target_read_memory(target, flash_address(bank, sector, offset+i), bank->bus_width, 1, &data[i*bank->bus_width] ); @@ -229,11 +229,11 @@ static u32 cfi_query_u32(flash_bank_t *bank, int sector, u32 offset) { target_t *target = bank->target; cfi_flash_bank_t *cfi_info = bank->driver_priv; - u8 data[CFI_MAX_BUS_WIDTH * 4]; + uint8_t data[CFI_MAX_BUS_WIDTH * 4]; if(cfi_info->x16_as_x8) { - u8 i; + uint8_t i; for(i=0;i<4;i++) target_read_memory(target, flash_address(bank, sector, offset+i), bank->bus_width, 1, &data[i*bank->bus_width] ); @@ -251,7 +251,7 @@ static u32 cfi_query_u32(flash_bank_t *bank, int sector, u32 offset) static void cfi_intel_clear_status_register(flash_bank_t *bank) { target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; if (target->state != TARGET_HALTED) { @@ -263,9 +263,9 @@ static void cfi_intel_clear_status_register(flash_bank_t *bank) target_write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command); } -u8 cfi_intel_wait_status_busy(flash_bank_t *bank, int timeout) +uint8_t cfi_intel_wait_status_busy(flash_bank_t *bank, int timeout) { - u8 status; + uint8_t status; while ((!((status = cfi_get_u8(bank, 0, 0x0)) & 0x80)) && (timeout-- > 0)) { @@ -306,7 +306,7 @@ u8 cfi_intel_wait_status_busy(flash_bank_t *bank, int timeout) int cfi_spansion_wait_status_busy(flash_bank_t *bank, int timeout) { - u8 status, oldstatus; + uint8_t status, oldstatus; cfi_flash_bank_t *cfi_info = bank->driver_priv; oldstatus = cfi_get_u8(bank, 0, 0x0); @@ -345,7 +345,7 @@ static int cfi_read_intel_pri_ext(flash_bank_t *bank) cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_intel_pri_ext_t *pri_ext = malloc(sizeof(cfi_intel_pri_ext_t)); target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; cfi_info->pri_ext = pri_ext; @@ -408,7 +408,7 @@ static int cfi_read_spansion_pri_ext(flash_bank_t *bank) cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t)); target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; cfi_info->pri_ext = pri_ext; @@ -474,7 +474,7 @@ static int cfi_read_atmel_pri_ext(flash_bank_t *bank) cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t)); target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; /* ATMEL devices use the same CFI primary command set (0x2) as AMD/Spansion, * but a different primary extended query table. @@ -680,7 +680,7 @@ static int cfi_intel_erase(struct flash_bank_s *bank, int first, int last) int retval; cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; int i; cfi_intel_clear_status_register(bank); @@ -725,7 +725,7 @@ static int cfi_spansion_erase(struct flash_bank_s *bank, int first, int last) cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; int i; for (i = first; i <= last; i++) @@ -826,7 +826,7 @@ static int cfi_intel_protect(struct flash_bank_s *bank, int set, int first, int cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; int retry = 0; int i; @@ -875,7 +875,7 @@ static int cfi_intel_protect(struct flash_bank_s *bank, int set, int first, int } else { - u8 block_status; + uint8_t block_status; /* read block lock bit, to verify status */ cfi_command(bank, 0x90, command); if((retval = target_write_memory(target, flash_address(bank, 0, 0x55), bank->bus_width, 1, command)) != ERROR_OK) @@ -970,7 +970,7 @@ static int cfi_protect(struct flash_bank_s *bank, int set, int first, int last) } /* FIXME Replace this by a simple memcpy() - still unsure about sideeffects */ -static void cfi_add_byte(struct flash_bank_s *bank, u8 *word, u8 byte) +static void cfi_add_byte(struct flash_bank_s *bank, uint8_t *word, uint8_t byte) { /* target_t *target = bank->target; */ @@ -1005,7 +1005,7 @@ static void cfi_add_byte(struct flash_bank_s *bank, u8 *word, u8 byte) /* Convert code image to target endian */ /* FIXME create general block conversion fcts in target.c?) */ -static void cfi_fix_code_endian(target_t *target, u8 *dest, const u32 *src, u32 count) +static void cfi_fix_code_endian(target_t *target, uint8_t *dest, const u32 *src, u32 count) { u32 i; for (i=0; i< count; i++) @@ -1016,11 +1016,11 @@ static void cfi_fix_code_endian(target_t *target, u8 *dest, const u32 *src, u32 } } -static u32 cfi_command_val(flash_bank_t *bank, u8 cmd) +static u32 cfi_command_val(flash_bank_t *bank, uint8_t cmd) { target_t *target = bank->target; - u8 buf[CFI_MAX_BUS_WIDTH]; + uint8_t buf[CFI_MAX_BUS_WIDTH]; cfi_command(bank, cmd, buf); switch (bank->bus_width) { @@ -1039,7 +1039,7 @@ static u32 cfi_command_val(flash_bank_t *bank, u8 cmd) } } -static int cfi_intel_write_block(struct flash_bank_s *bank, u8 *buffer, u32 address, u32 count) +static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 address, u32 count) { cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; @@ -1109,7 +1109,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, u8 *buffer, u32 addr 0xeafffff2, /* b loop */ 0xeafffffe /* done: b -2 */ }; - u8 target_code[4*CFI_MAX_INTEL_CODESIZE]; + uint8_t target_code[4*CFI_MAX_INTEL_CODESIZE]; const u32 *target_code_src; u32 target_code_size; int retval = ERROR_OK; @@ -1283,7 +1283,7 @@ cleanup: return retval; } -static int cfi_spansion_write_block(struct flash_bank_s *bank, u8 *buffer, u32 address, u32 count) +static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 address, u32 count) { cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext; @@ -1422,7 +1422,7 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, u8 *buffer, u32 a /* flash write code */ if (!cfi_info->write_algorithm) { - u8 *target_code; + uint8_t *target_code; int target_code_size; const u32 *src; @@ -1545,12 +1545,12 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, u8 *buffer, u32 a return exit_code; } -static int cfi_intel_write_word(struct flash_bank_s *bank, u8 *word, u32 address) +static int cfi_intel_write_word(struct flash_bank_s *bank, uint8_t *word, u32 address) { int retval; cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; cfi_intel_clear_status_register(bank); cfi_command(bank, 0x40, command); @@ -1579,12 +1579,12 @@ static int cfi_intel_write_word(struct flash_bank_s *bank, u8 *word, u32 address return ERROR_OK; } -static int cfi_intel_write_words(struct flash_bank_s *bank, u8 *word, u32 wordcount, u32 address) +static int cfi_intel_write_words(struct flash_bank_s *bank, uint8_t *word, u32 wordcount, u32 address) { int retval; cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; /* Calculate buffer size and boundary mask */ u32 buffersize = (1UL << cfi_info->max_buf_write_size) * (bank->bus_width / bank->chip_width); @@ -1671,13 +1671,13 @@ static int cfi_intel_write_words(struct flash_bank_s *bank, u8 *word, u32 wordco return ERROR_OK; } -static int cfi_spansion_write_word(struct flash_bank_s *bank, u8 *word, u32 address) +static int cfi_spansion_write_word(struct flash_bank_s *bank, uint8_t *word, u32 address) { int retval; cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; cfi_command(bank, 0xaa, command); if((retval = target_write_memory(target, flash_address(bank, 0, pri_ext->_unlock1), bank->bus_width, 1, command)) != ERROR_OK) @@ -1717,12 +1717,12 @@ static int cfi_spansion_write_word(struct flash_bank_s *bank, u8 *word, u32 addr return ERROR_OK; } -static int cfi_spansion_write_words(struct flash_bank_s *bank, u8 *word, u32 wordcount, u32 address) +static int cfi_spansion_write_words(struct flash_bank_s *bank, uint8_t *word, u32 wordcount, u32 address) { int retval; cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext; /* Calculate buffer size and boundary mask */ @@ -1809,7 +1809,7 @@ static int cfi_spansion_write_words(struct flash_bank_s *bank, u8 *word, u32 wor return ERROR_OK; } -static int cfi_write_word(struct flash_bank_s *bank, u8 *word, u32 address) +static int cfi_write_word(struct flash_bank_s *bank, uint8_t *word, u32 address) { cfi_flash_bank_t *cfi_info = bank->driver_priv; @@ -1830,7 +1830,7 @@ static int cfi_write_word(struct flash_bank_s *bank, u8 *word, u32 address) return ERROR_FLASH_OPERATION_FAILED; } -static int cfi_write_words(struct flash_bank_s *bank, u8 *word, u32 wordcount, u32 address) +static int cfi_write_words(struct flash_bank_s *bank, uint8_t *word, u32 wordcount, u32 address) { cfi_flash_bank_t *cfi_info = bank->driver_priv; @@ -1851,7 +1851,7 @@ static int cfi_write_words(struct flash_bank_s *bank, u8 *word, u32 wordcount, u return ERROR_FLASH_OPERATION_FAILED; } -int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; @@ -1859,7 +1859,7 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) u32 write_p, copy_p; int align; /* number of unaligned bytes */ int blk_count; /* number of bus_width bytes for block copy */ - u8 current_word[CFI_MAX_BUS_WIDTH * 4]; /* word (bus_width size) currently being programmed */ + uint8_t current_word[CFI_MAX_BUS_WIDTH * 4]; /* word (bus_width size) currently being programmed */ int i; int retval; @@ -1888,7 +1888,7 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) /* copy bytes before the first write address */ for (i = 0; i < align; ++i, ++copy_p) { - u8 byte; + uint8_t byte; if((retval = target_read_memory(target, copy_p, 1, 1, &byte)) != ERROR_OK) { return retval; @@ -1907,7 +1907,7 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) /* if the buffer is already finished, copy bytes after the last write address */ for (; (count == 0) && (i < bank->bus_width); ++i, ++copy_p) { - u8 byte; + uint8_t byte; if((retval = target_read_memory(target, copy_p, 1, 1, &byte)) != ERROR_OK) { return retval; @@ -2038,7 +2038,7 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) } for (; i < bank->bus_width; ++i, ++copy_p) { - u8 byte; + uint8_t byte; if((retval = target_read_memory(target, copy_p, 1, 1, &byte)) != ERROR_OK) { return retval; @@ -2106,7 +2106,7 @@ static int cfi_probe(struct flash_bank_s *bank) { cfi_flash_bank_t *cfi_info = bank->driver_priv; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; int num_sectors = 0; int i; int sector = 0; @@ -2150,7 +2150,7 @@ static int cfi_probe(struct flash_bank_s *bank) if (bank->chip_width == 1) { - u8 manufacturer, device_id; + uint8_t manufacturer, device_id; if((retval = target_read_u8(target, flash_address(bank, 0, 0x00), &manufacturer)) != ERROR_OK) { return retval; @@ -2402,7 +2402,7 @@ static int cfi_intel_protect_check(struct flash_bank_s *bank) cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext; target_t *target = bank->target; - u8 command[CFI_MAX_BUS_WIDTH]; + uint8_t command[CFI_MAX_BUS_WIDTH]; int i; /* check if block lock bits are supported on this device */ @@ -2417,7 +2417,7 @@ static int cfi_intel_protect_check(struct flash_bank_s *bank) for (i = 0; i < bank->num_sectors; i++) { - u8 block_status = cfi_get_u8(bank, i, 0x2); + uint8_t block_status = cfi_get_u8(bank, i, 0x2); if (block_status & 1) bank->sectors[i].is_protected = 1; @@ -2435,7 +2435,7 @@ static int cfi_spansion_protect_check(struct flash_bank_s *bank) cfi_flash_bank_t *cfi_info = bank->driver_priv; cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext; target_t *target = bank->target; - u8 command[8]; + uint8_t command[8]; int i; cfi_command(bank, 0xaa, command); @@ -2458,7 +2458,7 @@ static int cfi_spansion_protect_check(struct flash_bank_s *bank) for (i = 0; i < bank->num_sectors; i++) { - u8 block_status = cfi_get_u8(bank, i, 0x2); + uint8_t block_status = cfi_get_u8(bank, i, 0x2); if (block_status & 1) bank->sectors[i].is_protected = 1; diff --git a/src/flash/cfi.h b/src/flash/cfi.h index 49fbad4977..18499d34e0 100644 --- a/src/flash/cfi.h +++ b/src/flash/cfi.h @@ -46,26 +46,26 @@ typedef struct cfi_flash_bank_s u16 alt_addr; /* device-system interface */ - u8 vcc_min; - u8 vcc_max; - u8 vpp_min; - u8 vpp_max; - u8 word_write_timeout_typ; - u8 buf_write_timeout_typ; - u8 block_erase_timeout_typ; - u8 chip_erase_timeout_typ; - u8 word_write_timeout_max; - u8 buf_write_timeout_max; - u8 block_erase_timeout_max; - u8 chip_erase_timeout_max; - - u8 status_poll_mask; + uint8_t vcc_min; + uint8_t vcc_max; + uint8_t vpp_min; + uint8_t vpp_max; + uint8_t word_write_timeout_typ; + uint8_t buf_write_timeout_typ; + uint8_t block_erase_timeout_typ; + uint8_t chip_erase_timeout_typ; + uint8_t word_write_timeout_max; + uint8_t buf_write_timeout_max; + uint8_t block_erase_timeout_max; + uint8_t chip_erase_timeout_max; + + uint8_t status_poll_mask; /* flash geometry */ u32 dev_size; u16 interface_desc; u16 max_buf_write_size; - u8 num_erase_regions; + uint8_t num_erase_regions; u32 *erase_region_info; void *pri_ext; @@ -79,18 +79,18 @@ typedef struct cfi_flash_bank_s typedef struct cfi_intel_pri_ext_s { char pri[3]; - u8 major_version; - u8 minor_version; + uint8_t major_version; + uint8_t minor_version; u32 feature_support; - u8 suspend_cmd_support; + uint8_t suspend_cmd_support; u16 blk_status_reg_mask; - u8 vcc_optimal; - u8 vpp_optimal; - u8 num_protection_fields; + uint8_t vcc_optimal; + uint8_t vpp_optimal; + uint8_t num_protection_fields; u16 prot_reg_addr; - u8 fact_prot_reg_size; - u8 user_prot_reg_size; - u8 extra[0]; + uint8_t fact_prot_reg_size; + uint8_t user_prot_reg_size; + uint8_t extra[0]; } cfi_intel_pri_ext_t; /* Spansion primary extended query table as defined for and used by @@ -98,20 +98,20 @@ typedef struct cfi_intel_pri_ext_s */ typedef struct cfi_spansion_pri_ext_s { - u8 pri[3]; - u8 major_version; - u8 minor_version; - u8 SiliconRevision; /* bits 1-0: Address Sensitive Unlock */ - u8 EraseSuspend; - u8 BlkProt; - u8 TmpBlkUnprotect; - u8 BlkProtUnprot; - u8 SimultaneousOps; - u8 BurstMode; - u8 PageMode; - u8 VppMin; - u8 VppMax; - u8 TopBottom; + uint8_t pri[3]; + uint8_t major_version; + uint8_t minor_version; + uint8_t SiliconRevision; /* bits 1-0: Address Sensitive Unlock */ + uint8_t EraseSuspend; + uint8_t BlkProt; + uint8_t TmpBlkUnprotect; + uint8_t BlkProtUnprot; + uint8_t SimultaneousOps; + uint8_t BurstMode; + uint8_t PageMode; + uint8_t VppMin; + uint8_t VppMax; + uint8_t TopBottom; int _reversed_geometry; u32 _unlock1; u32 _unlock2; @@ -122,13 +122,13 @@ typedef struct cfi_spansion_pri_ext_s */ typedef struct cfi_atmel_pri_ext_s { - u8 pri[3]; - u8 major_version; - u8 minor_version; - u8 features; - u8 bottom_boot; - u8 burst_mode; - u8 page_mode; + uint8_t pri[3]; + uint8_t major_version; + uint8_t minor_version; + uint8_t features; + uint8_t bottom_boot; + uint8_t burst_mode; + uint8_t page_mode; } cfi_atmel_pri_ext_t; enum { diff --git a/src/flash/davinci_nand.c b/src/flash/davinci_nand.c index 7500fc757b..d1ffea0f4d 100644 --- a/src/flash/davinci_nand.c +++ b/src/flash/davinci_nand.c @@ -40,8 +40,8 @@ enum ecc { struct davinci_nand { target_t *target; - u8 chipsel; /* chipselect 0..3 == CS2..CS5 */ - u8 eccmode; + uint8_t chipsel; /* chipselect 0..3 == CS2..CS5 */ + uint8_t eccmode; /* Async EMIF controller base */ u32 aemif; @@ -53,9 +53,9 @@ struct davinci_nand { /* page i/o for the relevant flavor of hardware ECC */ int (*read_page)(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size); + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); int (*write_page)(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size); + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); }; #define NANDFCR 0x60 /* flash control register */ @@ -133,7 +133,7 @@ static int davinci_nand_ready(struct nand_device_s *nand, int timeout) return 0; } -static int davinci_command(struct nand_device_s *nand, u8 command) +static int davinci_command(struct nand_device_s *nand, uint8_t command) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; @@ -145,7 +145,7 @@ static int davinci_command(struct nand_device_s *nand, u8 command) return ERROR_OK; } -static int davinci_address(struct nand_device_s *nand, u8 address) +static int davinci_address(struct nand_device_s *nand, uint8_t address) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; @@ -184,7 +184,7 @@ static int davinci_read_data(struct nand_device_s *nand, void *data) /* REVISIT a bit of native code should let block I/O be MUCH faster */ static int davinci_read_block_data(struct nand_device_s *nand, - u8 *data, int data_size) + uint8_t *data, int data_size) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; @@ -217,7 +217,7 @@ static int davinci_read_block_data(struct nand_device_s *nand, } static int davinci_write_block_data(struct nand_device_s *nand, - u8 *data, int data_size) + uint8_t *data, int data_size) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; @@ -246,10 +246,10 @@ static int davinci_write_block_data(struct nand_device_s *nand, } static int davinci_write_page(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size) + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { struct davinci_nand *info = nand->controller_priv; - u8 *ooballoc = NULL; + uint8_t *ooballoc = NULL; int status; if (!nand->device) @@ -291,7 +291,7 @@ static int davinci_write_page(struct nand_device_s *nand, u32 page, } static int davinci_read_page(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size) + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { struct davinci_nand *info = nand->controller_priv; @@ -303,7 +303,7 @@ static int davinci_read_page(struct nand_device_s *nand, u32 page, return info->read_page(nand, page, data, data_size, oob, oob_size); } -static void davinci_write_pagecmd(struct nand_device_s *nand, u8 cmd, u32 page) +static void davinci_write_pagecmd(struct nand_device_s *nand, uint8_t cmd, u32 page) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; @@ -327,11 +327,11 @@ static void davinci_write_pagecmd(struct nand_device_s *nand, u8 cmd, u32 page) } static int davinci_writepage_tail(struct nand_device_s *nand, - u8 *oob, u32 oob_size) + uint8_t *oob, u32 oob_size) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; - u8 status; + uint8_t status; if (oob_size) davinci_write_block_data(nand, oob, oob_size); @@ -359,7 +359,7 @@ static int davinci_writepage_tail(struct nand_device_s *nand, * All DaVinci family chips support 1-bit ECC on a per-chipselect basis. */ static int davinci_write_page_ecc1(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size) + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { unsigned oob_offset; struct davinci_nand *info = nand->controller_priv; @@ -409,9 +409,9 @@ static int davinci_write_page_ecc1(struct nand_device_s *nand, u32 page, ecc1 = ~ecc1; /* save correct ECC code into oob data */ - oob[oob_offset++] = (u8)(ecc1); - oob[oob_offset++] = (u8)(ecc1 >> 8); - oob[oob_offset++] = (u8)(ecc1 >> 16); + oob[oob_offset++] = (uint8_t)(ecc1); + oob[oob_offset++] = (uint8_t)(ecc1 >> 8); + oob[oob_offset++] = (uint8_t)(ecc1 >> 16); } while (data_size); @@ -426,19 +426,19 @@ static int davinci_write_page_ecc1(struct nand_device_s *nand, u32 page, * manufacturer bad block markers are safe. Contrast: old "infix" style. */ static int davinci_write_page_ecc4(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size) + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { - static const u8 ecc512[] = { + static const uint8_t ecc512[] = { 0, 1, 2, 3, 4, /* 5== mfr badblock */ 6, 7, /* 8..12 for BBT or JFFS2 */ 13, 14, 15, }; - static const u8 ecc2048[] = { + static const uint8_t ecc2048[] = { 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, }; - static const u8 ecc4096[] = { + static const uint8_t ecc4096[] = { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, @@ -450,7 +450,7 @@ static int davinci_write_page_ecc4(struct nand_device_s *nand, u32 page, }; struct davinci_nand *info = nand->controller_priv; - const u8 *l; + const uint8_t *l; target_t *target = info->target; const u32 fcr_addr = info->aemif + NANDFCR; const u32 ecc4_addr = info->aemif + NAND4BITECC; @@ -528,7 +528,7 @@ static int davinci_write_page_ecc4(struct nand_device_s *nand, u32 page, * (MVL 4.x/5.x kernels, filesystems, etc) may need it more generally. */ static int davinci_write_page_ecc4infix(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size) + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { struct davinci_nand *info = nand->controller_priv; target_t *target = info->target; @@ -547,7 +547,7 @@ static int davinci_write_page_ecc4infix(struct nand_device_s *nand, u32 page, do { u32 raw_ecc[4], *p; - u8 *l; + uint8_t *l; int i; /* start 4bit ecc on csX */ @@ -585,7 +585,7 @@ static int davinci_write_page_ecc4infix(struct nand_device_s *nand, u32 page, } static int davinci_read_page_ecc4infix(struct nand_device_s *nand, u32 page, - u8 *data, u32 data_size, u8 *oob, u32 oob_size) + uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { davinci_write_pagecmd(nand, NAND_CMD_READ0, page); diff --git a/src/flash/ecos.c b/src/flash/ecos.c index 2d03edb9df..16a7949d8a 100644 --- a/src/flash/ecos.c +++ b/src/flash/ecos.c @@ -30,7 +30,7 @@ static int ecosflash_register_commands(struct command_context_s *cmd_ctx); static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int ecosflash_erase(struct flash_bank_s *bank, int first, int last); static int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last); -static int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int ecosflash_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int ecosflash_probe(struct flash_bank_s *bank); static int ecosflash_protect_check(struct flash_bank_s *bank); static int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size); @@ -328,7 +328,7 @@ static int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address } int retval; - retval=target_write_buffer(target, buffer, t, ((u8 *)data)+i); + retval=target_write_buffer(target, buffer, t, ((uint8_t *)data)+i); if (retval != ERROR_OK) return retval; @@ -366,7 +366,7 @@ static int ecosflash_register_commands(struct command_context_s *cmd_ctx) } #if 0 -static void command(flash_bank_t *bank, u8 cmd, u8 *cmd_buf) +static void command(flash_bank_t *bank, uint8_t cmd, uint8_t *cmd_buf) { ecosflash_flash_bank_t *info = bank->driver_priv; int i; @@ -418,7 +418,7 @@ static int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int return ERROR_OK; } -static int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int ecosflash_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { ecosflash_flash_bank_t *info = bank->driver_priv; struct flash_bank_s *c=bank; diff --git a/src/flash/flash.c b/src/flash/flash.c index 3dffb1f28e..2df0989e3a 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -85,7 +85,7 @@ flash_bank_t *flash_banks; static command_t *flash_cmd; /* wafer thin wrapper for invoking the flash driver */ -static int flash_driver_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { int retval; @@ -710,8 +710,8 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm u32 address; u32 pattern; u32 count; - u8 chunk[1024]; - u8 readback[1024]; + uint8_t chunk[1024]; + uint8_t readback[1024]; u32 wrote = 0; u32 cur_size = 0; u32 chunk_count; @@ -823,7 +823,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u32 offset; - u8 *buffer; + uint8_t *buffer; u32 buf_cnt; fileio_t fileio; @@ -1004,7 +1004,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) while (section < image->num_sections) { u32 buffer_size; - u8 *buffer; + uint8_t *buffer; int section_first; int section_last; u32 run_address = image->sections[section].base_address + section_offset; @@ -1129,7 +1129,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) int default_flash_mem_blank_check(struct flash_bank_s *bank) { target_t *target = bank->target; - u8 buffer[1024]; + uint8_t buffer[1024]; int buffer_size = sizeof(buffer); int i; u32 nBytes; diff --git a/src/flash/flash.h b/src/flash/flash.h index 26b3b11872..ce5a3a084b 100644 --- a/src/flash/flash.h +++ b/src/flash/flash.h @@ -166,7 +166,7 @@ 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, u8 *buffer, u32 offset, u32 count); + int (*write)(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); /** * Probe to determine what kind of flash is present. diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c index c3299bcd01..643f28b640 100644 --- a/src/flash/lpc2000.c +++ b/src/flash/lpc2000.c @@ -49,7 +49,7 @@ static int lpc2000_register_commands(struct command_context_s *cmd_ctx); static int lpc2000_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int lpc2000_erase(struct flash_bank_s *bank, int first, int last); static int lpc2000_protect(struct flash_bank_s *bank, int set, int first, int last); -static int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int lpc2000_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int lpc2000_probe(struct flash_bank_s *bank); static int lpc2000_erase_check(struct flash_bank_s *bank); static int lpc2000_protect_check(struct flash_bank_s *bank); @@ -246,7 +246,7 @@ static int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u3 /* regrab previously allocated working_area, or allocate a new one */ if (!lpc2000_info->iap_working_area) { - u8 jump_gate[8]; + uint8_t jump_gate[8]; /* make sure we have a working area */ if (target_alloc_working_area(target, 172, &lpc2000_info->iap_working_area) != ERROR_OK) @@ -465,7 +465,7 @@ static int lpc2000_protect(struct flash_bank_s *bank, int set, int first, int la return ERROR_OK; } -static int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int lpc2000_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv; target_t *target = bank->target; @@ -589,7 +589,7 @@ static int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 } else { - u8 *last_buffer = malloc(thisrun_bytes); + uint8_t *last_buffer = malloc(thisrun_bytes); u32 i; memcpy(last_buffer, buffer + bytes_written, bytes_remaining); for (i = bytes_remaining; i < thisrun_bytes; i++) diff --git a/src/flash/lpc288x.c b/src/flash/lpc288x.c index 152432e005..5400339946 100644 --- a/src/flash/lpc288x.c +++ b/src/flash/lpc288x.c @@ -88,7 +88,7 @@ static int lpc288x_register_commands(struct command_context_s *cmd_ctx); static int lpc288x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int lpc288x_erase(struct flash_bank_s *bank, int first, int last); static int lpc288x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int lpc288x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int lpc288x_probe(struct flash_bank_s *bank); static int lpc288x_erase_check(struct flash_bank_s *bank); static int lpc288x_protect_check(struct flash_bank_s *bank); @@ -315,9 +315,9 @@ static int lpc288x_erase(struct flash_bank_s *bank, int first, int last) return ERROR_OK; } -static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int lpc288x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { - u8 page_buffer[FLASH_PAGE_SIZE]; + uint8_t page_buffer[FLASH_PAGE_SIZE]; u32 status, source_offset,dest_offset; target_t *target = bank->target; u32 bytes_remaining = count; diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c index 06048085b5..6e9b1d1bc8 100644 --- a/src/flash/lpc3180_nand_controller.c +++ b/src/flash/lpc3180_nand_controller.c @@ -28,12 +28,12 @@ static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char * static int lpc3180_register_commands(struct command_context_s *cmd_ctx); static int lpc3180_init(struct nand_device_s *device); static int lpc3180_reset(struct nand_device_s *device); -static int lpc3180_command(struct nand_device_s *device, u8 command); -static int lpc3180_address(struct nand_device_s *device, u8 address); +static int lpc3180_command(struct nand_device_s *device, uint8_t command); +static int lpc3180_address(struct nand_device_s *device, uint8_t address); static int lpc3180_write_data(struct nand_device_s *device, u16 data); static int lpc3180_read_data(struct nand_device_s *device, void *data); -static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); -static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); +static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); +static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); static int lpc3180_controller_ready(struct nand_device_s *device, int timeout); static int lpc3180_nand_ready(struct nand_device_s *device, int timeout); @@ -350,7 +350,7 @@ static int lpc3180_reset(struct nand_device_s *device) return ERROR_OK; } -static int lpc3180_command(struct nand_device_s *device, u8 command) +static int lpc3180_command(struct nand_device_s *device, uint8_t command) { lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; target_t *target = lpc3180_info->target; @@ -380,7 +380,7 @@ static int lpc3180_command(struct nand_device_s *device, u8 command) return ERROR_OK; } -static int lpc3180_address(struct nand_device_s *device, u8 address) +static int lpc3180_address(struct nand_device_s *device, uint8_t address) { lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; target_t *target = lpc3180_info->target; @@ -461,7 +461,7 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data) /* data = MLC_DATA, use sized access */ if (device->bus_width == 8) { - u8 *data8 = data; + uint8_t *data8 = data; target_read_u8(target, 0x200b0000, data8); } else if (device->bus_width == 16) @@ -484,7 +484,7 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data) if (device->bus_width == 8) { - u8 *data8 = data; + uint8_t *data8 = data; *data8 = data32 & 0xff; } else if (device->bus_width == 16) @@ -502,12 +502,12 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data) return ERROR_OK; } -static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; target_t *target = lpc3180_info->target; int retval; - u8 status; + uint8_t status; if (target->state != TARGET_HALTED) { @@ -522,8 +522,8 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data, } else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER) { - u8 *page_buffer; - u8 *oob_buffer; + uint8_t *page_buffer; + uint8_t *oob_buffer; int quarter, num_quarters; if (!data && oob) @@ -641,7 +641,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data, return ERROR_OK; } -static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; target_t *target = lpc3180_info->target; @@ -659,8 +659,8 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u } else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER) { - u8 *page_buffer; - u8 *oob_buffer; + uint8_t *page_buffer; + uint8_t *oob_buffer; u32 page_bytes_done = 0; u32 oob_bytes_done = 0; u32 mlc_isr; @@ -792,7 +792,7 @@ static int lpc3180_controller_ready(struct nand_device_s *device, int timeout) { lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; target_t *target = lpc3180_info->target; - u8 status = 0x0; + uint8_t status = 0x0; if (target->state != TARGET_HALTED) { @@ -837,7 +837,7 @@ static int lpc3180_nand_ready(struct nand_device_s *device, int timeout) { if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER) { - u8 status = 0x0; + uint8_t status = 0x0; /* Read MLC_ISR, wait for NAND flash device to become ready */ target_read_u8(target, 0x200b8048, &status); diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 24efaa776e..39a6ca85a7 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -28,9 +28,9 @@ static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio); -static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val); +static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val); static int pxa270_set_gpio_to_output (mflash_gpio_num_t gpio); -static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val); +static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val); static command_t *mflash_cmd; @@ -101,7 +101,7 @@ static int pxa270_set_gpio_to_output (mflash_gpio_num_t gpio) return ret; } -static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val) +static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val) { u32 addr, value, mask; target_t *target = mflash_bank->target; @@ -162,7 +162,7 @@ static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio) return ret; } -static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val) +static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val) { u32 data, mask, gpio_dat; target_t *target = mflash_bank->target; @@ -191,7 +191,7 @@ static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val) return ret; } -static int mg_hdrst(u8 level) +static int mg_hdrst(uint8_t level) { return mflash_bank->gpio_drv->set_gpio_output_val(mflash_bank->rst_pin, level); } @@ -212,7 +212,7 @@ static int mg_init_gpio (void) static int mg_dsk_wait(mg_io_type_wait wait, u32 time) { - u8 status, error; + uint8_t status, error; target_t *target = mflash_bank->target; u32 mg_task_reg = mflash_bank->base + MG_REG_OFFSET; duration_t duration; @@ -288,11 +288,11 @@ static int mg_dsk_wait(mg_io_type_wait wait, u32 time) return ERROR_MG_TIMEOUT; } -static int mg_dsk_srst(u8 on) +static int mg_dsk_srst(uint8_t on) { target_t *target = mflash_bank->target; u32 mg_task_reg = mflash_bank->base + MG_REG_OFFSET; - u8 value; + uint8_t value; int ret; if ((ret = target_read_u8(target, mg_task_reg + MG_REG_DRV_CTRL, &value)) != ERROR_OK) @@ -308,11 +308,11 @@ static int mg_dsk_srst(u8 on) return ret; } -static int mg_dsk_io_cmd(u32 sect_num, u32 cnt, u8 cmd) +static int mg_dsk_io_cmd(u32 sect_num, u32 cnt, uint8_t cmd) { target_t *target = mflash_bank->target; u32 mg_task_reg = mflash_bank->base + MG_REG_OFFSET; - u8 value; + uint8_t value; int ret; ret = mg_dsk_wait(mg_io_wait_rdy_noerr, MG_OEM_DISK_WAIT_TIME_NORMAL); @@ -322,10 +322,10 @@ static int mg_dsk_io_cmd(u32 sect_num, u32 cnt, u8 cmd) value = mg_io_rval_dev_drv_master | mg_io_rval_dev_lba_mode |((sect_num >> 24) & 0xf); ret = target_write_u8(target, mg_task_reg + MG_REG_DRV_HEAD, value); - ret |= target_write_u8(target, mg_task_reg + MG_REG_SECT_CNT, (u8)cnt); - ret |= target_write_u8(target, mg_task_reg + MG_REG_SECT_NUM, (u8)sect_num); - ret |= target_write_u8(target, mg_task_reg + MG_REG_CYL_LOW, (u8)(sect_num >> 8)); - ret |= target_write_u8(target, mg_task_reg + MG_REG_CYL_HIGH, (u8)(sect_num >> 16)); + ret |= target_write_u8(target, mg_task_reg + MG_REG_SECT_CNT, (uint8_t)cnt); + ret |= target_write_u8(target, mg_task_reg + MG_REG_SECT_NUM, (uint8_t)sect_num); + ret |= target_write_u8(target, mg_task_reg + MG_REG_CYL_LOW, (uint8_t)(sect_num >> 8)); + ret |= target_write_u8(target, mg_task_reg + MG_REG_CYL_HIGH, (uint8_t)(sect_num >> 16)); if (ret != ERROR_OK) return ret; @@ -351,7 +351,7 @@ static int mg_dsk_drv_info(void) mflash_bank->drv_info = malloc(sizeof(mg_drv_info_t)); target_read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1, - (u8 *)&mflash_bank->drv_info->drv_id); + (uint8_t *)&mflash_bank->drv_info->drv_id); if (ret != ERROR_OK) return ret; @@ -426,7 +426,7 @@ static int mg_mflash_do_read_sects(void *buff, u32 sect_num, u32 sect_cnt) u32 i, address; int ret; target_t *target = mflash_bank->target; - u8 *buff_ptr = buff; + uint8_t *buff_ptr = buff; duration_t duration; if ((ret = mg_dsk_io_cmd(sect_num, sect_cnt, mg_io_cmd_read)) != ERROR_OK ) @@ -467,7 +467,7 @@ static int mg_mflash_do_read_sects(void *buff, u32 sect_num, u32 sect_cnt) static int mg_mflash_read_sects(void *buff, u32 sect_num, u32 sect_cnt) { u32 quotient, residue, i; - u8 *buff_ptr = buff; + uint8_t *buff_ptr = buff; int ret = ERROR_OK; quotient = sect_cnt >> 8; @@ -499,7 +499,7 @@ static int mg_mflash_do_write_sects(void *buff, u32 sect_num, u32 sect_cnt, u32 i, address; int ret; target_t *target = mflash_bank->target; - u8 *buff_ptr = buff; + uint8_t *buff_ptr = buff; duration_t duration; if ((ret = mg_dsk_io_cmd(sect_num, sect_cnt, cmd)) != ERROR_OK ) @@ -545,7 +545,7 @@ static int mg_mflash_do_write_sects(void *buff, u32 sect_num, u32 sect_cnt, static int mg_mflash_write_sects(void *buff, u32 sect_num, u32 sect_cnt) { u32 quotient, residue, i; - u8 *buff_ptr = buff; + uint8_t *buff_ptr = buff; int ret = ERROR_OK; quotient = sect_cnt >> 8; @@ -571,10 +571,10 @@ static int mg_mflash_write_sects(void *buff, u32 sect_num, u32 sect_cnt) return ret; } -static int mg_mflash_read (u32 addr, u8 *buff, u32 len) +static int mg_mflash_read (u32 addr, uint8_t *buff, u32 len) { - u8 *buff_ptr = buff; - u8 sect_buff[MG_MFLASH_SECTOR_SIZE]; + uint8_t *buff_ptr = buff; + uint8_t sect_buff[MG_MFLASH_SECTOR_SIZE]; u32 cur_addr, next_sec_addr, end_addr, cnt, sect_num; int ret = ERROR_OK; @@ -635,10 +635,10 @@ static int mg_mflash_read (u32 addr, u8 *buff, u32 len) return ret; } -static int mg_mflash_write(u32 addr, u8 *buff, u32 len) +static int mg_mflash_write(u32 addr, uint8_t *buff, u32 len) { - u8 *buff_ptr = buff; - u8 sect_buff[MG_MFLASH_SECTOR_SIZE]; + uint8_t *buff_ptr = buff; + uint8_t sect_buff[MG_MFLASH_SECTOR_SIZE]; u32 cur_addr, next_sec_addr, end_addr, cnt, sect_num; int ret = ERROR_OK; @@ -706,7 +706,7 @@ static int mg_mflash_write(u32 addr, u8 *buff, u32 len) static int mg_write_cmd(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u32 address, buf_cnt, cnt, res, i; - u8 *buffer; + uint8_t *buffer; fileio_t fileio; duration_t duration; char *duration_text; @@ -773,7 +773,7 @@ mg_write_cmd_err: static int mg_dump_cmd(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u32 address, size_written, size, cnt, res, i; - u8 *buffer; + uint8_t *buffer; fileio_t fileio; duration_t duration; char *duration_text; @@ -967,14 +967,14 @@ static int mg_verify_interface(void) buff[i] = i; ret = target_write_memory(target, address, 2, - MG_MFLASH_SECTOR_SIZE / 2, (u8 *)buff); + MG_MFLASH_SECTOR_SIZE / 2, (uint8_t *)buff); if (ret != ERROR_OK) return ret; memset(buff, 0xff, MG_MFLASH_SECTOR_SIZE); ret = target_read_memory(target, address, 2, - MG_MFLASH_SECTOR_SIZE / 2, (u8 *)buff); + MG_MFLASH_SECTOR_SIZE / 2, (uint8_t *)buff); if (ret != ERROR_OK) return ret; @@ -1117,7 +1117,7 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo) static int mg_storage_config(void) { - u8 buff[512]; + uint8_t buff[512]; int ret; if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd)) @@ -1140,7 +1140,7 @@ static int mg_storage_config(void) static int mg_boot_config(void) { - u8 buff[512]; + uint8_t buff[512]; int ret; if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd)) @@ -1168,7 +1168,7 @@ static int mg_boot_config(void) static int mg_set_pll(mg_pll_t *pll) { - u8 buff[512]; + uint8_t buff[512]; int ret; memset(buff, 0xff, 512); diff --git a/src/flash/mflash.h b/src/flash/mflash.h index a62e83de3d..774fba1a06 100644 --- a/src/flash/mflash.h +++ b/src/flash/mflash.h @@ -36,7 +36,7 @@ typedef struct mflash_gpio_drv_s { char *name; int (*set_gpio_to_output) (mflash_gpio_num_t gpio); - int (*set_gpio_output_val) (mflash_gpio_num_t gpio, u8 val); + int (*set_gpio_output_val) (mflash_gpio_num_t gpio, uint8_t val); } mflash_gpio_drv_t; typedef struct _mg_io_type_drv_info { diff --git a/src/flash/nand.c b/src/flash/nand.c index 69b676620d..7895311513 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -38,10 +38,10 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int nand_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); -//static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, u32 data_size); +static int nand_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); +//static int nand_read_plain(struct nand_device_s *device, u32 address, uint8_t *data, u32 data_size); -static int nand_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); +static int nand_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); /* NAND flash controller */ @@ -341,7 +341,7 @@ static int nand_build_bbt(struct nand_device_s *device, int first, int last) { u32 page = 0x0; int i; - u8 oob[6]; + uint8_t oob[6]; if ((first < 0) || (first >= device->num_blocks)) first = 0; @@ -371,7 +371,7 @@ static int nand_build_bbt(struct nand_device_s *device, int first, int last) return ERROR_OK; } -int nand_read_status(struct nand_device_s *device, u8 *status) +int nand_read_status(struct nand_device_s *device, uint8_t *status) { if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -398,7 +398,7 @@ int nand_read_status(struct nand_device_s *device, u8 *status) static int nand_poll_ready(struct nand_device_s *device, int timeout) { - u8 status; + uint8_t status; device->controller->command(device, NAND_CMD_STATUS); do { @@ -419,8 +419,8 @@ static int nand_poll_ready(struct nand_device_s *device, int timeout) int nand_probe(struct nand_device_s *device) { - u8 manufacturer_id, device_id; - u8 id_buff[6]; + uint8_t manufacturer_id, device_id; + uint8_t id_buff[6]; int retval; int i; @@ -639,7 +639,7 @@ int nand_erase(struct nand_device_s *device, int first_block, int last_block) { int i; u32 page; - u8 status; + uint8_t status; int retval; if (!device->device) @@ -721,9 +721,9 @@ int nand_erase(struct nand_device_s *device, int first_block, int last_block) } #if 0 -static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, u32 data_size) +static int nand_read_plain(struct nand_device_s *device, u32 address, uint8_t *data, u32 data_size) { - u8 *page; + uint8_t *page; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -758,9 +758,9 @@ static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, return ERROR_OK; } -static int nand_write_plain(struct nand_device_s *device, u32 address, u8 *data, u32 data_size) +static int nand_write_plain(struct nand_device_s *device, u32 address, uint8_t *data, u32 data_size) { - u8 *page; + uint8_t *page; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -796,7 +796,7 @@ static int nand_write_plain(struct nand_device_s *device, u32 address, u8 *data, } #endif -int nand_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +int nand_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { u32 block; @@ -813,7 +813,7 @@ int nand_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_s return device->controller->write_page(device, page, data, data_size, oob, oob_size); } -static int nand_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +static int nand_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -824,7 +824,7 @@ static int nand_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 return device->controller->read_page(device, page, data, data_size, oob, oob_size); } -int nand_read_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +int nand_read_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { u32 i; @@ -938,11 +938,11 @@ int nand_read_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 dat return ERROR_OK; } -int nand_write_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +int nand_write_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size) { u32 i; int retval; - u8 status; + uint8_t status; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -1331,9 +1331,9 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); if (p) { - u8 *page = NULL; + uint8_t *page = NULL; u32 page_size = 0; - u8 *oob = NULL; + uint8_t *oob = NULL; u32 oob_size = 0; const int *eccpos = NULL; @@ -1413,7 +1413,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm if (oob_format & NAND_OOB_SW_ECC) { u32 i, j; - u8 ecc[3]; + uint8_t ecc[3]; memset(oob, 0xff, oob_size); for (i = 0, j = 0; i < page_size; i += 256) { nand_calculate_ecc(p, page+i, ecc); @@ -1430,7 +1430,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm * of 10 bytes per 512-byte data block. */ u32 i; - u8 *ecc = oob + oob_size - page_size/512 * 10; + uint8_t *ecc = oob + oob_size - page_size/512 * 10; memset(oob, 0xff, oob_size); for (i = 0; i < page_size; i += 512) { nand_calculate_ecc_kw(p, page+i, ecc); @@ -1499,9 +1499,9 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd char *duration_text; int retval; - u8 *page = NULL; + uint8_t *page = NULL; u32 page_size = 0; - u8 *oob = NULL; + uint8_t *oob = NULL; u32 oob_size = 0; u32 address = strtoul(args[2], NULL, 0); u32 size = strtoul(args[3], NULL, 0); diff --git a/src/flash/nand.h b/src/flash/nand.h index 0ee1ffe83f..b78eb8ecbd 100644 --- a/src/flash/nand.h +++ b/src/flash/nand.h @@ -36,14 +36,14 @@ typedef struct nand_flash_controller_s int (*register_commands)(struct command_context_s *cmd_ctx); int (*init)(struct nand_device_s *device); int (*reset)(struct nand_device_s *device); - int (*command)(struct nand_device_s *device, u8 command); - int (*address)(struct nand_device_s *device, u8 address); + int (*command)(struct nand_device_s *device, uint8_t command); + int (*address)(struct nand_device_s *device, uint8_t address); int (*write_data)(struct nand_device_s *device, u16 data); int (*read_data)(struct nand_device_s *device, void *data); - int (*write_block_data)(struct nand_device_s *device, u8 *data, int size); - int (*read_block_data)(struct nand_device_s *device, u8 *data, int size); - int (*write_page)(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); - int (*read_page)(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); + int (*write_block_data)(struct nand_device_s *device, uint8_t *data, int size); + int (*read_block_data)(struct nand_device_s *device, uint8_t *data, int size); + int (*write_page)(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); + int (*read_page)(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); int (*controller_ready)(struct nand_device_s *device, int timeout); int (*nand_ready)(struct nand_device_s *device, int timeout); } nand_flash_controller_t; @@ -208,11 +208,11 @@ enum oob_formats /* Function prototypes */ extern nand_device_t *get_nand_device_by_num(int num); -extern int nand_read_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); -extern int nand_write_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); -extern int nand_read_status(struct nand_device_s *device, u8 *status); -extern int nand_calculate_ecc(struct nand_device_s *device, const u8 *dat, u8 *ecc_code); -extern int nand_calculate_ecc_kw(struct nand_device_s *device, const u8 *dat, u8 *ecc_code); +extern int nand_read_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size); +extern int nand_write_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 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); diff --git a/src/flash/nand_ecc.c b/src/flash/nand_ecc.c index c1a18835f7..567e3b3806 100644 --- a/src/flash/nand_ecc.c +++ b/src/flash/nand_ecc.c @@ -46,7 +46,7 @@ /* * Pre-calculated 256-way 1 byte column parity */ -static const u8 nand_ecc_precalc_table[] = { +static const uint8_t nand_ecc_precalc_table[] = { 0x00, 0x55, 0x56, 0x03, 0x59, 0x0c, 0x0f, 0x5a, 0x5a, 0x0f, 0x0c, 0x59, 0x03, 0x56, 0x55, 0x00, 0x65, 0x30, 0x33, 0x66, 0x3c, 0x69, 0x6a, 0x3f, 0x3f, 0x6a, 0x69, 0x3c, 0x66, 0x33, 0x30, 0x65, 0x66, 0x33, 0x30, 0x65, 0x3f, 0x6a, 0x69, 0x3c, 0x3c, 0x69, 0x6a, 0x3f, 0x65, 0x30, 0x33, 0x66, @@ -68,9 +68,9 @@ static const u8 nand_ecc_precalc_table[] = { /* * nand_calculate_ecc - Calculate 3-byte ECC for 256-byte block */ -int nand_calculate_ecc(struct nand_device_s *device, const u8 *dat, u8 *ecc_code) +int nand_calculate_ecc(struct nand_device_s *device, const uint8_t *dat, uint8_t *ecc_code) { - u8 idx, reg1, reg2, reg3, tmp1, tmp2; + uint8_t idx, reg1, reg2, reg3, tmp1, tmp2; int i; /* Initialize variables */ @@ -84,8 +84,8 @@ int nand_calculate_ecc(struct nand_device_s *device, const u8 *dat, u8 *ecc_code /* All bit XOR = 1 ? */ if (idx & 0x40) { - reg3 ^= (u8) i; - reg2 ^= ~((u8) i); + reg3 ^= (uint8_t) i; + reg2 ^= ~((uint8_t) i); } } diff --git a/src/flash/nand_ecc_kw.c b/src/flash/nand_ecc_kw.c index a7fae62610..de73326676 100644 --- a/src/flash/nand_ecc_kw.c +++ b/src/flash/nand_ecc_kw.c @@ -100,7 +100,7 @@ static void gf_build_log_exp_table(void) * expects the ECC to be computed backward, i.e. from the last byte down * to the first one. */ -int nand_calculate_ecc_kw(struct nand_device_s *device, const u8 *data, u8 *ecc) +int nand_calculate_ecc_kw(struct nand_device_s *device, const uint8_t *data, uint8_t *ecc) { unsigned int r7, r6, r5, r4, r3, r2, r1, r0; int i; diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h index 3950e21b96..f068e10fbe 100644 --- a/src/flash/non_cfi.h +++ b/src/flash/non_cfi.h @@ -30,9 +30,9 @@ typedef struct non_cfi_s u32 dev_size; u16 interface_desc; u16 max_buf_write_size; - u8 num_erase_regions; + uint8_t num_erase_regions; u32 erase_region_info[6]; - u8 status_poll_mask; + uint8_t status_poll_mask; } non_cfi_t; extern non_cfi_t non_cfi_flashes[]; diff --git a/src/flash/ocl.c b/src/flash/ocl.c index b9028b1e8d..d6a382c874 100644 --- a/src/flash/ocl.c +++ b/src/flash/ocl.c @@ -30,7 +30,7 @@ static int ocl_register_commands(struct command_context_s *cmd_ctx); static int ocl_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int ocl_erase(struct flash_bank_s *bank, int first, int last); static int ocl_protect(struct flash_bank_s *bank, int set, int first, int last); -static int ocl_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int ocl_probe(struct flash_bank_s *bank); static int ocl_erase_check(struct flash_bank_s *bank); static int ocl_protect_check(struct flash_bank_s *bank); @@ -159,7 +159,7 @@ static int ocl_protect(struct flash_bank_s *bank, int set, int first, int last) return ERROR_OK; } -static int ocl_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { ocl_priv_t *ocl = bank->driver_priv; int retval; diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c index f1208a634b..84062f2bff 100644 --- a/src/flash/orion_nand.c +++ b/src/flash/orion_nand.c @@ -49,7 +49,7 @@ typedef struct orion_nand_controller_s } \ } while (0) -static int orion_nand_command(struct nand_device_s *device, u8 command) +static int orion_nand_command(struct nand_device_s *device, uint8_t command) { orion_nand_controller_t *hw = device->controller_priv; target_t *target = hw->target; @@ -59,7 +59,7 @@ static int orion_nand_command(struct nand_device_s *device, u8 command) return ERROR_OK; } -static int orion_nand_address(struct nand_device_s *device, u8 address) +static int orion_nand_address(struct nand_device_s *device, uint8_t address) { orion_nand_controller_t *hw = device->controller_priv; target_t *target = hw->target; @@ -89,14 +89,14 @@ static int orion_nand_write(struct nand_device_s *device, u16 data) return ERROR_OK; } -static int orion_nand_slow_block_write(struct nand_device_s *device, u8 *data, int size) +static int orion_nand_slow_block_write(struct nand_device_s *device, uint8_t *data, int size) { while (size--) orion_nand_write(device, *data++); return ERROR_OK; } -static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, int size) +static int orion_nand_fast_block_write(struct nand_device_s *device, uint8_t *data, int size) { orion_nand_controller_t *hw = device->controller_priv; target_t *target = hw->target; @@ -115,7 +115,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i int code_size = sizeof(code); if (!hw->copy_area) { - u8 code_buf[code_size]; + uint8_t code_buf[code_size]; int i; /* make sure we have a working area */ @@ -195,7 +195,7 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, { orion_nand_controller_t *hw; u32 base; - u8 ale, cle; + uint8_t ale, cle; if (argc != 3) { LOG_ERROR("arguments must be: \n"); diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c index b45902cd5b..3e816b3941 100644 --- a/src/flash/pic32mx.c +++ b/src/flash/pic32mx.c @@ -33,7 +33,7 @@ static struct pic32mx_devs_s { - u8 devid; + uint8_t devid; char *name; u32 pfm_size; } pic32mx_devs[] = { @@ -61,7 +61,7 @@ static int pic32mx_register_commands(struct command_context_s *cmd_ctx); static int pic32mx_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int pic32mx_erase(struct flash_bank_s *bank, int first, int last); static int pic32mx_protect(struct flash_bank_s *bank, int set, int first, int last); -static int pic32mx_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int pic32mx_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int pic32mx_write_row(struct flash_bank_s *bank, u32 address, u32 srcaddr); static int pic32mx_write_word(struct flash_bank_s *bank, u32 address, u32 word); static int pic32mx_probe(struct flash_bank_s *bank); @@ -348,7 +348,7 @@ static int pic32mx_protect(struct flash_bank_s *bank, int set, int first, int la #endif } -static int pic32mx_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { target_t *target = bank->target; u32 buffer_size = 512; @@ -359,7 +359,7 @@ static int pic32mx_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset pic32mx_flash_bank_t *pic32mx_info = bank->driver_priv; armv7m_algorithm_t armv7m_info; - u8 pic32mx_flash_write_code[] = { + uint8_t pic32mx_flash_write_code[] = { /* write: */ 0xDF, 0xF8, 0x24, 0x40, /* ldr r4, PIC32MX_FLASH_CR */ 0x09, 0x4D, /* ldr r5, PIC32MX_FLASH_SR */ @@ -511,7 +511,7 @@ static int pic32mx_write_row(struct flash_bank_s *bank, u32 address, u32 srcaddr return pic32mx_nvm_exec(bank, NVMCON_OP_ROW_PROG, 100); } -static int pic32mx_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int pic32mx_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { u32 words_remaining = (count / 4); u32 bytes_remaining = (count & 0x00000003); diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c index 7a642ee79c..6f5d3dfa1d 100644 --- a/src/flash/s3c2410_nand.c +++ b/src/flash/s3c2410_nand.c @@ -118,7 +118,7 @@ static int s3c2410_nand_ready(struct nand_device_s *device, int timeout) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; - u8 status; + uint8_t status; if (target->state != TARGET_HALTED) { LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c index 85a50989ac..cd447104e3 100644 --- a/src/flash/s3c2440_nand.c +++ b/src/flash/s3c2440_nand.c @@ -94,7 +94,7 @@ int s3c2440_nand_ready(struct nand_device_s *device, int timeout) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; - u8 status; + uint8_t status; if (target->state != TARGET_HALTED) { LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); @@ -116,7 +116,7 @@ int s3c2440_nand_ready(struct nand_device_s *device, int timeout) /* use the fact we can read/write 4 bytes in one go via a single 32bit op */ -int s3c2440_read_block_data(struct nand_device_s *device, u8 *data, int data_size) +int s3c2440_read_block_data(struct nand_device_s *device, uint8_t *data, int data_size) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; @@ -152,7 +152,7 @@ int s3c2440_read_block_data(struct nand_device_s *device, u8 *data, int data_siz return ERROR_OK; } -int s3c2440_write_block_data(struct nand_device_s *device, u8 *data, int data_size) +int s3c2440_write_block_data(struct nand_device_s *device, uint8_t *data, int data_size) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c index a26ac2d9cb..8be5f0212f 100644 --- a/src/flash/s3c24xx_nand.c +++ b/src/flash/s3c24xx_nand.c @@ -75,7 +75,7 @@ int s3c24xx_reset(struct nand_device_s *device) return ERROR_OK; } -int s3c24xx_command(struct nand_device_s *device, u8 command) +int s3c24xx_command(struct nand_device_s *device, uint8_t command) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; @@ -90,7 +90,7 @@ int s3c24xx_command(struct nand_device_s *device, u8 command) } -int s3c24xx_address(struct nand_device_s *device, u8 address) +int s3c24xx_address(struct nand_device_s *device, uint8_t address) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; diff --git a/src/flash/s3c24xx_nand.h b/src/flash/s3c24xx_nand.h index 99e4cf0a92..a4406832e1 100644 --- a/src/flash/s3c24xx_nand.h +++ b/src/flash/s3c24xx_nand.h @@ -46,8 +46,8 @@ extern s3c24xx_nand_controller_t *s3c24xx_nand_device_command(struct command_con 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, u8 command); -extern int s3c24xx_address(struct nand_device_s *device, u8 address); +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, u16 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); @@ -59,5 +59,5 @@ extern int s3c24xx_controller_ready(struct nand_device_s *device, int tout); extern int s3c2440_nand_ready(struct nand_device_s *device, int timeout); -extern int s3c2440_read_block_data(struct nand_device_s *, u8 *data, int data_size); -extern int s3c2440_write_block_data(struct nand_device_s *, u8 *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); diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c index 97727909d9..cc9cd53f28 100644 --- a/src/flash/stellaris.c +++ b/src/flash/stellaris.c @@ -38,7 +38,7 @@ static int stellaris_register_commands(struct command_context_s *cmd_ctx); static int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int stellaris_erase(struct flash_bank_s *bank, int first, int last); static int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last); -static int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int stellaris_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int stellaris_auto_probe(struct flash_bank_s *bank); static int stellaris_probe(struct flash_bank_s *bank); static int stellaris_protect_check(struct flash_bank_s *bank); @@ -412,7 +412,7 @@ static u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int time } /* Send one command to the flash controller */ -static int stellaris_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen) +static int stellaris_flash_command(struct flash_bank_s *bank,uint8_t cmd,u16 pagen) { u32 fmc; target_t *target = bank->target; @@ -681,7 +681,7 @@ static int stellaris_protect(struct flash_bank_s *bank, int set, int first, int return ERROR_OK; } -static u8 stellaris_write_code[] = +static uint8_t stellaris_write_code[] = { /* Call with : @@ -721,7 +721,7 @@ static u8 stellaris_write_code[] = 0x01,0x00,0x42,0xA4 /* .word 0xA4420001 */ }; -static int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 wcount) +static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 wcount) { target_t *target = bank->target; u32 buffer_size = 8192; @@ -801,7 +801,7 @@ static int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offs return retval; } -static int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int stellaris_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { stellaris_flash_bank_t *stellaris_info = bank->driver_priv; target_t *target = bank->target; @@ -901,7 +901,7 @@ static int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u3 if (bytes_remaining) { - u8 last_word[4] = {0xff, 0xff, 0xff, 0xff}; + uint8_t last_word[4] = {0xff, 0xff, 0xff, 0xff}; int i = 0; while(bytes_remaining > 0) diff --git a/src/flash/stellaris.h b/src/flash/stellaris.h index 3694feb3b7..c6181be039 100644 --- a/src/flash/stellaris.h +++ b/src/flash/stellaris.h @@ -45,7 +45,7 @@ typedef struct stellaris_flash_bank_s /* main clock status */ u32 rcc; - u8 mck_valid; + uint8_t mck_valid; u32 mck_freq; } stellaris_flash_bank_t; diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index b0d6976777..0f49fae71d 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -33,7 +33,7 @@ static int stm32x_register_commands(struct command_context_s *cmd_ctx); static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int stm32x_erase(struct flash_bank_s *bank, int first, int last); static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int stm32x_probe(struct flash_bank_s *bank); static int stm32x_auto_probe(struct flash_bank_s *bank); //static int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -477,7 +477,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las return stm32x_write_options(bank); } -static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { stm32x_flash_bank_t *stm32x_info = bank->driver_priv; target_t *target = bank->target; @@ -488,7 +488,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, armv7m_algorithm_t armv7m_info; int retval = ERROR_OK; - u8 stm32x_flash_write_code[] = { + uint8_t stm32x_flash_write_code[] = { /* write: */ 0xDF, 0xF8, 0x24, 0x40, /* ldr r4, STM32_FLASH_CR */ 0x09, 0x4D, /* ldr r5, STM32_FLASH_SR */ @@ -596,14 +596,14 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, return retval; } -static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { target_t *target = bank->target; u32 words_remaining = (count / 2); u32 bytes_remaining = (count & 0x00000001); u32 address = bank->base + offset; u32 bytes_written = 0; - u8 status; + uint8_t status; int retval; if (bank->target->state != TARGET_HALTED) @@ -1063,25 +1063,25 @@ static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, target_read_u32(target, STM32_FLASH_OBR, &optionbyte); command_print(cmd_ctx, "Option Byte: 0x%x", optionbyte); - if (buf_get_u32((u8*)&optionbyte, OPT_ERROR, 1)) + if (buf_get_u32((uint8_t*)&optionbyte, OPT_ERROR, 1)) command_print(cmd_ctx, "Option Byte Complement Error"); - if (buf_get_u32((u8*)&optionbyte, OPT_READOUT, 1)) + if (buf_get_u32((uint8_t*)&optionbyte, OPT_READOUT, 1)) command_print(cmd_ctx, "Readout Protection On"); else command_print(cmd_ctx, "Readout Protection Off"); - if (buf_get_u32((u8*)&optionbyte, OPT_RDWDGSW, 1)) + if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDWDGSW, 1)) command_print(cmd_ctx, "Software Watchdog"); else command_print(cmd_ctx, "Hardware Watchdog"); - if (buf_get_u32((u8*)&optionbyte, OPT_RDRSTSTOP, 1)) + if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTOP, 1)) command_print(cmd_ctx, "Stop: No reset generated"); else command_print(cmd_ctx, "Stop: Reset generated"); - if (buf_get_u32((u8*)&optionbyte, OPT_RDRSTSTDBY, 1)) + if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTDBY, 1)) command_print(cmd_ctx, "Standby: No reset generated"); else command_print(cmd_ctx, "Standby: Reset generated"); diff --git a/src/flash/str7x.c b/src/flash/str7x.c index 88f4f9eb7f..67b0a751f8 100644 --- a/src/flash/str7x.c +++ b/src/flash/str7x.c @@ -49,7 +49,7 @@ static int str7x_register_commands(struct command_context_s *cmd_ctx); static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int str7x_erase(struct flash_bank_s *bank, int first, int last); static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int str7x_probe(struct flash_bank_s *bank); //static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int str7x_protect_check(struct flash_bank_s *bank); @@ -345,7 +345,7 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last return ERROR_OK; } -static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { str7x_flash_bank_t *str7x_info = bank->driver_priv; target_t *target = bank->target; @@ -389,7 +389,7 @@ static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; }; - target_write_buffer(target, str7x_info->write_algorithm->address, 20 * 4, (u8*)str7x_flash_write_code); + target_write_buffer(target, str7x_info->write_algorithm->address, 20 * 4, (uint8_t*)str7x_flash_write_code); /* memory buffer */ while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) @@ -460,7 +460,7 @@ static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, return retval; } -static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { target_t *target = bank->target; str7x_flash_bank_t *str7x_info = bank->driver_priv; @@ -575,7 +575,7 @@ static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 co if (bytes_remaining) { - u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; int i = 0; while(bytes_remaining > 0) diff --git a/src/flash/str9x.c b/src/flash/str9x.c index b9490656cd..c6c366e9ab 100644 --- a/src/flash/str9x.c +++ b/src/flash/str9x.c @@ -37,7 +37,7 @@ static int str9x_register_commands(struct command_context_s *cmd_ctx); static int str9x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int str9x_erase(struct flash_bank_s *bank, int first, int last); static int str9x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int str9x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int str9x_probe(struct flash_bank_s *bank); //static int str9x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int str9x_protect_check(struct flash_bank_s *bank); @@ -257,8 +257,8 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last) target_t *target = bank->target; int i; u32 adr; - u8 status; - u8 erase_cmd; + uint8_t status; + uint8_t erase_cmd; if (bank->target->state != TARGET_HALTED) { @@ -350,7 +350,7 @@ static int str9x_protect(struct flash_bank_s *bank, target_t *target = bank->target; int i; u32 adr; - u8 status; + uint8_t status; if (bank->target->state != TARGET_HALTED) { @@ -384,7 +384,7 @@ static int str9x_protect(struct flash_bank_s *bank, } static int str9x_write_block(struct flash_bank_s *bank, - u8 *buffer, u32 offset, u32 count) + uint8_t *buffer, u32 offset, u32 count) { str9x_flash_bank_t *str9x_info = bank->driver_priv; target_t *target = bank->target; @@ -427,7 +427,7 @@ static int str9x_write_block(struct flash_bank_s *bank, return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; }; - target_write_buffer(target, str9x_info->write_algorithm->address, 19 * 4, (u8*)str9x_flash_write_code); + target_write_buffer(target, str9x_info->write_algorithm->address, 19 * 4, (uint8_t*)str9x_flash_write_code); /* memory buffer */ while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) @@ -493,14 +493,14 @@ static int str9x_write_block(struct flash_bank_s *bank, } static int str9x_write(struct flash_bank_s *bank, - u8 *buffer, u32 offset, u32 count) + uint8_t *buffer, u32 offset, u32 count) { target_t *target = bank->target; u32 words_remaining = (count / 2); u32 bytes_remaining = (count & 0x00000001); u32 address = bank->base + offset; u32 bytes_written = 0; - u8 status; + uint8_t status; int retval; u32 check_address = offset; u32 bank_adr; @@ -604,7 +604,7 @@ static int str9x_write(struct flash_bank_s *bank, if (bytes_remaining) { - u8 last_halfword[2] = {0xff, 0xff}; + uint8_t last_halfword[2] = {0xff, 0xff}; int i = 0; while(bytes_remaining > 0) diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index 2c243a97a5..71f58c2576 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -32,7 +32,7 @@ static int str9xpec_register_commands(struct command_context_s *cmd_ctx); static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int str9xpec_erase(struct flash_bank_s *bank, int first, int last); static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); static int str9xpec_probe(struct flash_bank_s *bank); static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int str9xpec_protect_check(struct flash_bank_s *bank); @@ -40,7 +40,7 @@ static int str9xpec_erase_check(struct flash_bank_s *bank); static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size); static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last); -static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector); +static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector); static int str9xpec_write_options(struct flash_bank_s *bank); static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -123,10 +123,10 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state) return ERROR_OK; } -static u8 str9xpec_isc_status(jtag_tap_t *tap) +static uint8_t str9xpec_isc_status(jtag_tap_t *tap) { scan_field_t field; - u8 status; + uint8_t status; if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK) return ISC_STATUS_ERROR; @@ -150,7 +150,7 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap) static int str9xpec_isc_enable(struct flash_bank_s *bank) { - u8 status; + uint8_t status; jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -177,7 +177,7 @@ static int str9xpec_isc_enable(struct flash_bank_s *bank) static int str9xpec_isc_disable(struct flash_bank_s *bank) { - u8 status; + uint8_t status; jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -207,7 +207,7 @@ static int str9xpec_isc_disable(struct flash_bank_s *bank) static int str9xpec_read_config(struct flash_bank_s *bank) { scan_field_t field; - u8 status; + uint8_t status; jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -339,10 +339,10 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char * static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) { scan_field_t field; - u8 status; + uint8_t status; jtag_tap_t *tap; int i; - u8 *buffer = NULL; + uint8_t *buffer = NULL; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -405,7 +405,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) static int str9xpec_protect_check(struct flash_bank_s *bank) { - u8 status; + uint8_t status; int i; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -428,10 +428,10 @@ static int str9xpec_protect_check(struct flash_bank_s *bank) static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) { scan_field_t field; - u8 status; + uint8_t status; jtag_tap_t *tap; int i; - u8 *buffer = NULL; + uint8_t *buffer = NULL; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -510,7 +510,7 @@ static int str9xpec_erase(struct flash_bank_s *bank, int first, int last) static int str9xpec_lock_device(struct flash_bank_s *bank) { scan_field_t field; - u8 status; + uint8_t status; jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = NULL; @@ -551,7 +551,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank) static int str9xpec_unlock_device(struct flash_bank_s *bank) { - u8 status; + uint8_t status; status = str9xpec_erase_area(bank, 0, 255); @@ -560,7 +560,7 @@ static int str9xpec_unlock_device(struct flash_bank_s *bank) static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last) { - u8 status; + uint8_t status; int i; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -604,7 +604,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l return ERROR_OK; } -static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector) +static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector) { jtag_tap_t *tap; scan_field_t field; @@ -625,17 +625,17 @@ static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector) return ERROR_OK; } -static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count) { str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; u32 dwords_remaining = (count / 8); u32 bytes_remaining = (count & 0x00000007); u32 bytes_written = 0; - u8 status; + uint8_t status; u32 check_address = offset; jtag_tap_t *tap; scan_field_t field; - u8 *scanbuf; + uint8_t *scanbuf; int i; int first_sector = 0; int last_sector = 0; @@ -737,7 +737,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 if (bytes_remaining) { - u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; int i = 0; while(bytes_remaining > 0) @@ -797,7 +797,7 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch { flash_bank_t *bank; scan_field_t field; - u8 *buffer = NULL; + uint8_t *buffer = NULL; jtag_tap_t *tap; u32 idcode; str9xpec_flash_controller_t *str9xpec_info = NULL; @@ -852,7 +852,7 @@ static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size) static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *bank; - u8 status; + uint8_t status; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 1) @@ -911,7 +911,7 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s * static int str9xpec_write_options(struct flash_bank_s *bank) { scan_field_t field; - u8 status; + uint8_t status; jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = NULL; @@ -972,7 +972,7 @@ static int str9xpec_write_options(struct flash_bank_s *bank) static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *bank; - u8 status; + uint8_t status; if (argc < 1) { @@ -1125,7 +1125,7 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - u8 status; + uint8_t status; flash_bank_t *bank; if (argc < 1) @@ -1151,7 +1151,7 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - u8 status; + uint8_t status; flash_bank_t *bank; if (argc < 1) diff --git a/src/flash/str9xpec.h b/src/flash/str9xpec.h index 250e251b5b..fb3333fd9c 100644 --- a/src/flash/str9xpec.h +++ b/src/flash/str9xpec.h @@ -32,7 +32,7 @@ typedef struct str9xpec_flash_controller_s u32 *sector_bits; int chain_pos; int isc_enable; - u8 options[8]; + uint8_t options[8]; } str9xpec_flash_controller_t; enum str9xpec_status_codes diff --git a/src/flash/tms470.c b/src/flash/tms470.c index 1d7497f1fd..7c79b5f8f5 100644 --- a/src/flash/tms470.c +++ b/src/flash/tms470.c @@ -28,7 +28,7 @@ static int tms470_register_commands(struct command_context_s *cmd_ctx); static int tms470_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int tms470_erase(struct flash_bank_s *bank, int first, int last); static int tms470_protect(struct flash_bank_s *bank, int set, int first, int last); -static int tms470_write(struct flash_bank_s *bank, u8 * buffer, u32 offset, u32 count); +static int tms470_write(struct flash_bank_s *bank, uint8_t * buffer, u32 offset, u32 count); static int tms470_probe(struct flash_bank_s *bank); static int tms470_auto_probe(struct flash_bank_s *bank); static int tms470_erase_check(struct flash_bank_s *bank); @@ -949,7 +949,7 @@ static int tms470_protect(struct flash_bank_s *bank, int set, int first, int las /* ---------------------------------------------------------------------- */ -static int tms470_write(struct flash_bank_s *bank, u8 * buffer, u32 offset, u32 count) +static int tms470_write(struct flash_bank_s *bank, uint8_t * buffer, u32 offset, u32 count) { target_t *target = bank->target; u32 glbctrl, fmbac2, orig_fmregopt, fmbsea, fmbseb, fmmaxpp, fmmstat; @@ -1075,7 +1075,7 @@ static int tms470_erase_check(struct flash_bank_s *bank) tms470_flash_bank_t *tms470_info = bank->driver_priv; int sector, result = ERROR_OK; u32 fmmac2, fmbac2, glbctrl, orig_fmregopt; - static u8 buffer[64 * 1024]; + static uint8_t buffer[64 * 1024]; if (target->state != TARGET_HALTED) { -- 2.30.2