openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Print dummy programmer messages only if verbose mode is selected

Browse Source 
Print the return value of dummy_chip_read[bwl].
Align entries in programmer_table.

This is a cosmetic patch and has no effect on code flow.

Corresponding to flashrom svn r495.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Carl-Daniel Hailfinger 2009-05-11 15:46:43 +00:00
parent 8130f2d3ec
commit 1e334e619b
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dummyflasher.c
View File

@ -30,59 +30,59 @@
int dummy_init(void) int dummy_init(void)
{ {
printf("%s\n", __func__); printf_debug("%s\n", __func__);
return 0; return 0;
} }
int dummy_shutdown(void) int dummy_shutdown(void)
{ {
printf("%s\n", __func__); printf_debug("%s\n", __func__);
return 0; return 0;
} }
void *dummy_map(const char *descr, unsigned long phys_addr, size_t len) void *dummy_map(const char *descr, unsigned long phys_addr, size_t len)
{ {
printf("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n", printf_debug("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n",
__func__, descr, (unsigned long)len, phys_addr); __func__, descr, (unsigned long)len, phys_addr);
return (void *)phys_addr; return (void *)phys_addr;
} }
void dummy_unmap(void *virt_addr, size_t len) void dummy_unmap(void *virt_addr, size_t len)
{ {
printf("%s: Unmapping 0x%lx bytes at %p\n", printf_debug("%s: Unmapping 0x%lx bytes at %p\n",
__func__, (unsigned long)len, virt_addr); __func__, (unsigned long)len, virt_addr);
} }
void dummy_chip_writeb(uint8_t val, volatile void *addr) void dummy_chip_writeb(uint8_t val, volatile void *addr)
{ {
printf("%s: addr=%p, val=0x%02x\n", __func__, addr, val); printf_debug("%s: addr=%p, val=0x%02x\n", __func__, addr, val);
} }
void dummy_chip_writew(uint16_t val, volatile void *addr) void dummy_chip_writew(uint16_t val, volatile void *addr)
{ {
printf("%s: addr=%p, val=0x%04x\n", __func__, addr, val); printf_debug("%s: addr=%p, val=0x%04x\n", __func__, addr, val);
} }
void dummy_chip_writel(uint32_t val, volatile void *addr) void dummy_chip_writel(uint32_t val, volatile void *addr)
{ {
printf("%s: addr=%p, val=0x%08x\n", __func__, addr, val); printf_debug("%s: addr=%p, val=0x%08x\n", __func__, addr, val);
} }
uint8_t dummy_chip_readb(const volatile void *addr) uint8_t dummy_chip_readb(const volatile void *addr)
{ {
printf("%s: addr=%p\n", __func__, addr); printf_debug("%s: addr=%p, returning 0xff\n", __func__, addr);
return 0xff; return 0xff;
} }
uint16_t dummy_chip_readw(const volatile void *addr) uint16_t dummy_chip_readw(const volatile void *addr)
{ {
printf("%s: addr=%p\n", __func__, addr); printf_debug("%s: addr=%p, returning 0xffff\n", __func__, addr);
return 0xffff; return 0xffff;
} }
uint32_t dummy_chip_readl(const volatile void *addr) uint32_t dummy_chip_readl(const volatile void *addr)
{ {
printf("%s: addr=%p\n", __func__, addr); printf_debug("%s: addr=%p, returning 0xffffffff\n", __func__, addr);
return 0xffffffff; return 0xffffffff;
} }

32
flashrom.c
View File

@ -38,29 +38,29 @@ int programmer = PROGRAMMER_INTERNAL;
const struct programmer_entry programmer_table[] = { const struct programmer_entry programmer_table[] = {
{ {
.init = internal_init, .init = internal_init,
.shutdown = internal_shutdown, .shutdown = internal_shutdown,
.map_flash_region = physmap, .map_flash_region = physmap,
.unmap_flash_region = physunmap, .unmap_flash_region = physunmap,
.chip_readb = internal_chip_readb, .chip_readb = internal_chip_readb,
.chip_readw = internal_chip_readw, .chip_readw = internal_chip_readw,
.chip_readl = internal_chip_readl, .chip_readl = internal_chip_readl,
.chip_writeb = internal_chip_writeb, .chip_writeb = internal_chip_writeb,
.chip_writew = internal_chip_writew, .chip_writew = internal_chip_writew,
.chip_writel = internal_chip_writel, .chip_writel = internal_chip_writel,
}, },
{ {
.init = dummy_init, .init = dummy_init,
.shutdown = dummy_shutdown, .shutdown = dummy_shutdown,
.map_flash_region = dummy_map, .map_flash_region = dummy_map,
.unmap_flash_region = dummy_unmap, .unmap_flash_region = dummy_unmap,
.chip_readb = dummy_chip_readb, .chip_readb = dummy_chip_readb,
.chip_readw = dummy_chip_readw, .chip_readw = dummy_chip_readw,
.chip_readl = dummy_chip_readl, .chip_readl = dummy_chip_readl,
.chip_writeb = dummy_chip_writeb, .chip_writeb = dummy_chip_writeb,
.chip_writew = dummy_chip_writew, .chip_writew = dummy_chip_writew,
.chip_writel = dummy_chip_writel, .chip_writel = dummy_chip_writel,
}, },
{}, {},