altosui: Don't export product defs from libaltos

As we add new products, that would change the ABI generated for java,
invaliding old library versions sitting around for windows and mac.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/libaltos/libaltos.c b/altosui/libaltos/libaltos.c
index b00a7704bbbc7e2bf5f00b4b073367ba6044f463..00a75de9b2ac976521f8e7c15b096ae7499a7f0a 100644 (file)
--- a/altosui/libaltos/libaltos.c
+++ b/altosui/libaltos/libaltos.c
@@ -20,6 +20,22 @@
 #include <stdlib.h>
 #include <string.h>
 
+#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))
+
+#define BLUETOOTH_PRODUCT_TELEBT       "TeleBT"
+
 #define USE_POLL
 
 PUBLIC int

diff --git a/altosui/libaltos/libaltos.h b/altosui/libaltos/libaltos.h
index dd091e51333ceae96ca7a462c4dc24d3207bc426..363a84fd0eed65b080723f83d6e3697c3f69532d 100644 (file)
--- a/altosui/libaltos/libaltos.h
+++ b/altosui/libaltos/libaltos.h
@@ -34,22 +34,6 @@
 # define PUBLIC
 #endif
 
-#define HAS_BLUETOOTH  0
-
-#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;
@@ -60,8 +44,6 @@ struct altos_device {
        //%mutable;
 };
 
-#define BLUETOOTH_PRODUCT_TELEBT       "TeleBT"
-
 struct altos_bt_device {
        //%immutable;
        char                            name[256];
@@ -111,6 +93,7 @@ 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 *