X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.h;h=8d77a25beba9230e51e20be293960d9f28f048d3;hb=03eb488dd238bcec4b4758eab4559b3c40e6435c;hp=205f28e7c2dea38a12f16cbe1d8b9adad3ce7628;hpb=682135838ff313594c7f67fabd9be8f88a33883b;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.h b/libdivecomputer.h
index 205f28e..8d77a25 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,19 +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;
-	progressbar_t *progress;
-	device_devinfo_t devinfo;
-	device_clock_t clock;
+	dc_descriptor_t *descriptor;
+	const char *vendor, *product, *devname;
+	dc_device_t *device;
+	progressbar_t progress;
+	int preexisting;
 } device_data_t;
 
-struct device_list {
-	const char *name;
-	device_type_t type;
-};
-
-extern struct device_list device_list[];
-extern void do_import(device_data_t *data);
+extern GError *do_import(device_data_t *data);
 
 #endif