Added new Drivers/USB/LowLevel/Device.c file to house Device mode specific functions that are more complicated than simple macros. Moved USB_Device_SendRemoteWakeup() to the new Device.c source file and corrected it to unfreeze and restart the USB controller clock before issuing a Remote Wakeup request.

Removed the USB_Device_IsRemoteWakeupSent() and USB_Device_IsUSBSuspended() macros, as they are now obsolete.

6 files changed, 86 insertions, 51 deletions

diff --git a/LUFA/Drivers/USB/LowLevel/Device.c b/LUFA/Drivers/USB/LowLevel/Device.c
new file mode 100644
index 000000000..b21e6574d
--- /dev/null
+++ b/LUFA/Drivers/USB/LowLevel/Device.c
@@ -0,0 +1,52 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2010.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2010  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.

+*/

+

+#define  __INCLUDE_FROM_USB_DRIVER

+#include "../HighLevel/USBMode.h"

+

+#if defined(USB_CAN_BE_DEVICE)

+

+#include "Device.h"

+

+void USB_Device_SendRemoteWakeup(void)

+{

+	if (!(USB_Options & USB_OPT_MANUAL_PLL))

+	{

+		USB_PLL_On();

+		while (!(USB_PLL_IsReady()));

+	}

+

+	USB_CLK_Unfreeze();

+

+	UDCON |= (1 << RMWKUP);

+	while (!(UDCON & (1 << RMWKUP)));

+}

+

+#endif

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index 7cd2d8b06..b595564a6 100644
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -85,49 +85,26 @@
 			 *  USB interface should be initialized in full speed (12Mb/s) mode.
 			 */
 			#define USB_DEVICE_OPT_FULLSPEED               (0 << 0)
-			
+
+		/* Function Prototypes: */
+			/** Sends a Remote Wakeup request to the host. This signals to the host that the device should
+			 *  be taken out of suspended mode, and communications should resume.
+			 *
+			 *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the
+			 *  host computer when the host has suspended all USB devices to enter a low power state.
+			 *
+			 *  \note This macro should only be used if the device has indicated to the host that it
+			 *        supports the Remote Wakeup feature in the device descriptors, and should only be
+			 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
+			 *        the \ref USB_RemoteWakeupEnabled flag is set). When the NO_DEVICE_REMOTE_WAKEUP compile
+			 *        time option is used, this macro is unavailable.
+			 *
+			 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.
+			 */
+			void USB_Device_SendRemoteWakeup(void);
+							
 		/* Pseudo-Function Macros: */
-			#if defined(__DOXYGEN__)
-				/** Sends a Remote Wakeup request to the host. This signals to the host that the device should
-				 *  be taken out of suspended mode, and communications should resume.
-				 *
-				 *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the
-				 *  host computer when the host has suspended all USB devices to enter a low power state.
-				 *
-				 *  \note This macro should only be used if the device has indicated to the host that it
-				 *        supports the Remote Wakeup feature in the device descriptors, and should only be
-				 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
-				 *        the \ref USB_RemoteWakeupEnabled flag is set). When the NO_DEVICE_REMOTE_WAKEUP compile
-				 *        time option is used, this macro is unavailable.
-				 *
-				 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.
-				 */
-				static inline void USB_Device_SendRemoteWakeup(void);
-				
-				/** Indicates if a Remote Wakeup request is being sent to the host. This returns true if a
-				 *  remote wakeup is currently being sent, false otherwise.
-				 *
-				 *  This can be used in conjunction with the \ref USB_Device_IsUSBSuspended() macro to determine if
-				 *  a sent RMWAKEUP request was accepted or rejected by the host.
-				 *
-				 *  \note This macro should only be used if the device has indicated to the host that it
-				 *        supports the Remote Wakeup feature in the device descriptors. When the NO_DEVICE_REMOTE_WAKEUP
-				 *        compile time option is used, this macro is unavailable.
-				 *
-				 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.
-				 *
-				 *  \return Boolean true if no Remote Wakeup request is currently being sent, false otherwise
-				 */
-				static inline bool USB_Device_IsRemoteWakeupSent(void);
-				
-				/** Indicates if the device is currently suspended by the host. Whilst suspended, the device is
-				 *  to enter a low power state until resumed by the host. No USB traffic to or from the device
-				 *  can occur (except for Remote Wakeup requests) during suspension by the host.
-				 *
-				 *  \return Boolean true if the USB communications have been suspended by the host, false otherwise.
-				 */
-				static inline bool USB_Device_IsUSBSuspended(void);
-				
+			#if defined(__DOXYGEN__)				
 				/** Enables the device mode Start Of Frame events. When enabled, this causes the
 				 *  \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
 				 *  at the start of each USB frame when enumerated in device mode.
@@ -139,14 +116,6 @@
 				 */
 				static inline bool USB_Device_DisableSOFEvents(void);
 			#else
