summaryrefslogtreecommitdiffstats
path: root/core/libdivecomputer.c
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2016-12-29 16:02:02 +0100
committerGravatar Subsurface <dirk@subsurface-divelog.org>2017-01-12 14:15:53 -0800
commit983561b3538b184af3e2ed576bdab2180e436804 (patch)
tree185cf60a11f3fffe8c91a5dcbe8a6441a104b6c7 /core/libdivecomputer.c
parent70e2404492bb6fd19bd865985e1622260e2d7e54 (diff)
downloadsubsurface-983561b3538b184af3e2ed576bdab2180e436804.tar.gz
ostctools_import: Switch to using dc_parser_new2
Instead of creating the individual parsers, and keeping track of their arguments, this just uses the "new" dc_parser_new2 function ment for buffer parsing. Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'core/libdivecomputer.c')
-rw-r--r--core/libdivecomputer.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c
index 8a8b215e8..e91240573 100644
--- a/core/libdivecomputer.c
+++ b/core/libdivecomputer.c
@@ -1082,26 +1082,12 @@ dc_status_t libdc_buffer_parser(struct dive *dive, device_data_t *data, unsigned
switch (dc_descriptor_get_type(data->descriptor)) {
case DC_FAMILY_UWATEC_ALADIN:
case DC_FAMILY_UWATEC_MEMOMOUSE:
- rc = uwatec_memomouse_parser_create(&parser, data->context, 0, 0);
- break;
case DC_FAMILY_UWATEC_SMART:
case DC_FAMILY_UWATEC_MERIDIAN:
- rc = uwatec_smart_parser_create (&parser, data->context, dc_descriptor_get_model(data->descriptor), 0, 0);
- break;
case DC_FAMILY_HW_OSTC:
-#if defined(SSRF_CUSTOM_SERIAL)
- rc = hw_ostc_parser_create (&parser, data->context, data->deviceid, 0);
-#else
- rc = hw_ostc_parser_create (&parser, data->context, data->deviceid);
-#endif
- break;
case DC_FAMILY_HW_FROG:
case DC_FAMILY_HW_OSTC3:
-#if defined(SSRF_CUSTOM_SERIAL)
- rc = hw_ostc_parser_create (&parser, data->context, data->deviceid, 1);
-#else
- rc = hw_ostc_parser_create (&parser, data->context, data->deviceid);
-#endif
+ rc = dc_parser_new2(&parser, data->context, data->descriptor, 0, 0);
break;
default:
report_error("Device type not handled!");