From: Keith Packard <keithp@keithp.com>
Date: Wed, 10 Aug 2011 01:26:07 +0000 (-0700)
Subject: altosui: Don't export product defs from libaltos
X-Git-Tag: 0.9.6.0~42
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=12bfa6cc42e3689f09abae2bd2584cbacf2aa2e0;ds=sidebyside

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 b00a7704..00a75de9 100644
--- 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 dd091e51..363a84fd 100644
--- 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 *