interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change %x and %d to PRIx32 and PRId32 where needed for cygwin

This commit is contained in:
Daniel Bäder 2010-03-25 11:24:42 +01:00 committed by Øyvind Harboe
parent e736468b0e
commit 010492a1ed
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nand/lpc3180.c
View File

@ -817,7 +817,7 @@ static int lpc3180_write_page(struct nand_device *nand, uint32_t page, uint8_t *
target_free_working_area(target,pworking_area); target_free_working_area(target,pworking_area);
LOG_INFO("Page = 0x%x was written.",page); LOG_INFO("Page = 0x%" PRIx32 " was written.",page);
} }
else else
@ -1112,7 +1112,7 @@ static int lpc3180_read_page(struct nand_device *nand, uint32_t page, uint8_t *d
target_read_memory(target, target_mem_base+DATA_OFFS, 4, nand->page_size == 2048?512:128, page_buffer); target_read_memory(target, target_mem_base+DATA_OFFS, 4, nand->page_size == 2048?512:128, page_buffer);
memcpy(data, page_buffer, data_size); memcpy(data, page_buffer, data_size);
LOG_INFO("Page = 0x%x was read.",page); LOG_INFO("Page = 0x%" PRIx32 " was read.",page);
/* check hw generated ECC for each 256 bytes block with the saved ECC in flash spare area*/ /* check hw generated ECC for each 256 bytes block with the saved ECC in flash spare area*/
int idx = nand->page_size/0x200 ; int idx = nand->page_size/0x200 ;
@ -1120,9 +1120,9 @@ static int lpc3180_read_page(struct nand_device *nand, uint32_t page, uint8_t *d
target_read_memory(target, target_mem_base+ECC_OFFS, 4, 8, ecc_hw_buffer); target_read_memory(target, target_mem_base+ECC_OFFS, 4, 8, ecc_hw_buffer);
for(i=0;i<idx;i++){ for(i=0;i<idx;i++){
if( (0x00ffffff&*(uint32_t *)(ecc_hw_buffer+i*8)) != (0x00ffffff&*(uint32_t *)(ecc_flash_buffer+8+i*16)) ) if( (0x00ffffff&*(uint32_t *)(ecc_hw_buffer+i*8)) != (0x00ffffff&*(uint32_t *)(ecc_flash_buffer+8+i*16)) )
LOG_WARNING("ECC mismatch at 256 bytes size block= %d at page= 0x%x",i*2+1,page); LOG_WARNING("ECC mismatch at 256 bytes size block= %d at page= 0x%" PRIx32,i*2+1,page);
if( (0x00ffffff&*(uint32_t *)(ecc_hw_buffer+4+i*8)) != (0x00ffffff&*(uint32_t *)(ecc_flash_buffer+12+i*16)) ) if( (0x00ffffff&*(uint32_t *)(ecc_hw_buffer+4+i*8)) != (0x00ffffff&*(uint32_t *)(ecc_flash_buffer+12+i*16)) )
LOG_WARNING("ECC mismatch at 256 bytes size block= %d at page= 0x%x",i*2+2,page); LOG_WARNING("ECC mismatch at 256 bytes size block= %d at page= 0x%" PRIx32,i*2+2,page);
} }
} }

2
src/flash/nor/pic32mx.c
View File

@ -558,7 +558,7 @@ static int pic32mx_probe(struct flash_bank *bank)
} }
} }
LOG_INFO("flash size = %dkbytes", num_pages / 1024); LOG_INFO("flash size = %" PRId32 "kbytes", num_pages / 1024);
/* calculate numbers of pages */ /* calculate numbers of pages */
num_pages /= page_size; num_pages /= page_size;

2
src/target/arm_adi_v5.c
View File

@ -967,7 +967,7 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
retval = dap_queue_ap_read(dap, AP_REG_IDR, &idreg); retval = dap_queue_ap_read(dap, AP_REG_IDR, &idreg);
retval = dap_queue_ap_read(dap, AP_REG_BASE, &romaddr); retval = dap_queue_ap_read(dap, AP_REG_BASE, &romaddr);
LOG_DEBUG("MEM-AP #%d ID Register 0x%" PRIx32 LOG_DEBUG("MEM-AP #%" PRId32 " ID Register 0x%" PRIx32
", Debug ROM Address 0x%" PRIx32, ", Debug ROM Address 0x%" PRIx32,
dap->apsel, idreg, romaddr); dap->apsel, idreg, romaddr);

2
src/target/arm_dpm.c
View File

@ -718,7 +718,7 @@ static int dpm_bpwp_setup(struct arm_dpm *dpm, struct dpm_bpwp *xp,
xp->control = control; xp->control = control;
xp->dirty = true; xp->dirty = true;
LOG_DEBUG("BPWP: addr %8.8x, control %x, number %d", LOG_DEBUG("BPWP: addr %8.8" PRIx32 ", control %" PRIx32 ", number %d",
xp->address, control, xp->number); xp->address, control, xp->number);
/* hardware is updated in write_dirty_registers() */ /* hardware is updated in write_dirty_registers() */