altoslib: Missed a couple of easy mini voltage API changes

[fw/altos] / src / core / ao_product.c

diff --git a/src/core/ao_product.c b/src/core/ao_product.c
index 67ec67935fc7b20fb212a80ff194a9ea7f85a308..b9327bacbf8b4a9543775c335cefd63ab97becfc 100644 (file)
--- a/src/core/ao_product.c
+++ b/src/core/ao_product.c
@@ -27,9 +27,15 @@ const char ao_product[] = AO_iProduct_STRING;
 #define LE_WORD(x)    ((x)&0xFF),((uint8_t) (((uint16_t) (x))>>8))
 
 #if HAS_USB
+
+/* Maximum power in mA */
+#ifndef AO_USB_MAX_POWER
+#define AO_USB_MAX_POWER       100
+#endif
+
 #include "ao_usb.h"
 /* USB descriptors in one giant block of bytes */
-__code __at(0x00aa) uint8_t ao_usb_descriptors [] =
+AO_ROMCONFIG_SYMBOL(0x00aa) uint8_t ao_usb_descriptors [] =
 {
        /* Device descriptor */
        0x12,
@@ -55,7 +61,7 @@ __code __at(0x00aa) uint8_t ao_usb_descriptors [] =
        0x01,                   /*  bConfigurationValue */
        0x00,                   /*  iConfiguration */
        0xC0,                   /*  bmAttributes */
-       0x32,                   /*  bMaxPower */
+       AO_USB_MAX_POWER >> 1,  /*  bMaxPower, 2mA units */
 
        /* Control class interface */
        0x09,