Optimize vendor/product description string display code in MassStorageHost.

Remove all Host mode class demos other than the CDCHost class driver demo, so that they can be re-added as they are made once the host mode class framework is designed.

Fixed USB_Host_SendControlRequest() not re-suspending the USB bus when initial device ready-wait fails.

Fixed USB Pad regulator not being disabled on some AVR models when the USB_OPT_REG_DISABLED option is used.

6 files changed, 19 insertions, 8 deletions

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
index 4054cf117..3c24617e1 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -80,6 +80,8 @@
 				

 				struct

 				{

+					bool Active; /**< Indicates if the interface is currently active, i.e. attached to the connected device */

+				

 					uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */

 					uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the

 										  *   CDCDevice_CDC_LineCodingFormats_t enum

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
index 238e099ef..2bdab7c67 100644
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -46,7 +46,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 	USB_Host_ResumeBus();

 	

 	if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)

-	  return ReturnStatus;

+	  goto End_Of_Control_Send;

 

 	Pipe_SetToken(PIPE_TOKEN_SETUP);

 	Pipe_ClearErrorFlags();

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index b829c19f7..4fcf4fcab 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -186,6 +186,8 @@ void USB_ResetInterface(void)
 		

 	if (!(USB_Options & USB_OPT_REG_DISABLED))

 	  USB_REG_On();

+	else

+	  USB_REG_Off();

 	

 	USB_CLK_Unfreeze();

 

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 34fe10994..ea42ddf47 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -34,8 +34,10 @@
   *  - Fixed CDCHost demo unfreezing the pipes at the point of configuration, rather than use

   *  - Pipe stream functions now automatically set the correct pipe token, so that bidirectional pipes can be used

   *  - Pipe_ConfigurePipe() now automatically defaults IN pipes to accepting infinite IN requests, this can still be changed by calling

-  *    the existing \ref Pipe_SetFiniteINRequests() function

+  *    the existing Pipe_SetFiniteINRequests() function

   *  - Fixed MassStorage demo not clearing the reset flag when a Mass Storage Reset is issued while not processing a command

+  *  - Fixed USB_Host_SendControlRequest() not re-suspending the USB bus when initial device ready-wait fails

+  *  - Fixed USB Pad regulator not being disabled on some AVR models when the USB_OPT_REG_DISABLED option is used

   *

   *

   *  \section Sec_ChangeLog090605 Version 090605

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 7c6e4ee32..fd066d0b3 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -11,19 +11,23 @@
   *  If you have an item to add to this list, please contact the library author via email, the LUFA mailing list,

   *  or post your suggestion as an enhancement request to the project bug tracker.

   *

+  *  <b>Targeted for This Release:</b>

   *  - Make new host class drivers

   *  - Document new host class drivers

   *  - Convert Host mode demos to class drivers

   *  - Re-enable Host mode Class driver builds after completion

   *  - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES

+  *  - Update Host mode Class Driver demo .txt files

+  *  - Debug mode for pipe/endpoint calls

+  *

+  *  <b>Targeted for Future Releases:</b>

+  *  - Remake AVRStudio project files

+  *  - Detailed overviews of how each demo works

+  *  - Master LUFA include file

+  *  - Stream reads - return number of bytes not read?

   *  - Add multiple-report HID demo to the library

   *  - Add dual role Mouse Host/Keyboard Device demo to the library

+  *  - Add hub support to match Atmel's stack

   *  - Port LUFA to the AVR32 UC3B series microcontrollers

   *  - Port LUFA to the Atmel ARM7 series microcontrollers

-  *  - Remake AVRStudio project files

-  *  - Master LUFA include file

-  *  - Debug mode for pipe/endpoint calls

-  *  - Add hub support to match Atmel's stack

-  *  - Update Host mode Class Driver demo .txt files

-  *  - Stream reads - return number of bytes not read?

   */

diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt
index 2a9b65842..c15911a01 100644
--- a/LUFA/ManPages/LUFAPoweredProjects.txt
+++ b/LUFA/ManPages/LUFAPoweredProjects.txt
@@ -23,6 +23,7 @@
  *  - USBFoo, an AT90USB162 based development board: http://shop.kernelconcepts.de/product_info.php?products_id=102

  *  - USB10 AKA "The Ferret", a AT90USB162 development board: http://www.soc-machines.com

  *  - Teensy and Teensy++, two other AVR USB development boards: http://www.pjrc.com/teensy/index.html

+ *  - Bumble-B, yet another AT90USB162 development board: http://fletchtronics.net/

  * 

  *  \section Sec_LUFAProjects Projects Using LUFA (Hobbyist)

  *