From 86e9c3dfd3e777e24762e212df9ef7ac7c760d28 Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Sat, 14 Jun 2014 08:01:17 +0200
Subject: [PATCH] Cache the initial gas mix.

The gas mode should not only be taken into account for parsing the gas
mix definitions, but also for the initial gas mix. Because the logic
needs to be kept in sync, it's convenient to have all related code in a
single place, and cache the value.
---
 src/suunto_d9_parser.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/suunto_d9_parser.c b/src/suunto_d9_parser.c
index 6e87173..912cf0a 100644
--- a/src/suunto_d9_parser.c
+++ b/src/suunto_d9_parser.c
@@ -67,6 +67,7 @@ struct suunto_d9_parser_t {
 	unsigned int ngasmixes;
 	unsigned int oxygen[NGASMIXES];
 	unsigned int helium[NGASMIXES];
+	unsigned int gasmix;
 	unsigned int config;
 };
 
@@ -146,6 +147,7 @@ suunto_d9_parser_cache (suunto_d9_parser_t *parser)
 
 	// Cache the data for later use.
 	parser->mode = data[gasmode_offset];
+	parser->gasmix = 0;
 	if (parser->mode == AIR) {
 		parser->oxygen[0] = 21;
 		parser->helium[0] = 0;
@@ -163,6 +165,14 @@ suunto_d9_parser_cache (suunto_d9_parser_t *parser)
 				parser->helium[i] = 0;
 			}
 		}
+
+		// Initial gasmix.
+		if (parser->model == HELO2) {
+			parser->gasmix = data[0x26];
+		} else if (parser->model == D4i || parser->model == D6i ||
+			parser->model == D9tx) {
+			parser->gasmix = data[0x28];
+		}
 	}
 	parser->config = config;
 	parser->cached = 1;
@@ -195,6 +205,7 @@ suunto_d9_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int
 		parser->oxygen[i] = 0;
 		parser->helium[i] = 0;
 	}
+	parser->gasmix = 0;
 	parser->config = 0;
 
 	*out = (dc_parser_t*) parser;
@@ -226,6 +237,7 @@ suunto_d9_parser_set_data (dc_parser_t *abstract, const unsigned char *data, uns
 		parser->oxygen[i] = 0;
 		parser->helium[i] = 0;
 	}
+	parser->gasmix = 0;
 	parser->config = 0;
 
 	return DC_STATUS_SUCCESS;
@@ -332,19 +344,6 @@ suunto_d9_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t ca
 	if (rc != DC_STATUS_SUCCESS)
 		return rc;
 
-	// Initial gasmix.
-	unsigned int gasmix = 0;
-	if (parser->model == HELO2) {
-		gasmix = data[0x26];
-	} else if (parser->model == D4i || parser->model == D6i ||
-		parser->model == D9tx) {
-		gasmix = data[0x28];
-	}
-	if (gasmix >= parser->ngasmixes) {
-		ERROR (abstract->context, "Invalid initial gas mix.");
-		return DC_STATUS_DATAFORMAT;
-	}
-
 	// Number of parameters in the configuration data.
 	unsigned int nparams = data[parser->config];
 	if (nparams == 0 || nparams > MAXPARAMS) {
@@ -457,8 +456,12 @@ suunto_d9_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t ca
 
 		// Initial gasmix.
 		if (time == 0) {
-			unsigned int he = parser->helium[gasmix];
-			unsigned int o2 = parser->oxygen[gasmix];
+			if (parser->gasmix >= parser->ngasmixes) {
+				ERROR (abstract->context, "Invalid initial gas mix.");
+				return DC_STATUS_DATAFORMAT;
+			}
+			unsigned int he = parser->helium[parser->gasmix];
+			unsigned int o2 = parser->oxygen[parser->gasmix];
 			sample.event.type = SAMPLE_EVENT_GASCHANGE2;
 			sample.event.time = 0;
 			sample.event.value = o2 | (he << 16);