altos: product defines are always in ao_product.h

[fw/altos] / src / ao_product.c

diff --git a/src/ao_product.c b/src/ao_product.c
index f0eb4c07afc0e2286ced7324836d90da70d15060..fb59580b8d4b123b729cf0a0712495282eac8da5 100644 (file)
--- a/src/ao_product.c
+++ b/src/ao_product.c
@@ -16,19 +16,20 @@
  */
 
 #include "ao.h"
-#include "ao_usb.h"
-#include PRODUCT_DEFS
+#include "ao_product.h"
 
 /* Defines which mark this particular AltOS product */
 
-const char ao_version[] = AO_iVersion_STRING;
+const char ao_version[AO_MAX_VERSION] = AO_iVersion_STRING;
 const char ao_manufacturer[] = AO_iManufacturer_STRING;
 const char ao_product[] = AO_iProduct_STRING;
 
 #define LE_WORD(x)    ((x)&0xFF),((uint8_t) (((uint16_t) (x))>>8))
 
+#if HAS_USB
+#include "ao_usb.h"
 /* USB descriptors in one giant block of bytes */
-const uint8_t ao_usb_descriptors [] =
+__code __at(0x00aa) uint8_t ao_usb_descriptors [] =
 {
        /* Device descriptor */
        0x12,
@@ -151,3 +152,4 @@ const uint8_t ao_usb_descriptors [] =
        /* Terminating zero */
        0
 };
+#endif