From: Franck Jullien <franck.jullien@gmail.com>
Date: Tue, 24 Dec 2013 09:07:14 +0000 (+0100)
Subject: target/image: allow for comments in IHEX files
X-Git-Tag: v0.8.0-rc1~143
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f4947e8b88059f55445c4606578d7e195de6baed;p=openocd

target/image: allow for comments in IHEX files

This is not in the Intel hex file format specification but
some hex files may include comments (i.e. Altera USB-Blaster II
firmware) starting with '#'.

This patch makes image_ihex_buffer_complete_inner to skip
comment lines.

Change-Id: Id1f57d84d75da45e592f1c72b2b8c29193bc14e3
Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
Reviewed-on: http://openocd.zylin.com/1842
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---

diff --git a/src/target/image.c b/src/target/image.c
index f47ba227..8bcba349 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -152,6 +152,9 @@ static int image_ihex_buffer_complete_inner(struct image *image,
 		uint8_t cal_checksum = 0;
 		size_t bytes_read = 0;
 
+		if (lpszLine[0] == '#')
+			continue;
+
 		if (sscanf(&lpszLine[bytes_read], ":%2" SCNx32 "%4" SCNx32 "%2" SCNx32, &count,
 			&address, &record_type) != 3)
 			return ERROR_IMAGE_FORMAT_ERROR;