From e3d1fd9bbdb789196c25bdd5eb7536cda5ba39f3 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 30 Jul 2011 02:08:36 +0200
Subject: DFU: add third 'alternate configuration' for RAM load

This will allow us to load code directly into RAM without going through
flash.
---
 firmware/src/os/usb_descriptors_openpcd.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'firmware/src/os')

diff --git a/firmware/src/os/usb_descriptors_openpcd.h b/firmware/src/os/usb_descriptors_openpcd.h
index ceb7ff6..58c54ec 100644
--- a/firmware/src/os/usb_descriptors_openpcd.h
+++ b/firmware/src/os/usb_descriptors_openpcd.h
@@ -20,8 +20,8 @@ const struct usb_device_descriptor dev_descriptor = {
 	.idProduct = USB_PRODUCT_ID,
 	.bcdDevice = 0x0030,	/* Version 0.3 */
 #ifdef CONFIG_USB_STRING
-	.iManufacturer = 3,
-	.iProduct = 4,
+	.iManufacturer = 4,
+	.iProduct = 5,
 	.iSerialNumber = 0,
 #else
 	.iManufacturer = 0,
@@ -36,7 +36,7 @@ struct _desc {
 	struct usb_interface_descriptor uif;
 	struct usb_endpoint_descriptor ep[3];
 #ifdef CONFIG_DFU
-	struct usb_interface_descriptor uif_dfu[2];
+	struct usb_interface_descriptor uif_dfu[3];
 #endif
 };
 
@@ -46,9 +46,9 @@ const struct _desc cfg_descriptor = {
 		 .bDescriptorType = USB_DT_CONFIG,
 		 .wTotalLength = USB_DT_CONFIG_SIZE +
 #ifdef CONFIG_DFU
-		 		 3 * USB_DT_INTERFACE_SIZE + 
+		 		 4 * USB_DT_INTERFACE_SIZE + 
 				 3 * USB_DT_ENDPOINT_SIZE,
-		 .bNumInterfaces = 3,
+		 .bNumInterfaces = 4,
 #else
 		 		 1 * USB_DT_INTERFACE_SIZE + 
 				 3 * USB_DT_ENDPOINT_SIZE,
@@ -56,7 +56,7 @@ const struct _desc cfg_descriptor = {
 #endif
 		 .bConfigurationValue = 1,
 #ifdef CONFIG_USB_STRING
-		 .iConfiguration = 5,
+		 .iConfiguration = 6,
 #else
 		 .iConfiguration = 0,
 #endif
@@ -73,7 +73,7 @@ const struct _desc cfg_descriptor = {
 		.bInterfaceSubClass = 0,
 		.bInterfaceProtocol = 0xff,
 #ifdef CONFIG_USB_STRING
-		.iInterface = 6,
+		.iInterface = 7,
 #else
 		.iInterface = 0,
 #endif
-- 
cgit v1.2.3