From 6d3fbb7e6d954a8c44627893abf704408d0b9940 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Sun, 21 Aug 2016 11:33:15 +0200 Subject: [PATCH] Add a warning for unsupported devices. --- src/oceanic_atom2.c | 3 +++ src/oceanic_veo250.c | 11 +++++++++-- src/oceanic_vtpro.c | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index a91d39d..cd6b701 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -671,7 +671,10 @@ oceanic_atom2_device_open2 (dc_device_t **out, dc_context_t *context, const char device->bigpage = 16; } else if (OCEANIC_COMMON_MATCH (device->base.version, aqualung_i450t_version)) { device->base.layout = &aqualung_i450t_layout; + } else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_default_version)) { + device->base.layout = &oceanic_default_layout; } else { + WARNING (context, "Unsupported device detected!"); device->base.layout = &oceanic_default_layout; } diff --git a/src/oceanic_veo250.c b/src/oceanic_veo250.c index d91f1be..c8c1215 100644 --- a/src/oceanic_veo250.c +++ b/src/oceanic_veo250.c @@ -63,7 +63,7 @@ static const oceanic_common_device_vtable_t oceanic_veo250_device_vtable = { oceanic_common_device_profile, }; -static const oceanic_common_version_t oceanic_vtpro_version[] = { +static const oceanic_common_version_t oceanic_veo250_version[] = { {"GENREACT \0\0 256K"}, {"VEO 200 R\0\0 256K"}, {"VEO 250 R\0\0 256K"}, @@ -244,7 +244,6 @@ oceanic_veo250_device_open (dc_device_t **out, dc_context_t *context, const char oceanic_common_device_init (&device->base); // Override the base class values. - device->base.layout = &oceanic_veo250_layout; device->base.multipage = MULTIPAGE; // Set the default values. @@ -309,6 +308,14 @@ oceanic_veo250_device_open (dc_device_t **out, dc_context_t *context, const char goto error_close; } + // Override the base class values. + if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_veo250_version)) { + device->base.layout = &oceanic_veo250_layout; + } else { + WARNING (context, "Unsupported device detected!"); + device->base.layout = &oceanic_veo250_layout; + } + *out = (dc_device_t*) device; return DC_STATUS_SUCCESS; diff --git a/src/oceanic_vtpro.c b/src/oceanic_vtpro.c index 6d14e85..22d042b 100644 --- a/src/oceanic_vtpro.c +++ b/src/oceanic_vtpro.c @@ -490,7 +490,10 @@ oceanic_vtpro_device_open2 (dc_device_t **out, dc_context_t *context, const char device->base.layout = &aeris_500ai_layout; } else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_wisdom_version)) { device->base.layout = &oceanic_wisdom_layout; + } else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_vtpro_version)) { + device->base.layout = &oceanic_vtpro_layout; } else { + WARNING (context, "Unsupported device detected!"); device->base.layout = &oceanic_vtpro_layout; }