FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the actual IrDA device names

Browse Source
This commit is contained in:
Jef Driesen 2017-09-19 21:00:31 +02:00
parent 9e169c9a3f
commit 6d5ac37f99
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/uwatec_smart.c
View File

@ -27,9 +27,12 @@
#include "device-private.h" #include "device-private.h"
#include "irda.h" #include "irda.h"
#include "array.h" #include "array.h"
#include "platform.h"
#define ISINSTANCE(device) dc_device_isinstance((device), &uwatec_smart_device_vtable) #define ISINSTANCE(device) dc_device_isinstance((device), &uwatec_smart_device_vtable)
#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
typedef struct uwatec_smart_device_t { typedef struct uwatec_smart_device_t {
dc_device_t base; dc_device_t base;
dc_iostream_t *iostream; dc_iostream_t *iostream;
@ -62,22 +65,25 @@ uwatec_smart_extract_dives (dc_device_t *device, const unsigned char data[], uns
static void static void
uwatec_smart_discovery (unsigned int address, const char *name, unsigned int charset, unsigned int hints, void *userdata) uwatec_smart_discovery (unsigned int address, const char *name, unsigned int charset, unsigned int hints, void *userdata)
{ {
static const char *names[] = {
"Aladin Smart Com",
"Aladin Smart Pro",
"Aladin Smart Tec",
"Aladin Smart Z",
"Uwatec Aladin",
"UWATEC Galileo",
"UWATEC Galileo Sol",
};
uwatec_smart_device_t *device = (uwatec_smart_device_t*) userdata; uwatec_smart_device_t *device = (uwatec_smart_device_t*) userdata;
if (device == NULL) if (device == NULL || name == NULL)
return; return;
if (strncmp (name, "UWATEC Galileo Sol", 18) == 0 || for (size_t i = 0; i < C_ARRAY_SIZE(names); ++i) {
strncmp (name, "Uwatec Smart", 12) == 0 || if (strcasecmp(name, names[i]) == 0) {
strstr (name, "Uwatec") != NULL || device->address = address;
strstr (name, "UWATEC") != NULL || return;
strstr (name, "Aladin") != NULL || }
strstr (name, "ALADIN") != NULL ||
strstr (name, "Smart") != NULL ||
strstr (name, "SMART") != NULL ||
strstr (name, "Galileo") != NULL ||
strstr (name, "GALILEO") != NULL)
{
device->address = address;
} }
} }