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 6e94899e8a1ec37e54319ccfa0c363c9dca3b0e2..f90fbb879d3934a2cf1ba7251aa50dd3553cf878 100644 (file)
--- a/altosui/libaltos/libaltos.h
+++ b/altosui/libaltos/libaltos.h
@@ -34,19 +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_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;
@@ -57,6 +44,18 @@ struct altos_device {
        //%mutable;
 };
 
+struct altos_bt_device {
+       //%immutable;
+       char                            name[256];
+       char                            addr[20];
+       //%mutable;
+};
+
+struct altos_error {
+       int                             code;
+       char                            string[1024];
+};
+
 #define LIBALTOS_SUCCESS       0
 #define LIBALTOS_ERROR         -1
 #define LIBALTOS_TIMEOUT       -2
@@ -68,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);
 
@@ -99,4 +101,19 @@ altos_flush(struct altos_file *file);
 PUBLIC int
 altos_getchar(struct altos_file *file, int timeout);
 
+PUBLIC struct altos_bt_list *
+altos_bt_list_start(int inquiry_time);
+
+PUBLIC int
+altos_bt_list_next(struct altos_bt_list *list, struct altos_bt_device *device);
+
+PUBLIC void
+altos_bt_list_finish(struct altos_bt_list *list);
+
+PUBLIC void
+altos_bt_fill_in(char *name, char *addr, struct altos_bt_device *device);
+
+PUBLIC struct altos_file *
+altos_bt_open(struct altos_bt_device *device);
+
 #endif /* _LIBALTOS_H_ */