summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorSpencer Oliver <ntfreak@users.sourceforge.net>2010-12-08 10:57:36 +0000
committerSpencer Oliver <ntfreak@users.sourceforge.net>2010-12-10 13:36:07 +0000
commit6165f14ee2c56c5cce51663d700d888fc2d96fdb (patch)
tree87742c887986848391d2a0053c8734009156d5c3 /src/flash
parentb3052b614c80b08ff7353ce5d1f765ca8420cadb (diff)
downloadopenocd+libswd-6165f14ee2c56c5cce51663d700d888fc2d96fdb.tar.gz
openocd+libswd-6165f14ee2c56c5cce51663d700d888fc2d96fdb.tar.bz2
openocd+libswd-6165f14ee2c56c5cce51663d700d888fc2d96fdb.tar.xz
openocd+libswd-6165f14ee2c56c5cce51663d700d888fc2d96fdb.zip
cfi: add time format to cfi query output
Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/nor/cfi.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 01fffd71..9a1e8d73 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2558,13 +2558,13 @@ static int cfi_probe(struct flash_bank *bank)
(cfi_info->vpp_min & 0xf0) >> 4, cfi_info->vpp_min & 0x0f,
(cfi_info->vpp_max & 0xf0) >> 4, cfi_info->vpp_max & 0x0f);
- LOG_DEBUG("typ. word write timeout: %u, typ. buf write timeout: %u, "
- "typ. block erase timeout: %u, typ. chip erase timeout: %u",
+ LOG_DEBUG("typ. word write timeout: %u us, typ. buf write timeout: %u us, "
+ "typ. block erase timeout: %u ms, typ. chip erase timeout: %u ms",
1 << cfi_info->word_write_timeout_typ, 1 << cfi_info->buf_write_timeout_typ,
1 << cfi_info->block_erase_timeout_typ, 1 << cfi_info->chip_erase_timeout_typ);
- LOG_DEBUG("max. word write timeout: %u, max. buf write timeout: %u, "
- "max. block erase timeout: %u, max. chip erase timeout: %u",
+ LOG_DEBUG("max. word write timeout: %u us, max. buf write timeout: %u us, "
+ "max. block erase timeout: %u ms, max. chip erase timeout: %u ms",
(1 << cfi_info->word_write_timeout_max) * (1 << cfi_info->word_write_timeout_typ),
(1 << cfi_info->buf_write_timeout_max) * (1 << cfi_info->buf_write_timeout_typ),
(1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),
@@ -2861,8 +2861,10 @@ static int get_cfi_info(struct flash_bank *bank, char *buf, int buf_size)
buf += printed;
buf_size -= printed;
- printed = snprintf(buf, buf_size, "typ. word write timeout: %u, "
- "typ. buf write timeout: %u, typ. block erase timeout: %u, typ. chip erase timeout: %u\n",
+ printed = snprintf(buf, buf_size, "typ. word write timeout: %u us, "
+ "typ. buf write timeout: %u us, "
+ "typ. block erase timeout: %u ms, "
+ "typ. chip erase timeout: %u ms\n",
1 << cfi_info->word_write_timeout_typ,
1 << cfi_info->buf_write_timeout_typ,
1 << cfi_info->block_erase_timeout_typ,
@@ -2870,8 +2872,9 @@ static int get_cfi_info(struct flash_bank *bank, char *buf, int buf_size)
buf += printed;
buf_size -= printed;
- printed = snprintf(buf, buf_size, "max. word write timeout: %u, "
- "max. buf write timeout: %u, max. block erase timeout: %u, max. chip erase timeout: %u\n",
+ printed = snprintf(buf, buf_size, "max. word write timeout: %u us, "
+ "max. buf write timeout: %u us, max. "
+ "block erase timeout: %u ms, max. chip erase timeout: %u ms\n",
(1 << cfi_info->word_write_timeout_max) * (1 << cfi_info->word_write_timeout_typ),
(1 << cfi_info->buf_write_timeout_max) * (1 << cfi_info->buf_write_timeout_typ),
(1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),