Am 17.02.2012 03:25 schrieb Stefan Tauner:
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at
we were wrong regarding the probing process... the generic probes are executed apparently. this patch degrades all failure outputs (but OOM) to dbg.
Not sure if you want to reindent the messages for the cinfo->cdbg change. Either way is OK.
Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Regards, Carl-Daniel
On Fri, 17 Feb 2012 15:20:59 +0100 Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net wrote:
Am 17.02.2012 03:25 schrieb Stefan Tauner:
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at
we were wrong regarding the probing process... the generic probes are executed apparently. this patch degrades all failure outputs (but OOM) to dbg.
Not sure if you want to reindent the messages for the cinfo->cdbg change. Either way is OK.
Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Regards, Carl-Daniel
Thanks! committed in r1500 with a grin. :)
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at ---
Please grant me a coding style exception regarding using pointers as logical values because i obviously can not grasp them :P
sfdp.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sfdp.c b/sfdp.c index 75dfb5f..cd01faa 100644 --- a/sfdp.c +++ b/sfdp.c @@ -79,7 +79,7 @@ static int sfdp_add_uniform_eraser(struct flashctx *flash, uint8_t opcode, uint3 erasefunc_t *erasefn = spi_get_erasefn_from_opcode(opcode);
if (erasefn == NULL || block_size == 0 || total_size % block_size != 0) { - msg_cdbg("%s: invalid input\n", __func__); + msg_cdbg("%s: invalid input.\n", __func__); return 1; }
@@ -89,11 +89,12 @@ static int sfdp_add_uniform_eraser(struct flashctx *flash, uint8_t opcode, uint3 if (eraser->eraseblocks[0].size == block_size && eraser->block_erase == erasefn) { msg_cdbg2(" Tried to add a duplicate block eraser: " - "%d x %d B with opcode 0x%02x\n", + "%d x %d B with opcode 0x%02x.\n", total_size/block_size, block_size, opcode); return 1; } - if (eraser->eraseblocks[0].size != 0 || !eraser->block_erase) { + if (eraser->eraseblocks[0].size != 0 || + eraser->block_erase != NULL) { msg_cspew(" Block Eraser %d is already occupied.\n", i); continue;