From cd31ff9dff9cbf92de3c830b9b32253880f8e632 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 28 Aug 2012 08:06:44 +0200 Subject: [PATCH] Properly store the context pointer internally. I forgot to update the device and parser initialization functions to store the context pointer into the objects. As a result, the internal context pointers were always NULL. --- src/atomics_cobalt.c | 2 +- src/atomics_cobalt_parser.c | 2 +- src/cressi_edy.c | 2 +- src/cressi_edy_parser.c | 2 +- src/device-private.h | 3 ++- src/device.c | 4 ++-- src/hw_frog.c | 2 +- src/hw_ostc.c | 2 +- src/hw_ostc_parser.c | 2 +- src/mares_common.c | 4 ++-- src/mares_common.h | 2 +- src/mares_darwin.c | 2 +- src/mares_darwin_parser.c | 2 +- src/mares_iconhd.c | 2 +- src/mares_iconhd_parser.c | 2 +- src/mares_nemo.c | 2 +- src/mares_nemo_parser.c | 2 +- src/mares_puck.c | 2 +- src/oceanic_atom2.c | 2 +- src/oceanic_atom2_parser.c | 2 +- src/oceanic_common.c | 4 ++-- src/oceanic_common.h | 2 +- src/oceanic_veo250.c | 2 +- src/oceanic_veo250_parser.c | 2 +- src/oceanic_vtpro.c | 2 +- src/oceanic_vtpro_parser.c | 2 +- src/parser-private.h | 2 +- src/parser.c | 4 ++-- src/reefnet_sensus.c | 2 +- src/reefnet_sensus_parser.c | 2 +- src/reefnet_sensuspro.c | 2 +- src/reefnet_sensuspro_parser.c | 2 +- src/reefnet_sensusultra.c | 2 +- src/reefnet_sensusultra_parser.c | 2 +- src/suunto_common.c | 4 ++-- src/suunto_common.h | 2 +- src/suunto_common2.c | 4 ++-- src/suunto_common2.h | 2 +- src/suunto_d9.c | 2 +- src/suunto_d9_parser.c | 2 +- src/suunto_eon.c | 2 +- src/suunto_eon_parser.c | 2 +- src/suunto_solution.c | 2 +- src/suunto_solution_parser.c | 2 +- src/suunto_vyper.c | 2 +- src/suunto_vyper2.c | 2 +- src/suunto_vyper_parser.c | 2 +- src/uwatec_aladin.c | 2 +- src/uwatec_memomouse.c | 2 +- src/uwatec_memomouse_parser.c | 2 +- src/uwatec_smart.c | 2 +- src/uwatec_smart_parser.c | 2 +- src/zeagle_n2ition3.c | 2 +- 53 files changed, 60 insertions(+), 59 deletions(-) diff --git a/src/atomics_cobalt.c b/src/atomics_cobalt.c index 85b1b1d..aa597fd 100644 --- a/src/atomics_cobalt.c +++ b/src/atomics_cobalt.c @@ -100,7 +100,7 @@ atomics_cobalt_device_open (dc_device_t **out, dc_context_t *context) } // Initialize the base class. - device_init (&device->base, &atomics_cobalt_device_backend); + device_init (&device->base, context, &atomics_cobalt_device_backend); // Set the default values. device->context = NULL; diff --git a/src/atomics_cobalt_parser.c b/src/atomics_cobalt_parser.c index 5925f29..3dd6eb7 100644 --- a/src/atomics_cobalt_parser.c +++ b/src/atomics_cobalt_parser.c @@ -82,7 +82,7 @@ atomics_cobalt_parser_create (dc_parser_t **out, dc_context_t *context) } // Initialize the base class. - parser_init (&parser->base, &atomics_cobalt_parser_backend); + parser_init (&parser->base, context, &atomics_cobalt_parser_backend); // Set the default values. parser->atmospheric = 0.0; diff --git a/src/cressi_edy.c b/src/cressi_edy.c index fa845a5..4ee3946 100644 --- a/src/cressi_edy.c +++ b/src/cressi_edy.c @@ -186,7 +186,7 @@ cressi_edy_device_open (dc_device_t **out, dc_context_t *context, const char *na } // Initialize the base class. - device_init (&device->base, &cressi_edy_device_backend); + device_init (&device->base, context, &cressi_edy_device_backend); // Set the default values. device->port = NULL; diff --git a/src/cressi_edy_parser.c b/src/cressi_edy_parser.c index 502167b..51220b0 100644 --- a/src/cressi_edy_parser.c +++ b/src/cressi_edy_parser.c @@ -74,7 +74,7 @@ cressi_edy_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int } // Initialize the base class. - parser_init (&parser->base, &cressi_edy_parser_backend); + parser_init (&parser->base, context, &cressi_edy_parser_backend); // Set the default values. parser->model = model; diff --git a/src/device-private.h b/src/device-private.h index f1be750..83179a4 100644 --- a/src/device-private.h +++ b/src/device-private.h @@ -24,6 +24,7 @@ #include +#include #include #ifdef __cplusplus @@ -72,7 +73,7 @@ struct device_backend_t { }; void -device_init (dc_device_t *device, const device_backend_t *backend); +device_init (dc_device_t *device, dc_context_t *context, const device_backend_t *backend); void device_event_emit (dc_device_t *device, dc_event_type_t event, const void *data); diff --git a/src/device.c b/src/device.c index fac4e29..149cee8 100644 --- a/src/device.c +++ b/src/device.c @@ -38,11 +38,11 @@ void -device_init (dc_device_t *device, const device_backend_t *backend) +device_init (dc_device_t *device, dc_context_t *context, const device_backend_t *backend) { device->backend = backend; - device->context = NULL; + device->context = context; device->event_mask = 0; device->event_callback = NULL; diff --git a/src/hw_frog.c b/src/hw_frog.c index c69b6f2..3557cee 100644 --- a/src/hw_frog.c +++ b/src/hw_frog.c @@ -200,7 +200,7 @@ hw_frog_device_open (dc_device_t **out, dc_context_t *context, const char *name) } // Initialize the base class. - device_init (&device->base, &hw_frog_device_backend); + device_init (&device->base, context, &hw_frog_device_backend); // Set the default values. device->port = NULL; diff --git a/src/hw_ostc.c b/src/hw_ostc.c index c74d5a8..a2eabf7 100644 --- a/src/hw_ostc.c +++ b/src/hw_ostc.c @@ -128,7 +128,7 @@ hw_ostc_device_open (dc_device_t **out, dc_context_t *context, const char *name) } // Initialize the base class. - device_init (&device->base, &hw_ostc_device_backend); + device_init (&device->base, context, &hw_ostc_device_backend); // Set the default values. device->port = NULL; diff --git a/src/hw_ostc_parser.c b/src/hw_ostc_parser.c index 387e14e..e0801f2 100644 --- a/src/hw_ostc_parser.c +++ b/src/hw_ostc_parser.c @@ -81,7 +81,7 @@ hw_ostc_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int fr } // Initialize the base class. - parser_init (&parser->base, &hw_ostc_parser_backend); + parser_init (&parser->base, context, &hw_ostc_parser_backend); parser->frog = frog; diff --git a/src/mares_common.c b/src/mares_common.c index 146e368..419b09a 100644 --- a/src/mares_common.c +++ b/src/mares_common.c @@ -39,12 +39,12 @@ #define FP_SIZE 5 void -mares_common_device_init (mares_common_device_t *device, const device_backend_t *backend) +mares_common_device_init (mares_common_device_t *device, dc_context_t *context, const device_backend_t *backend) { assert (device != NULL); // Initialize the base class. - device_init (&device->base, backend); + device_init (&device->base, context, backend); // Set the default values. device->port = NULL; diff --git a/src/mares_common.h b/src/mares_common.h index 5447344..f3a4486 100644 --- a/src/mares_common.h +++ b/src/mares_common.h @@ -47,7 +47,7 @@ typedef struct mares_common_device_t { } mares_common_device_t; void -mares_common_device_init (mares_common_device_t *device, const device_backend_t *backend); +mares_common_device_init (mares_common_device_t *device, dc_context_t *context, const device_backend_t *backend); dc_status_t mares_common_device_read (dc_device_t *abstract, unsigned int address, unsigned char data[], unsigned int size); diff --git a/src/mares_darwin.c b/src/mares_darwin.c index d132b47..8c32d99 100644 --- a/src/mares_darwin.c +++ b/src/mares_darwin.c @@ -114,7 +114,7 @@ mares_darwin_device_open (dc_device_t **out, dc_context_t *context, const char * } // Initialize the base class. - mares_common_device_init (&device->base, &mares_darwin_device_backend); + mares_common_device_init (&device->base, context, &mares_darwin_device_backend); // Set the default values. memset (device->fingerprint, 0, sizeof (device->fingerprint)); diff --git a/src/mares_darwin_parser.c b/src/mares_darwin_parser.c index 06bb54a..5c21574 100644 --- a/src/mares_darwin_parser.c +++ b/src/mares_darwin_parser.c @@ -80,7 +80,7 @@ mares_darwin_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i } // Initialize the base class. - parser_init (&parser->base, &mares_darwin_parser_backend); + parser_init (&parser->base, context, &mares_darwin_parser_backend); if (model == DARWINAIR) { parser->headersize = 60; diff --git a/src/mares_iconhd.c b/src/mares_iconhd.c index 786a60d..05b2ef7 100644 --- a/src/mares_iconhd.c +++ b/src/mares_iconhd.c @@ -221,7 +221,7 @@ mares_iconhd_device_open (dc_device_t **out, dc_context_t *context, const char * } // Initialize the base class. - device_init (&device->base, &mares_iconhd_device_backend); + device_init (&device->base, context, &mares_iconhd_device_backend); // Set the default values. device->port = NULL; diff --git a/src/mares_iconhd_parser.c b/src/mares_iconhd_parser.c index b201ca0..5ab70ca 100644 --- a/src/mares_iconhd_parser.c +++ b/src/mares_iconhd_parser.c @@ -77,7 +77,7 @@ mares_iconhd_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i } // Initialize the base class. - parser_init (&parser->base, &mares_iconhd_parser_backend); + parser_init (&parser->base, context, &mares_iconhd_parser_backend); // Set the default values. parser->model = model; diff --git a/src/mares_nemo.c b/src/mares_nemo.c index f7e94e5..07010ae 100644 --- a/src/mares_nemo.c +++ b/src/mares_nemo.c @@ -109,7 +109,7 @@ mares_nemo_device_open (dc_device_t **out, dc_context_t *context, const char *na } // Initialize the base class. - device_init (&device->base, &mares_nemo_device_backend); + device_init (&device->base, context, &mares_nemo_device_backend); // Set the default values. device->port = NULL; diff --git a/src/mares_nemo_parser.c b/src/mares_nemo_parser.c index 15ca82f..aa58d33 100644 --- a/src/mares_nemo_parser.c +++ b/src/mares_nemo_parser.c @@ -92,7 +92,7 @@ mares_nemo_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int } // Initialize the base class. - parser_init (&parser->base, &mares_nemo_parser_backend); + parser_init (&parser->base, context, &mares_nemo_parser_backend); // Get the freedive mode for this model. unsigned int freedive = 2; diff --git a/src/mares_puck.c b/src/mares_puck.c index 8544381..96e9f8a 100644 --- a/src/mares_puck.c +++ b/src/mares_puck.c @@ -107,7 +107,7 @@ mares_puck_device_open (dc_device_t **out, dc_context_t *context, const char *na } // Initialize the base class. - mares_common_device_init (&device->base, &mares_puck_device_backend); + mares_common_device_init (&device->base, context, &mares_puck_device_backend); // Set the default values. device->layout = NULL; diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 12170e0..0d4dafe 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -322,7 +322,7 @@ oceanic_atom2_device_open (dc_device_t **out, dc_context_t *context, const char } // Initialize the base class. - oceanic_common_device_init (&device->base, &oceanic_atom2_device_backend); + oceanic_common_device_init (&device->base, context, &oceanic_atom2_device_backend); // Set the default values. device->port = NULL; diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 2df498a..6e188dc 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -101,7 +101,7 @@ oceanic_atom2_parser_create (dc_parser_t **out, dc_context_t *context, unsigned } // Initialize the base class. - parser_init (&parser->base, &oceanic_atom2_parser_backend); + parser_init (&parser->base, context, &oceanic_atom2_parser_backend); // Set the default values. parser->model = model; diff --git a/src/oceanic_common.c b/src/oceanic_common.c index 35f07d0..ab947bf 100644 --- a/src/oceanic_common.c +++ b/src/oceanic_common.c @@ -105,12 +105,12 @@ oceanic_common_match (const unsigned char *pattern, const unsigned char *string, void -oceanic_common_device_init (oceanic_common_device_t *device, const device_backend_t *backend) +oceanic_common_device_init (oceanic_common_device_t *device, dc_context_t *context, const device_backend_t *backend) { assert (device != NULL); // Initialize the base class. - device_init (&device->base, backend); + device_init (&device->base, context, backend); // Set the default values. memset (device->fingerprint, 0, sizeof (device->fingerprint)); diff --git a/src/oceanic_common.h b/src/oceanic_common.h index 208c8f5..30f43a7 100644 --- a/src/oceanic_common.h +++ b/src/oceanic_common.h @@ -64,7 +64,7 @@ int oceanic_common_match (const unsigned char *pattern, const unsigned char *string, unsigned int n); void -oceanic_common_device_init (oceanic_common_device_t *device, const device_backend_t *backend); +oceanic_common_device_init (oceanic_common_device_t *device, dc_context_t *context, const device_backend_t *backend); dc_status_t oceanic_common_device_set_fingerprint (dc_device_t *device, const unsigned char data[], unsigned int size); diff --git a/src/oceanic_veo250.c b/src/oceanic_veo250.c index c9015a1..1ee539e 100644 --- a/src/oceanic_veo250.c +++ b/src/oceanic_veo250.c @@ -233,7 +233,7 @@ oceanic_veo250_device_open (dc_device_t **out, dc_context_t *context, const char } // Initialize the base class. - oceanic_common_device_init (&device->base, &oceanic_veo250_device_backend); + oceanic_common_device_init (&device->base, context, &oceanic_veo250_device_backend); // Override the base class values. device->base.layout = &oceanic_veo250_layout; diff --git a/src/oceanic_veo250_parser.c b/src/oceanic_veo250_parser.c index 0679c77..910c393 100644 --- a/src/oceanic_veo250_parser.c +++ b/src/oceanic_veo250_parser.c @@ -80,7 +80,7 @@ oceanic_veo250_parser_create (dc_parser_t **out, dc_context_t *context, unsigned } // Initialize the base class. - parser_init (&parser->base, &oceanic_veo250_parser_backend); + parser_init (&parser->base, context, &oceanic_veo250_parser_backend); // Set the default values. parser->model = model; diff --git a/src/oceanic_vtpro.c b/src/oceanic_vtpro.c index 86eba33..d811c2d 100644 --- a/src/oceanic_vtpro.c +++ b/src/oceanic_vtpro.c @@ -265,7 +265,7 @@ oceanic_vtpro_device_open (dc_device_t **out, dc_context_t *context, const char } // Initialize the base class. - oceanic_common_device_init (&device->base, &oceanic_vtpro_device_backend); + oceanic_common_device_init (&device->base, context, &oceanic_vtpro_device_backend); // Override the base class values. device->base.multipage = MULTIPAGE; diff --git a/src/oceanic_vtpro_parser.c b/src/oceanic_vtpro_parser.c index 119acc3..4eac78f 100644 --- a/src/oceanic_vtpro_parser.c +++ b/src/oceanic_vtpro_parser.c @@ -79,7 +79,7 @@ oceanic_vtpro_parser_create (dc_parser_t **out, dc_context_t *context) } // Initialize the base class. - parser_init (&parser->base, &oceanic_vtpro_parser_backend); + parser_init (&parser->base, context, &oceanic_vtpro_parser_backend); // Set the default values. parser->cached = 0; diff --git a/src/parser-private.h b/src/parser-private.h index 6615728..78cb2f3 100644 --- a/src/parser-private.h +++ b/src/parser-private.h @@ -56,7 +56,7 @@ struct parser_backend_t { }; void -parser_init (dc_parser_t *parser, const parser_backend_t *backend); +parser_init (dc_parser_t *parser, dc_context_t *context, const parser_backend_t *backend); typedef struct sample_statistics_t { unsigned int divetime; diff --git a/src/parser.c b/src/parser.c index be18367..f8090f6 100644 --- a/src/parser.c +++ b/src/parser.c @@ -121,10 +121,10 @@ dc_parser_new (dc_parser_t **out, dc_device_t *device) void -parser_init (dc_parser_t *parser, const parser_backend_t *backend) +parser_init (dc_parser_t *parser, dc_context_t *context, const parser_backend_t *backend) { parser->backend = backend; - parser->context = NULL; + parser->context = context; parser->data = NULL; parser->size = 0; } diff --git a/src/reefnet_sensus.c b/src/reefnet_sensus.c index 4993ce7..b907e86 100644 --- a/src/reefnet_sensus.c +++ b/src/reefnet_sensus.c @@ -105,7 +105,7 @@ reefnet_sensus_device_open (dc_device_t **out, dc_context_t *context, const char } // Initialize the base class. - device_init (&device->base, &reefnet_sensus_device_backend); + device_init (&device->base, context, &reefnet_sensus_device_backend); // Set the default values. device->port = NULL; diff --git a/src/reefnet_sensus_parser.c b/src/reefnet_sensus_parser.c index 22b4c73..1c425b7 100644 --- a/src/reefnet_sensus_parser.c +++ b/src/reefnet_sensus_parser.c @@ -86,7 +86,7 @@ reefnet_sensus_parser_create (dc_parser_t **out, dc_context_t *context, unsigned } // Initialize the base class. - parser_init (&parser->base, &reefnet_sensus_parser_backend); + parser_init (&parser->base, context, &reefnet_sensus_parser_backend); // Set the default values. parser->atmospheric = ATM; diff --git a/src/reefnet_sensuspro.c b/src/reefnet_sensuspro.c index 10ca417..a688ef9 100644 --- a/src/reefnet_sensuspro.c +++ b/src/reefnet_sensuspro.c @@ -84,7 +84,7 @@ reefnet_sensuspro_device_open (dc_device_t **out, dc_context_t *context, const c } // Initialize the base class. - device_init (&device->base, &reefnet_sensuspro_device_backend); + device_init (&device->base, context, &reefnet_sensuspro_device_backend); // Set the default values. device->port = NULL; diff --git a/src/reefnet_sensuspro_parser.c b/src/reefnet_sensuspro_parser.c index c664c61..dcefe15 100644 --- a/src/reefnet_sensuspro_parser.c +++ b/src/reefnet_sensuspro_parser.c @@ -85,7 +85,7 @@ reefnet_sensuspro_parser_create (dc_parser_t **out, dc_context_t *context, unsig } // Initialize the base class. - parser_init (&parser->base, &reefnet_sensuspro_parser_backend); + parser_init (&parser->base, context, &reefnet_sensuspro_parser_backend); // Set the default values. parser->atmospheric = ATM; diff --git a/src/reefnet_sensusultra.c b/src/reefnet_sensusultra.c index e853f58..da73b6c 100644 --- a/src/reefnet_sensusultra.c +++ b/src/reefnet_sensusultra.c @@ -90,7 +90,7 @@ reefnet_sensusultra_device_open (dc_device_t **out, dc_context_t *context, const } // Initialize the base class. - device_init (&device->base, &reefnet_sensusultra_device_backend); + device_init (&device->base, context, &reefnet_sensusultra_device_backend); // Set the default values. device->port = NULL; diff --git a/src/reefnet_sensusultra_parser.c b/src/reefnet_sensusultra_parser.c index 6c10980..9de631f 100644 --- a/src/reefnet_sensusultra_parser.c +++ b/src/reefnet_sensusultra_parser.c @@ -85,7 +85,7 @@ reefnet_sensusultra_parser_create (dc_parser_t **out, dc_context_t *context, uns } // Initialize the base class. - parser_init (&parser->base, &reefnet_sensusultra_parser_backend); + parser_init (&parser->base, context, &reefnet_sensusultra_parser_backend); // Set the default values. parser->atmospheric = ATM; diff --git a/src/suunto_common.c b/src/suunto_common.c index cd7fbcd..ff77956 100644 --- a/src/suunto_common.c +++ b/src/suunto_common.c @@ -31,12 +31,12 @@ #define RB_PROFILE_PEEK(a,l) ringbuffer_decrement (a, l->peek, l->rb_profile_begin, l->rb_profile_end) void -suunto_common_device_init (suunto_common_device_t *device, const device_backend_t *backend) +suunto_common_device_init (suunto_common_device_t *device, dc_context_t *context, const device_backend_t *backend) { assert (device != NULL); // Initialize the base class. - device_init (&device->base, backend); + device_init (&device->base, context, backend); // Set the default values. memset (device->fingerprint, 0, sizeof (device->fingerprint)); diff --git a/src/suunto_common.h b/src/suunto_common.h index 66d6dc2..40bdf6c 100644 --- a/src/suunto_common.h +++ b/src/suunto_common.h @@ -46,7 +46,7 @@ typedef struct suunto_common_layout_t { } suunto_common_layout_t; void -suunto_common_device_init (suunto_common_device_t *device, const device_backend_t *backend); +suunto_common_device_init (suunto_common_device_t *device, dc_context_t *context, const device_backend_t *backend); dc_status_t suunto_common_device_set_fingerprint (dc_device_t *device, const unsigned char data[], unsigned int size); diff --git a/src/suunto_common2.c b/src/suunto_common2.c index 3291916..33bb654 100644 --- a/src/suunto_common2.c +++ b/src/suunto_common2.c @@ -42,12 +42,12 @@ #define BACKEND(abstract) ((suunto_common2_device_backend_t *) abstract->backend) void -suunto_common2_device_init (suunto_common2_device_t *device, const suunto_common2_device_backend_t *backend) +suunto_common2_device_init (suunto_common2_device_t *device, dc_context_t *context, const suunto_common2_device_backend_t *backend) { assert (device != NULL); // Initialize the base class. - device_init (&device->base, &backend->base); + device_init (&device->base, context, &backend->base); // Set the default values. device->layout = NULL; diff --git a/src/suunto_common2.h b/src/suunto_common2.h index 7d71264..c77f818 100644 --- a/src/suunto_common2.h +++ b/src/suunto_common2.h @@ -50,7 +50,7 @@ typedef struct suunto_common2_device_backend_t { } suunto_common2_device_backend_t; void -suunto_common2_device_init (suunto_common2_device_t *device, const suunto_common2_device_backend_t *backend); +suunto_common2_device_init (suunto_common2_device_t *device, dc_context_t *context, const suunto_common2_device_backend_t *backend); dc_status_t suunto_common2_device_set_fingerprint (dc_device_t *device, const unsigned char data[], unsigned int size); diff --git a/src/suunto_d9.c b/src/suunto_d9.c index e7b76b1..d82fbf1 100644 --- a/src/suunto_d9.c +++ b/src/suunto_d9.c @@ -138,7 +138,7 @@ suunto_d9_device_open (dc_device_t **out, dc_context_t *context, const char *nam } // Initialize the base class. - suunto_common2_device_init (&device->base, &suunto_d9_device_backend); + suunto_common2_device_init (&device->base, context, &suunto_d9_device_backend); // Set the default values. device->port = NULL; diff --git a/src/suunto_d9_parser.c b/src/suunto_d9_parser.c index 64138aa..fbbe2c7 100644 --- a/src/suunto_d9_parser.c +++ b/src/suunto_d9_parser.c @@ -97,7 +97,7 @@ suunto_d9_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int } // Initialize the base class. - parser_init (&parser->base, &suunto_d9_parser_backend); + parser_init (&parser->base, context, &suunto_d9_parser_backend); // Set the default values. parser->model = model; diff --git a/src/suunto_eon.c b/src/suunto_eon.c index b218c3c..2275ff7 100644 --- a/src/suunto_eon.c +++ b/src/suunto_eon.c @@ -89,7 +89,7 @@ suunto_eon_device_open (dc_device_t **out, dc_context_t *context, const char *na } // Initialize the base class. - suunto_common_device_init (&device->base, &suunto_eon_device_backend); + suunto_common_device_init (&device->base, context, &suunto_eon_device_backend); // Set the default values. device->port = NULL; diff --git a/src/suunto_eon_parser.c b/src/suunto_eon_parser.c index 241dbc3..c7f0628 100644 --- a/src/suunto_eon_parser.c +++ b/src/suunto_eon_parser.c @@ -79,7 +79,7 @@ suunto_eon_parser_create (dc_parser_t **out, dc_context_t *context, int spyder) } // Initialize the base class. - parser_init (&parser->base, &suunto_eon_parser_backend); + parser_init (&parser->base, context, &suunto_eon_parser_backend); // Set the default values. parser->spyder = spyder; diff --git a/src/suunto_solution.c b/src/suunto_solution.c index 69a3a93..a66c64f 100644 --- a/src/suunto_solution.c +++ b/src/suunto_solution.c @@ -82,7 +82,7 @@ suunto_solution_device_open (dc_device_t **out, dc_context_t *context, const cha } // Initialize the base class. - device_init (&device->base, &suunto_solution_device_backend); + device_init (&device->base, context, &suunto_solution_device_backend); // Set the default values. device->port = NULL; diff --git a/src/suunto_solution_parser.c b/src/suunto_solution_parser.c index b01f63f..c6489f2 100644 --- a/src/suunto_solution_parser.c +++ b/src/suunto_solution_parser.c @@ -76,7 +76,7 @@ suunto_solution_parser_create (dc_parser_t **out, dc_context_t *context) } // Initialize the base class. - parser_init (&parser->base, &suunto_solution_parser_backend); + parser_init (&parser->base, context, &suunto_solution_parser_backend); // Set the default values. parser->cached = 0; diff --git a/src/suunto_vyper.c b/src/suunto_vyper.c index 686d1c8..a9b899f 100644 --- a/src/suunto_vyper.c +++ b/src/suunto_vyper.c @@ -109,7 +109,7 @@ suunto_vyper_device_open (dc_device_t **out, dc_context_t *context, const char * } // Initialize the base class. - suunto_common_device_init (&device->base, &suunto_vyper_device_backend); + suunto_common_device_init (&device->base, context, &suunto_vyper_device_backend); // Set the default values. device->port = NULL; diff --git a/src/suunto_vyper2.c b/src/suunto_vyper2.c index 3da9938..71df789 100644 --- a/src/suunto_vyper2.c +++ b/src/suunto_vyper2.c @@ -88,7 +88,7 @@ suunto_vyper2_device_open (dc_device_t **out, dc_context_t *context, const char } // Initialize the base class. - suunto_common2_device_init (&device->base, &suunto_vyper2_device_backend); + suunto_common2_device_init (&device->base, context, &suunto_vyper2_device_backend); // Set the default values. device->port = NULL; diff --git a/src/suunto_vyper_parser.c b/src/suunto_vyper_parser.c index 251644c..4424920 100644 --- a/src/suunto_vyper_parser.c +++ b/src/suunto_vyper_parser.c @@ -77,7 +77,7 @@ suunto_vyper_parser_create (dc_parser_t **out, dc_context_t *context) } // Initialize the base class. - parser_init (&parser->base, &suunto_vyper_parser_backend); + parser_init (&parser->base, context, &suunto_vyper_parser_backend); // Set the default values. parser->cached = 0; diff --git a/src/uwatec_aladin.c b/src/uwatec_aladin.c index 585985f..9c14213 100644 --- a/src/uwatec_aladin.c +++ b/src/uwatec_aladin.c @@ -91,7 +91,7 @@ uwatec_aladin_device_open (dc_device_t **out, dc_context_t *context, const char } // Initialize the base class. - device_init (&device->base, &uwatec_aladin_device_backend); + device_init (&device->base, context, &uwatec_aladin_device_backend); // Set the default values. device->port = NULL; diff --git a/src/uwatec_memomouse.c b/src/uwatec_memomouse.c index e06a5cc..bf4bc5c 100644 --- a/src/uwatec_memomouse.c +++ b/src/uwatec_memomouse.c @@ -89,7 +89,7 @@ uwatec_memomouse_device_open (dc_device_t **out, dc_context_t *context, const ch } // Initialize the base class. - device_init (&device->base, &uwatec_memomouse_device_backend); + device_init (&device->base, context, &uwatec_memomouse_device_backend); // Set the default values. device->port = NULL; diff --git a/src/uwatec_memomouse_parser.c b/src/uwatec_memomouse_parser.c index 7a301bf..a2b34a5 100644 --- a/src/uwatec_memomouse_parser.c +++ b/src/uwatec_memomouse_parser.c @@ -75,7 +75,7 @@ uwatec_memomouse_parser_create (dc_parser_t **out, dc_context_t *context, unsign } // Initialize the base class. - parser_init (&parser->base, &uwatec_memomouse_parser_backend); + parser_init (&parser->base, context, &uwatec_memomouse_parser_backend); // Set the default values. parser->devtime = devtime; diff --git a/src/uwatec_smart.c b/src/uwatec_smart.c index ac03340..93b8295 100644 --- a/src/uwatec_smart.c +++ b/src/uwatec_smart.c @@ -165,7 +165,7 @@ uwatec_smart_device_open (dc_device_t **out, dc_context_t *context) } // Initialize the base class. - device_init (&device->base, &uwatec_smart_device_backend); + device_init (&device->base, context, &uwatec_smart_device_backend); // Set the default values. device->socket = NULL; diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c index 5dcd5e4..4db45a3 100644 --- a/src/uwatec_smart_parser.c +++ b/src/uwatec_smart_parser.c @@ -89,7 +89,7 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i } // Initialize the base class. - parser_init (&parser->base, &uwatec_smart_parser_backend); + parser_init (&parser->base, context, &uwatec_smart_parser_backend); // Set the default values. parser->model = model; diff --git a/src/zeagle_n2ition3.c b/src/zeagle_n2ition3.c index 8d4f6dd..b90037f 100644 --- a/src/zeagle_n2ition3.c +++ b/src/zeagle_n2ition3.c @@ -150,7 +150,7 @@ zeagle_n2ition3_device_open (dc_device_t **out, dc_context_t *context, const cha } // Initialize the base class. - device_init (&device->base, &zeagle_n2ition3_device_backend); + device_init (&device->base, context, &zeagle_n2ition3_device_backend); // Set the default values. device->port = NULL;