diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-12-30 16:13:42 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-30 07:37:12 -0800 |
| commit | 04ac309725952e65a5aa1fbd13f5b28e56cf4d84 (patch) | |
| tree | 48ade9d7a94fc9577e2fccc0fb6ec4f7533d3c83 | |
| parent | 3416278da4a2931dd77553d7a2d63137e7a9973f (diff) | |
| download | subsurface-04ac309725952e65a5aa1fbd13f5b28e56cf4d84.tar.gz | |
Cleanup OSTC settings debug code
The old OSTC settings debug code was a bit ugly.
This cleans that up and contains all the ugly-ness behind the
DEBUG_OSTC ifdef.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | configuredivecomputerthreads.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/configuredivecomputerthreads.cpp b/configuredivecomputerthreads.cpp index 2ff36618a..af8995085 100644 --- a/configuredivecomputerthreads.cpp +++ b/configuredivecomputerthreads.cpp @@ -71,6 +71,16 @@ #define hw_ostc_device_clock local_hw_ostc_device_clock #define OSTC_FILE "../OSTC-data-dump.bin" +// Fake the open function. +static dc_status_t local_dc_device_open(dc_device_t **out, dc_context_t *context, dc_descriptor_t *descriptor, const char *name) +{ + if (strcmp(dc_descriptor_get_vendor(descriptor), "Heinrichs Weikamp") == 0 &&strcmp(dc_descriptor_get_product(descriptor), "OSTC 2N") == 0) + return DC_STATUS_SUCCESS; + else + return dc_device_open(out, context, descriptor, name); +} +#define dc_device_open local_dc_device_open + static dc_status_t local_hw_ostc_device_eeprom_read(void *ignored, unsigned char bank, unsigned char data[], unsigned int data_size) { FILE *f; @@ -1387,12 +1397,8 @@ void ReadSettingsThread::run() { bool supported = false; dc_status_t rc; -#ifdef DEBUG_OSTC - if (strcmp(m_data->vendor, "Heinrichs Weikamp") == 0 && strcmp(m_data->product, "OSTC 2N") == 0) - rc = DC_STATUS_SUCCESS; - else -#endif - rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname); + + rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname); if (rc == DC_STATUS_SUCCESS) { DeviceDetails *m_deviceDetails = new DeviceDetails(0); switch (dc_device_get_type(m_data->device)) { @@ -1459,11 +1465,8 @@ void WriteSettingsThread::run() { bool supported = false; dc_status_t rc; -#ifdef DEBUG_OSTC - rc = DC_STATUS_SUCCESS; -#else + rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname); -#endif if (rc == DC_STATUS_SUCCESS) { switch (dc_device_get_type(m_data->device)) { case DC_FAMILY_SUUNTO_VYPER: |