rimage: (cosmetic) fix misnamed variables

Fix typos, using pin-configuration references when parsing module
configuration. Also clarify some magic constants.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

tools/rimage/src/adsp_config.c

@@ -1707,6 +1707,7 @@ static int parse_pin(const toml_table_t *mod_entry, struct parse_ctx *ctx,
 
 	ctx->array_cnt++;
 
+	/* Pin definitions contain 6 elements */
 	ext_mod_config->header.num_pin_entries = toml_array_nelem(arr) / 6;
 	ext_mod_config->pin_desc = calloc(sizeof(struct fw_pin_description),
 					  toml_array_nelem(arr) / 6);
@@ -1767,12 +1768,12 @@ static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx
 {
 	toml_array_t *arr;
 	toml_raw_t raw;
-	int *pin_data;
+	int *cfg_data;
 	int64_t val;
 	int ret;
 	int i;
 
-	/* check "pin" key */
+	/* check "mod_cfg" key */
 	arr = toml_array_in(mod_entry, "mod_cfg");
 	if (!arr) {
 		mod_man->cfg_count = 0;
@@ -1784,12 +1785,13 @@ static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx
 
 	ctx->array_cnt++;
 
-	pin_data = (int *)(modules->mod_cfg + modules->mod_cfg_count);
+	cfg_data = (int *)(modules->mod_cfg + modules->mod_cfg_count);
 	mod_man->cfg_offset = modules->mod_cfg_count;
-	modules->mod_cfg_count += toml_array_nelem(arr) / 11;
+	/* 11 integers per configuration entry */
 	mod_man->cfg_count = toml_array_nelem(arr) / 11;
+	modules->mod_cfg_count += mod_man->cfg_count;
 
-	/* parse "pin" array elements */
+	/* parse "mod_cfg" array elements: the loop runs 11 * modules->mod_cfg_count times */
 	for (i = 0; ; ++i) {
 		raw = toml_raw_at(arr, i);
 		if (raw == 0)
@@ -1798,9 +1800,14 @@ static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx
 		ret = toml_rtoi(raw, &val);
 		if (ret < 0)
 			return err_key_parse("mod_cfg", "can't convert element to integer");
-		pin_data[i] = val;
+		cfg_data[i] = val;
 	}
 
+	if (i != 11 * mod_man->cfg_count)
+		return err_key_parse("mod_cfg",
+				     "can't parse configuration, only %u parsed for %u cfgs",
+				     i, modules->mod_cfg_count);
+
 	return 0;
 }
 
@@ -1869,13 +1876,13 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 	if (!modules->mod_man)
 		return -ENOMEM;
 
-	modules->mod_man_count = toml_array_nelem(mod_entry_array);
+	modules->mod_man_count = entry_count;
 
-	tmp_cfg_count = entry_count * 32;
+	tmp_cfg_count = entry_count * MAX_MODULES;
 	modules->mod_cfg = calloc(sizeof(struct sof_man_mod_config), tmp_cfg_count);
 
 	/* parse entry array elements */
-	for (i = 0; i < toml_array_nelem(mod_entry_array); ++i) {
+	for (i = 0; i < entry_count; ++i) {
 		struct fw_ext_mod_config_header *header;
 		struct sof_man_module *mod_man;
 		struct parse_ctx ctx_entry;