From b09b74783b8cdef55de23863a2266e86dc95df85 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Sun, 23 Dec 2012 08:33:20 +0100 Subject: [PATCH] Hardcode the maximum number of retries. The application shouldn't have to deal with the maximum number of retries. If the default value isn't good enough, that should be fixed internally and not on the application side. --- src/libdivecomputer.symbols | 1 - src/reefnet_sensusultra.c | 21 +++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index fae1ae6..6f4c6b8 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -103,7 +103,6 @@ reefnet_sensuspro_extract_dives reefnet_sensusultra_device_open reefnet_sensusultra_device_read_user reefnet_sensusultra_device_sense -reefnet_sensusultra_device_set_maxretries reefnet_sensusultra_device_get_handshake reefnet_sensusultra_device_write_parameter reefnet_sensusultra_device_write_user diff --git a/src/reefnet_sensusultra.c b/src/reefnet_sensusultra.c index 5f9a648..97a1603 100644 --- a/src/reefnet_sensusultra.c +++ b/src/reefnet_sensusultra.c @@ -42,6 +42,7 @@ #define SZ_HANDSHAKE 24 #define SZ_SENSE 6 +#define MAXRETRIES 2 #define PROMPT 0xA5 #define ACCEPT PROMPT #define REJECT 0x00 @@ -50,7 +51,6 @@ typedef struct reefnet_sensusultra_device_t { dc_device_t base; serial_t *port; unsigned char handshake[SZ_HANDSHAKE]; - unsigned int maxretries; unsigned int timestamp; unsigned int devtime; dc_ticks_t systime; @@ -99,7 +99,6 @@ reefnet_sensusultra_device_open (dc_device_t **out, dc_context_t *context, const // Set the default values. device->port = NULL; - device->maxretries = 2; device->timestamp = 0; device->systime = (dc_ticks_t) -1; device->devtime = 0; @@ -179,20 +178,6 @@ reefnet_sensusultra_device_get_handshake (dc_device_t *abstract, unsigned char d } -dc_status_t -reefnet_sensusultra_device_set_maxretries (dc_device_t *abstract, unsigned int maxretries) -{ - reefnet_sensusultra_device_t *device = (reefnet_sensusultra_device_t*) abstract; - - if (! device_is_reefnet_sensusultra (abstract)) - return DC_STATUS_INVALIDARGS; - - device->maxretries = maxretries; - - return DC_STATUS_SUCCESS; -} - - static dc_status_t reefnet_sensusultra_device_set_fingerprint (dc_device_t *abstract, const unsigned char data[], unsigned int size) { @@ -345,7 +330,7 @@ reefnet_sensusultra_page (reefnet_sensusultra_device_t *device, unsigned char *d return rc; // Abort if the maximum number of retries is reached. - if (nretries++ >= device->maxretries) + if (nretries++ >= MAXRETRIES) return rc; // Reject the packet. @@ -381,7 +366,7 @@ reefnet_sensusultra_send (reefnet_sensusultra_device_t *device, unsigned short c return rc; // Abort if the maximum number of retries is reached. - if (nretries++ >= device->maxretries) + if (nretries++ >= MAXRETRIES) return rc; // According to the developers guide, a 250 ms delay is suggested to