Merge remote-tracking branch 'origin/master' into multiarch

[fw/altos] / altosui / libaltos / libaltos.h

diff --git a/altosui/libaltos/libaltos.h b/altosui/libaltos/libaltos.h
index f710919c510ade1ba1fb96c026c45b9f6cee15fb..f90fbb879d3934a2cf1ba7251aa50dd3553cf878 100644 (file)
--- a/altosui/libaltos/libaltos.h
+++ b/altosui/libaltos/libaltos.h
@@ -34,20 +34,6 @@
 # define PUBLIC
 #endif
 
-#define USB_VENDOR_FSF                 0xfffe
-#define USB_VENDOR_ALTUSMETRUM         USB_VENDOR_FSF
-#define USB_PRODUCT_ALTUSMETRUM                0x000a
-#define USB_PRODUCT_TELEMETRUM         0x000b
-#define USB_PRODUCT_TELEDONGLE         0x000c
-#define USB_PRODUCT_TELETERRA          0x000d
-#define USB_PRODUCT_TELEBT             0x000e
-#define USB_PRODUCT_ALTUSMETRUM_MIN    0x000a
-#define USB_PRODUCT_ALTUSMETRUM_MAX    0x0013
-
-#define USB_IS_ALTUSMETRUM(v,p)        ((v) == USB_VENDOR_ALTUSMETRUM && \
-               (USB_PRODUCT_ALTUSMETRUM_MIN <= (p) && \
-                (p) <= USB_PRODUCT_ALTUSMETRUM_MAX))
-
 struct altos_device {
        //%immutable;
        int                             vendor;
@@ -58,8 +44,6 @@ struct altos_device {
        //%mutable;
 };
 
-#define BLUETOOTH_PRODUCT_TELEBT       "TeleBT"
-
 struct altos_bt_device {
        //%immutable;
        char                            name[256];
@@ -67,6 +51,11 @@ struct altos_bt_device {
        //%mutable;
 };
 
+struct altos_error {
+       int                             code;
+       char                            string[1024];
+};
+
 #define LIBALTOS_SUCCESS       0
 #define LIBALTOS_ERROR         -1
 #define LIBALTOS_TIMEOUT       -2
@@ -78,6 +67,9 @@ altos_init(void);
 PUBLIC void
 altos_fini(void);
 
+PUBLIC void
+altos_get_last_error(struct altos_error *error);
+
 PUBLIC struct altos_list *
 altos_list_start(void);