Commit LUFA-111009-QA tag for QA testing before moving into beta phase.LUFA-111009-QA

git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-111009-QA@1923 d5102386-fcda-11dd-9fdb-3debd5008f28

6 files changed, 161 insertions, 160 deletions

diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/ConfigDescriptor.c b/Demos/Host/Incomplete/AndroidAccessoryHost/ConfigDescriptor.c
index 0dc19e9a..29fbfcaa 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/ConfigDescriptor.c
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/ConfigDescriptor.c
@@ -88,7 +88,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Endpoint_t);
 
 		/* If the endpoint is a IN type endpoint */
-		if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)
+		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
 		  DataINEndpoint  = EndpointData;
 		else
 		  DataOUTEndpoint = EndpointData;
diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c b/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c
index cd26538e..3a1b604f 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c
@@ -1,83 +1,83 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *

- *  Android Accessory Mode utility functions, for the configuration of an attached

- *  Android device into Android Accessory Mode ready for general communication.

- */

- 

-#include "AndroidAccessoryCommands.h" 

-

-uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol)

-{

-	USB_ControlRequest = (USB_Request_Header_t)

-	{

-		.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE),

-		.bRequest      = ANDROID_Req_GetAccessoryProtocol,

-		.wValue        = 0,

-		.wIndex        = 0,

-		.wLength       = sizeof(uint16_t),

-	};

-

-	Pipe_SelectPipe(PIPE_CONTROLPIPE);

-	return USB_Host_SendControlRequest(Protocol);

-}

-

-uint8_t Android_SendString(const uint8_t StringIndex,

-                           char* String)

-{

-	USB_ControlRequest = (USB_Request_Header_t)

-	{

-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),

-		.bRequest      = ANDROID_Req_SendString,

-		.wValue        = 0,

-		.wIndex        = StringIndex,

-		.wLength       = (strlen(String) + 1),

-	};

-

-	Pipe_SelectPipe(PIPE_CONTROLPIPE);

-	return USB_Host_SendControlRequest(String);

-}

-

-uint8_t Android_StartAccessoryMode(void)

-{

-	USB_ControlRequest = (USB_Request_Header_t)

-	{

-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),

-		.bRequest      = ANDROID_Req_StartAccessoryMode,

-		.wValue        = 0,

-		.wIndex        = 0,

-		.wLength       = 0,

-	};

-

-	Pipe_SelectPipe(PIPE_CONTROLPIPE);

-	return USB_Host_SendControlRequest(NULL);	

-}

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Android Accessory Mode utility functions, for the configuration of an attached
+ *  Android device into Android Accessory Mode ready for general communication.
+ */
+ 
+#include "AndroidAccessoryCommands.h" 
+
+uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+	{
+		.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE),
+		.bRequest      = ANDROID_Req_GetAccessoryProtocol,
+		.wValue        = 0,
+		.wIndex        = 0,
+		.wLength       = sizeof(uint16_t),
+	};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	return USB_Host_SendControlRequest(Protocol);
+}
+
+uint8_t Android_SendString(const uint8_t StringIndex,
+                           char* String)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+	{
+		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
+		.bRequest      = ANDROID_Req_SendString,
+		.wValue        = 0,
+		.wIndex        = StringIndex,
+		.wLength       = (strlen(String) + 1),
+	};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	return USB_Host_SendControlRequest(String);
+}
+
+uint8_t Android_StartAccessoryMode(void)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+	{
+		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
+		.bRequest      = ANDROID_Req_StartAccessoryMode,
+		.wValue        = 0,
+		.wIndex        = 0,
+		.wLength       = 0,
+	};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	return USB_Host_SendControlRequest(NULL);	
+}
diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h b/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h
index d5f6fa84..68fbb47b 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h
@@ -1,74 +1,74 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *

- *  Header file for AndroidAccessoryCommands.c.

- */

-

-#ifndef _ANDROID_ACCESSORY_COMMANDS_H_

