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 363a84fd0eed65b080723f83d6e3697c3f69532d..f90fbb879d3934a2cf1ba7251aa50dd3553cf878 100644 (file)
--- a/altosui/libaltos/libaltos.h
+++ b/altosui/libaltos/libaltos.h
@@ -51,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
@@ -62,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);
 
@@ -93,9 +101,6 @@ altos_flush(struct altos_file *file);
 PUBLIC int
 altos_getchar(struct altos_file *file, int timeout);
 
-// #define HAS_BLUETOOTH 1
-#if HAS_BLUETOOTH
-
 PUBLIC struct altos_bt_list *
 altos_bt_list_start(int inquiry_time);
 
@@ -111,6 +116,4 @@ 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
-
 #endif /* _LIBALTOS_H_ */