ihex2cyacd: fix hex parsing

Author: Clément Léger

ihex2cyacd/Makefile

@@ -12,16 +12,17 @@ LFLAGS :=
 all: ihex2cyacd
 
 $(BUILD_DIR)/ihex2cyacd_cmdline.c: $(SRC_DIR)/ihex2cyacd.ggo
+	@mkdir -p $(dir $@)
 	gengetopt -i $< -F ihex2cyacd_cmdline --output-dir=$(BUILD_DIR)/ --func-name=ihex2cyacd_cmdline_parser -a ihex2cyacd_args_info
 
 $(BUILD_DIR)/ihex2cyacd_cmdline.h: $(BUILD_DIR)/ihex2cyacd_cmdline.c
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/ihex2cyacd_cmdline.h
-	@mkdir -p $(BUILD_DIR)
+	@mkdir -p $(dir $@)
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c
-	@mkdir -p $(BUILD_DIR)
+	@mkdir -p $(dir $@)
 	$(CC) -c -o $@ $^ $(CFLAGS) 
 
 ihex2cyacd: $(OBJ_FILES) $(BUILD_DIR)/ihex2cyacd_cmdline.o

ihex2cyacd/src/ihex2cyacd.c

@@ -19,35 +19,42 @@
 struct cyacd_header_info {
 	uint32_t silicon_id;
 	uint8_t silicon_rev;
+	uint16_t flash_row_size;
 };
 
 static struct cyacd_header_info header_infos[] = 
 {
-	[cpu_arg_CY8C41] = {0x04161193, 0x11},
-	[cpu_arg_CY8C42] = {0x04C81193, 0x11},
+	[cpu_arg_CY8C41] = {0x04161193, 0x11, 128},
+	[cpu_arg_CY8C42] = {0x04C81193, 0x11, 128},
 };
 
 static struct ihex2cyacd_args_info args_info;
 
 #define get_line_chars(__str, __out_str, __n) 		\
 	__out_str[__n] = 0;				\
-	memcpy(__out_str, __str, __n);			\
+	strncpy(__out_str, __str, __n);			\
 	__str += __n;
 
 static int parse_ihex_line(const char *line, uint8_t *length, uint16_t *addr, uint8_t *type, uint8_t data[MAX_IHEX_FILE_LENGTH])
 {
 	char tmp_buf[MAX_IHEX_FILE_LENGTH];
 	int i;
 	uint8_t crc, sum = 0;
-
+	
+	if(line[0] != ':') {
+		printf("Missing field start\n");
+		return 1;
+	}
+	line++;
+	
 	get_line_chars(line, tmp_buf, 2);
 	*length = strtol(tmp_buf, NULL, 16);
 	sum += *length;
 
 	get_line_chars(line, tmp_buf, 4);
 	*addr = strtol(tmp_buf, NULL, 16);
-	sum += ((uint8_t) (*addr & 0xFF));
-	sum += ((uint8_t) ((*addr) >> 8 & 0xFF));
+	sum += ((uint8_t) ((*addr) & 0xFF));
+	sum += ((uint8_t) (((*addr) >> 8) & 0xFF));
 
 	get_line_chars(line, tmp_buf, 2);
 	*type = strtol(tmp_buf, NULL, 16);
@@ -61,8 +68,9 @@ static int parse_ihex_line(const char *line, uint8_t *length, uint16_t *addr, ui
 
 	get_line_chars(line, tmp_buf, 2);
 	crc = strtol(tmp_buf, NULL, 16);
+	sum += crc;
 
-	if (crc != (~sum - 1)) {
+	if (sum != 0) {
 		printf("CRC failed\n");
 		return 1;
 	}
@@ -73,10 +81,13 @@ static int parse_ihex_line(const char *line, uint8_t *length, uint16_t *addr, ui
 int main(int argc, char **argv)
 {
 	uint32_t bootloader_text_rows;
-	char line_ptr[MAX_IHEX_FILE_LENGTH];
+	char *line_ptr;
+	uint8_t data[MAX_IHEX_FILE_LENGTH],length, type;
+	uint16_t addr;
 	FILE *input_hex, *output_cyacd;
 	struct cyacd_header_info *infos;
 	size_t line_length = MAX_IHEX_FILE_LENGTH;
+	int ret;
 
 	if (ihex2cyacd_cmdline_parser(argc, argv, &args_info) != 0) {
 		return EXIT_FAILURE;
@@ -92,14 +103,25 @@ int main(int argc, char **argv)
 		printf("Failed to open output file %s\n", args_info.output_arg);
 		return 1;
 	}
+	line_ptr = malloc(MAX_IHEX_FILE_LENGTH);
+	if(!line_ptr) {
+		printf("Failed to allocate data\n");
+		return 1;
+	}
 	infos = &header_infos[args_info.cpu_arg];
 
-	bootloader_text_rows = args_info.bootloader_size_arg / args_info.flash_row_size_arg;
+	bootloader_text_rows = args_info.bootloader_size_arg / infos->flash_row_size;
 
 	fprintf(output_cyacd, "%08x%02x00\r\n", infos->silicon_id, infos->silicon_rev);
 
-	while( getline(&line_ptr, &line_length, input_hex)) {
-		
+	while( getline(&line_ptr, &line_length, input_hex) > 0) {
+		ret = parse_ihex_line(line_ptr, &length, &addr, &type, data);
+		if (ret) {
+			printf("Failed to parse ihex file\n");
+			return 1;
+		}
+		line_length = MAX_IHEX_FILE_LENGTH;
+		/* TODO: concat data */
 	}
 
 

ihex2cyacd/src/ihex2cyacd.ggo

@@ -7,7 +7,6 @@ description "ihex2cyacd is a an utility to create cyacd files"
 
 option  "input"			i	"Input ihex file" string required
 option  "bootloader_size"	b	"Bootloader text size file" int required
-option  "flash_row_size"	r	"Flash row size" int required
 option  "output"		o	"Output cyacd file" string required
 option  "cpu"			c	"CPU type" values="CY8C41","CY8C42" enum default="CY8C42" optional