diff options
| author |  Maximilian Güntner <maximilian.guentner@gmail.com> | 2012-08-22 01:15:41 +0200 |
|---|---|---|
| committer | Maximilian Güntner <maximilian.guentner@gmail.com> | 2012-08-22 01:15:41 +0200 |
| commit | 0c0ec7e4f60d9678c3950757ccb8f791f10d033c (patch) | |
| tree | c0bc02a006629b9aff242a5ffe08e0d0a16e20b2 /libdivecomputer.h | |
| parent | 2cada118eb515e369ba23b85c8f3fb8c4d100aaa (diff) | |
| parent | 666538ec7739fe839623bd1b6f9f80ff884ad5a9 (diff) | |
| download | subsurface-0c0ec7e4f60d9678c3950757ccb8f791f10d033c.tar.gz | |
Merge branch 'master' into freediving-tweaks
Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
Diffstat (limited to 'libdivecomputer.h')
| -rw-r--r-- | libdivecomputer.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/libdivecomputer.h b/libdivecomputer.h index c6e99fa73..8d77a25be 100644 --- a/libdivecomputer.h +++ b/libdivecomputer.h @@ -2,17 +2,9 @@ #define LIBDIVECOMPUTER_H /* libdivecomputer */ -#include <device.h> -#include <suunto.h> -#include <reefnet.h> -#include <uwatec.h> -#include <oceanic.h> -#include <mares.h> -#include <hw.h> -#include <cressi.h> -#include <zeagle.h> -#include <atomics.h> -#include <utils.h> +#include <libdivecomputer/device.h> +#include <libdivecomputer/parser.h> +#include <libdivecomputer/utils.h> /* handling uemis Zurich SDA files */ #include "uemis.h" @@ -20,20 +12,13 @@ /* don't forget to include the UI toolkit specific display-XXX.h first to get the definition of progressbar_t */ typedef struct device_data_t { - device_type_t type; - const char *name, *devname; + dc_descriptor_t *descriptor; + const char *vendor, *product, *devname; + dc_device_t *device; progressbar_t progress; - device_devinfo_t devinfo; - device_clock_t clock; int preexisting; } device_data_t; -struct device_list { - const char *name; - device_type_t type; -}; - -extern struct device_list device_list[]; extern GError *do_import(device_data_t *data); #endif |