-				#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-					#define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE
-
-					#define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)
-				#endif
-				
-				#define USB_Device_IsUSBSuspended()           ((UDINT &  (1 << SUSPI)) ? true : false)
-				
 				#define USB_Device_EnableSOFEvents()    MACROS{ USB_INT_Enable(USB_INT_SOFI); }MACROE
 
 				#define USB_Device_DisableSOFEvents()   MACROS{ USB_INT_Disable(USB_INT_SOFI); }MACROE
diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 234d6f9e3..74d1cdfc7 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -42,6 +42,7 @@
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
  *    - LUFA/Drivers/USB/LowLevel/DevChapter9.c
+ *    - LUFA/Drivers/USB/LowLevel/Device.c
  *    - LUFA/Drivers/USB/LowLevel/Endpoint.c
  *    - LUFA/Drivers/USB/LowLevel/Host.c
  *    - LUFA/Drivers/USB/LowLevel/HostChapter9.c
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 81209b1d7..593751af1 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -13,6 +13,7 @@
   *    the VTARGET reference voltage and scale factor
   *  - Added new pgm_read_ptr() macro to Common.h for reading of pointers out of flash memory space
   *  - Added new SWAPENDIAN_16() and SWAPENDIAN_32() macros to Common.h for statically initialized variables at compile time
+  *  - Added new Drivers/USB/LowLevel/Device.c file to house Device mode specific functions that are more complicated than simple macros
   *
   *  <b>Changed:</b>
   *  - The RingBuff library code has been replaced in the XPLAINBridge, Benito and USBtoSerial projects with an ultra lightweight
@@ -23,6 +24,7 @@
   *    parameters to EEPROM to preserve its lifespan
   *  - Removed unused line encoding data and control requests from the CDC Bootloader code, to save space
   *  - Renamed SERIAL_STREAM_ASSERT() macro to STDOUT_ASSERT()
+  *  - The USB_Device_IsRemoteWakeupSent() and USB_Device_IsUSBSuspended() macros have been deleted, as they are now obsolete
   *
   *  <b>Fixed:</b>
   *  - Fixed AVRISP project sending a LOAD EXTENDED ADDRESS command to 128KB AVRs after programming or reading from
@@ -36,6 +38,7 @@
   *  - Fixed internal device serial not being accessible on the ATMEGAXXU2 AVRs (thanks to Axel Rohde)
   *  - Fixed void pointer arithmetic in ConfigDescriptor.h breaking C++ compatibility (thanks to Michael Hennebry)
   *  - Fixed broken PDI EEPROM Section Erase functionality in the AVRISP-MKII project
+  *  - Fixed USB_Device_SendRemoteWakeup() not working when the USB clock was frozen during USB bus suspend (thanks to Brian Dickman)
   *
   *  \section Sec_ChangeLog100513 Version 100513
   *  <b>New:</b>
diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index 93900251a..570af597c 100644
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -11,7 +11,16 @@
  *  areas relevant to making older projects compatible with the API changes of each new release.
  *
  * \section Sec_Migration100513 Migrating from 100513 to XXXXXX
- *  N/A
+ *
+ *  <b>USB Core</b>
+ *    - A new USB driver source file, Drivers/USB/LowLevel/Device.c now exists. This source file should be added to all project
+ *      makefiles using the USB driver of LUFA.
+ *
+ *  <b>Device Mode</b>
+ *    - The USB_Device_IsRemoteWakeupSent() macro has been removed, as the remote wakeup request is now fully handled by the
+ *      enhanced \ref USB_Device_SendRemoteWakeup() function. Existing code may now discard any checks to USB_Device_IsRemoteWakeupSent().
+ *    - The USB_Device_IsUSBSuspended() macro has been removed, as it is obsolete. Existing code should compare \ref USB_DeviceState
+ *      to see if it the device is in the \ref DEVICE_STATE_Suspended state instead.
  *
  * \section Sec_Migration100513 Migrating from 100219 to 100513
  *
diff --git a/LUFA/makefile b/LUFA/makefile
index 3d21db330..f77b1c432 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -9,6 +9,7 @@
 # Makefile for the LUFA library itself.
 
 LUFA_SRC_FILES =     ./Drivers/USB/LowLevel/DevChapter9.c        \
+                     ./Drivers/USB/LowLevel/Device.c             \
                      ./Drivers/USB/LowLevel/Endpoint.c           \
                      ./Drivers/USB/LowLevel/Host.c               \
                      ./Drivers/USB/LowLevel/HostChapter9.c       \