projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed software PDI/TPI emulation from the AVRISP-MKII clone project, as it was...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
LowLevel
/
Endpoint.c
diff --git
a/LUFA/Drivers/USB/LowLevel/Endpoint.c
b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index
03be118
..
5560c80
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/
LUFA/Drivers/USB/LowLevel/Endpoint.c
@@
-28,11
+28,12
@@
this software.
\r
*/
\r
\r
this software.
\r
*/
\r
\r
+#define __INCLUDE_FROM_USB_DRIVER
\r
#include "../HighLevel/USBMode.h"
\r
\r
#if defined(USB_CAN_BE_DEVICE)
\r
\r
#include "../HighLevel/USBMode.h"
\r
\r
#if defined(USB_CAN_BE_DEVICE)
\r
\r
-#define INCLUDE_FROM_ENDPOINT_C
\r
+#define
__
INCLUDE_FROM_ENDPOINT_C
\r
#include "Endpoint.h"
\r
\r
#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
\r
#include "Endpoint.h"
\r
\r
#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
\r
@@
-119,6
+120,8
@@
uint8_t Endpoint_WaitUntilReady(void)
\r
if (USB_DeviceState == DEVICE_STATE_Unattached)
\r
return ENDPOINT_READYWAIT_DeviceDisconnected;
\r
\r
if (USB_DeviceState == DEVICE_STATE_Unattached)
\r
return ENDPOINT_READYWAIT_DeviceDisconnected;
\r
+ else if (USB_DeviceState == DEVICE_STATE_Suspended)
\r
+ return ENDPOINT_READYWAIT_BusSuspended;
\r
else if (Endpoint_IsStalled())
\r
return ENDPOINT_READYWAIT_EndpointStalled;
\r
\r
else if (Endpoint_IsStalled())
\r
return ENDPOINT_READYWAIT_EndpointStalled;
\r
\r