-#define _ANDROID_ACCESSORY_COMMANDS_H_

-

-	/* Includes: */

-		#include <stdint.h>

-		#include <stdbool.h>

-

-		#include <LUFA/Drivers/USB/USB.h>

-

-	/* Enums: */

-		enum Android_Requests_t

-		{

-			ANDROID_Req_GetAccessoryProtocol    = 51,

-			ANDROID_Req_SendString              = 52,

-			ANDROID_Req_StartAccessoryMode      = 53,

-		};

-

-		enum Android_Strings_t

-		{

-			ANDROID_STRING_Manufacturer         = 0,

-			ANDROID_STRING_Model                = 1,

-			ANDROID_STRING_Description          = 2,

-			ANDROID_STRING_Version              = 3,

-			ANDROID_STRING_URI                  = 4,

-			ANDROID_STRING_Serial               = 5,

-		};

-		

-		enum Android_Protocols_t

-		{

-			ANDROID_PROTOCOL_Accessory          = 0x0001,

-		};

-	

-	/* Function Prototypes: */

-		uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol);

-		uint8_t Android_SendString(const uint8_t StringIndex,

-		                           char* String);

-		uint8_t Android_StartAccessoryMode(void);	

-	

-#endif

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Header file for AndroidAccessoryCommands.c.
+ */
+
+#ifndef _ANDROID_ACCESSORY_COMMANDS_H_
+#define _ANDROID_ACCESSORY_COMMANDS_H_
+
+	/* Includes: */
+		#include <stdint.h>
+		#include <stdbool.h>
+
+		#include <LUFA/Drivers/USB/USB.h>
+
+	/* Enums: */
+		enum Android_Requests_t
+		{
+			ANDROID_Req_GetAccessoryProtocol    = 51,
+			ANDROID_Req_SendString              = 52,
+			ANDROID_Req_StartAccessoryMode      = 53,
+		};
+
+		enum Android_Strings_t
+		{
+			ANDROID_STRING_Manufacturer         = 0,
+			ANDROID_STRING_Model                = 1,
+			ANDROID_STRING_Description          = 2,
+			ANDROID_STRING_Version              = 3,
+			ANDROID_STRING_URI                  = 4,
+			ANDROID_STRING_Serial               = 5,
+		};
+		
+		enum Android_Protocols_t
+		{
+			ANDROID_PROTOCOL_Accessory          = 0x0001,
+		};
+	
+	/* Function Prototypes: */
+		uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol);
+		uint8_t Android_SendString(const uint8_t StringIndex,
+		                           char* String);
+		uint8_t Android_StartAccessoryMode(void);	
+	
+#endif
diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/makefile b/Demos/Host/Incomplete/AndroidAccessoryHost/makefile
index 1d1cb0cb..90f685f6 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/makefile
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/makefile
@@ -122,6 +122,7 @@ LUFA_PATH = ../../../..
 # LUFA library compile-time options and predefined tokens
 LUFA_OPTS  = -D USB_HOST_ONLY
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D HOST_DEVICE_SETTLE_DELAY_MS=0
 
 
 # Create the LUFA source path variables by including the LUFA root makefile
diff --git a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
index 10a24d58..63a3ed33 100644
--- a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
@@ -90,7 +90,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Endpoint_t);
 
 		/* If the endpoint is a IN type endpoint */
-		if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)
+		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
 		{
 			/* Check if the found endpoint is a interrupt or bulk type descriptor */
 			if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
index 35bfcdd0..ed4a2487 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
@@ -44,7 +44,7 @@
 #define  INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C
 #include "BluetoothHCICommands.h"
 
-/** Temporary Bluetooth Device Address, for HCI responses which much include the destination address */
+/** Temporary Bluetooth Device Address, for HCI responses which must include the destination address */
 static uint8_t Bluetooth_TempDeviceAddress[6];
 
 /** Bluetooth HCI processing task. This task should be called repeatedly the main Bluetooth