X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=9d4c1065a3817ce046798448b7c7a39a2a10be2a;hb=ee68ada729837162e29d879ca408836d0d66c7ac;hp=5fea5c28c848d08659718b08e34cedd2b004bc9e;hpb=8eeeb97b853033acd8abfd65187d072a556270ef;p=ext%2Fsubsurface.git diff --git a/libdivecomputer.c b/libdivecomputer.c index 5fea5c2..9d4c106 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -1,5 +1,7 @@ #include #include +#include +#include #include "dive.h" #include "divelist.h" @@ -223,7 +225,7 @@ static int find_dive(struct dive *dive, device_data_t *devdata) { int i; - for (i = 0; i < devdata->preexisting; i++) { + for (i = 0; i < dive_table.preexisting; i++) { struct dive *old = dive_table.dives[i]; if (dive->when != old->when) @@ -333,7 +335,6 @@ static int dive_cb(const unsigned char *data, unsigned int size, static device_status_t import_device_data(device_t *device, device_data_t *devicedata) { - devicedata->preexisting = dive_table.nr; return device_foreach(device, dive_cb, devicedata); } @@ -412,10 +413,10 @@ static device_status_t device_open(const char *devname, static void event_cb(device_t *device, device_event_t event, const void *data, void *userdata) { - const device_progress_t *progress = (device_progress_t *) data; - const device_devinfo_t *devinfo = (device_devinfo_t *) data; - const device_clock_t *clock = (device_clock_t *) data; - device_data_t *devdata = (device_data_t *) userdata; + const device_progress_t *progress = data; + const device_devinfo_t *devinfo = data; + const device_clock_t *clock = data; + device_data_t *devdata = userdata; switch (event) { case DEVICE_EVENT_WAITING: @@ -434,8 +435,8 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v break; case DEVICE_EVENT_CLOCK: devdata->clock = *clock; - printf("Event: systime=%lld, devtime=%u\n", - clock->systime, clock->devtime); + printf("Event: systime=%"PRId64", devtime=%u\n", + (uint64_t)clock->systime, clock->devtime); break; default: break; @@ -497,9 +498,6 @@ void do_import(device_data_t *data) pthread_t pthread; void *retval; - if (data->type == DEVICE_TYPE_UEMIS) - return uemis_import(); - /* I'm sure there is some better interface for waiting on a thread in a UI main loop */ import_thread_done = 0; pthread_create(&pthread, NULL, pthread_wrapper, data); @@ -542,6 +540,5 @@ struct device_list device_list[] = { { "Cressi Edy", DEVICE_TYPE_CRESSI_EDY }, { "Zeagle N2iTiON 3", DEVICE_TYPE_ZEAGLE_N2ITION3 }, { "Atomics Cobalt", DEVICE_TYPE_ATOMICS_COBALT }, - { "Uemis Zurich SDA", DEVICE_TYPE_UEMIS }, { NULL } };