From 8647f959534396e1ee6d0685908ba9801afb646b Mon Sep 17 00:00:00 2001 From: Guido Lerch Date: Sat, 5 Sep 2015 11:00:54 -0700 Subject: Uemis downloader: fix and move helper function This function is only used in the Uemis downloader, and it got broken when we switched to using a separate table for the downloaded dives. Signed-off-by: Dirk Hohndel --- uemis-downloader.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'uemis-downloader.c') diff --git a/uemis-downloader.c b/uemis-downloader.c index 8c912d4cf..340daee60 100644 --- a/uemis-downloader.c +++ b/uemis-downloader.c @@ -126,6 +126,15 @@ static struct dive *uemis_start_dive(uint32_t deviceid) return dive; } +static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, u_int32_t object_id) +{ + for (int i = 0; i < devdata->download_table->nr; i++) { + if (object_id == devdata->download_table->dives[i]->dc.diveid) + return devdata->download_table->dives[i]; + } + return NULL; +} + static void record_uemis_dive(device_data_t *devdata, struct dive *dive) { if (devdata->create_new_trip) { @@ -817,7 +826,7 @@ static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char * dive->number = atoi(val); } else if (!log && !strcmp(tag, "logfilenr")) { /* this one tells us which dive we are adding data to */ - dive = get_dive_by_uemis_diveid(atoi(val), deviceid); + dive = get_dive_by_uemis_diveid(devdata, atoi(val)); if (for_dive) *for_dive = atoi(val); } else if (!log && dive && !strcmp(tag, "divespot_id")) { -- cgit v1.2.3-70-g09d2