X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_product.c;h=7248865427b725a60d6544f3e4fbec90bca59511;hb=188f9efadd480de872f86a8eb741e8738db84c6b;hp=a1a9af09ad4b53680402fdb154561976aa2e0c4f;hpb=2ad756bd1b63a2c8450edd7001628b92279fd1b8;p=fw%2Faltos

diff --git a/src/kernel/ao_product.c b/src/kernel/ao_product.c
index a1a9af09..72488654 100644
--- a/src/kernel/ao_product.c
+++ b/src/kernel/ao_product.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -54,13 +55,13 @@ const char ao_product[] = AO_iProduct_STRING;
 
 #define HEADER_LEN	       	9
 #define CONTROL_CLASS_LEN	35
-#define DATA_LEN		(9 + 7 * AO_USB_HAS_OUT + 7 * AO_USB_HAS_IN)
+#define DATA_LEN		(9 + 7 * AO_USB_HAS_OUT + 7 * AO_USB_HAS_IN + 7 * AO_USB_HAS_IN2 + 7 * AO_USB_HAS_IN3)
 
 #define TOTAL_LENGTH		(HEADER_LEN + AO_USB_HAS_INT * CONTROL_CLASS_LEN + DATA_LEN)
 #define NUM_INTERFACES		(AO_USB_HAS_INT + 1)
 
 /* USB descriptors in one giant block of bytes */
-AO_ROMCONFIG_SYMBOL(0x00aa) uint8_t ao_usb_descriptors [] =
+AO_ROMCONFIG_SYMBOL uint8_t ao_usb_descriptors [] =
 {
 	/* Device descriptor */
 	0x12,
@@ -138,9 +139,9 @@ AO_ROMCONFIG_SYMBOL(0x00aa) uint8_t ao_usb_descriptors [] =
 	/* Data class interface descriptor */
 	0x09,
 	AO_USB_DESC_INTERFACE,
-	0x01,				/* bInterfaceNumber */
+	AO_USB_HAS_INT,			/* bInterfaceNumber */
 	0x00,				/* bAlternateSetting */
-	AO_USB_HAS_OUT + AO_USB_HAS_IN,	/* bNumEndPoints */
+	AO_USB_HAS_OUT + AO_USB_HAS_IN + AO_USB_HAS_IN2 + AO_USB_HAS_IN3,	/* bNumEndPoints */
 	AO_USB_INTERFACE_CLASS_DATA,	/* bInterfaceClass = data */
 	0x00,				/* bInterfaceSubClass */
 	0x00,				/* bInterfaceProtocol */
@@ -166,6 +167,26 @@ AO_ROMCONFIG_SYMBOL(0x00aa) uint8_t ao_usb_descriptors [] =
 	0x00,			/* bInterval */
 #endif
 
+#if AO_USB_HAS_IN2
+	/* Data EP in 2 */
+	0x07,
+	AO_USB_DESC_ENDPOINT,
+	AO_USB_IN2_EP|0x80,	/* bEndpointAddress */
+	0x02,			/* bmAttributes = bulk */
+	LE_WORD(AO_USB_IN_SIZE),/* wMaxPacketSize */
+	0x00,			/* bInterval */
+#endif
+
+#if AO_USB_HAS_IN3
+	/* Data EP in 3 */
+	0x07,
+	AO_USB_DESC_ENDPOINT,
+	AO_USB_IN3_EP|0x80,	/* bEndpointAddress */
+	0x02,			/* bmAttributes = bulk */
+	LE_WORD(AO_USB_IN_SIZE),/* wMaxPacketSize */
+	0x00,			/* bInterval */
+#endif
+
 	/* String descriptors */
 	0x04,
 	AO_USB_DESC_STRING,