projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished CDC device class driver documentation.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
LowLevel
/
Host.c
diff --git
a/LUFA/Drivers/USB/LowLevel/Host.c
b/LUFA/Drivers/USB/LowLevel/Host.c
index
b3b56b8
..
5f3eeb8
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/Host.c
+++ b/
LUFA/Drivers/USB/LowLevel/Host.c
@@
-55,7
+55,7
@@
void USB_Host_ProcessNextHostState(void)
break;
\r
}
\r
\r
break;
\r
}
\r
\r
- if (!(
WaitMSRemaining--
))
\r
+ if (!(
--WaitMSRemaining
))
\r
USB_HostState = PostWaitState;
\r
}
\r
\r
USB_HostState = PostWaitState;
\r
}
\r
\r
@@
-210,7
+210,6
@@
uint8_t USB_Host_WaitMS(uint8_t MS)
bool BusSuspended = USB_Host_IsBusSuspended();
\r
uint8_t ErrorCode = HOST_WAITERROR_Successful;
\r
\r
bool BusSuspended = USB_Host_IsBusSuspended();
\r
uint8_t ErrorCode = HOST_WAITERROR_Successful;
\r
\r
- USB_INT_Clear(USB_INT_HSOFI);
\r
USB_Host_ResumeBus();
\r
\r
while (MS)
\r
USB_Host_ResumeBus();
\r
\r
while (MS)
\r
@@
-260,9
+259,10
@@
static void USB_Host_ResetDevice(void)
USB_Host_ResetBus();
\r
while (!(USB_Host_IsBusResetComplete()));
\r
\r
USB_Host_ResetBus();
\r
while (!(USB_Host_IsBusResetComplete()));
\r
\r
+ USB_Host_ResumeBus();
\r
+
\r
USB_INT_Clear(USB_INT_HSOFI);
\r
USB_INT_Clear(USB_INT_HSOFI);
\r
- USB_Host_ResumeBus();
\r
-
\r
+
\r
for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
\r
{
\r
/* Workaround for powerless-pull-up devices. After a USB bus reset,
\r
for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
\r
{
\r
/* Workaround for powerless-pull-up devices. After a USB bus reset,
\r
@@
-272,6
+272,7
@@
static void USB_Host_ResetDevice(void)
\r
if (USB_INT_HasOccurred(USB_INT_HSOFI))
\r
{
\r
\r
if (USB_INT_HasOccurred(USB_INT_HSOFI))
\r
{
\r
+ USB_INT_Clear(USB_INT_HSOFI);
\r
USB_INT_Clear(USB_INT_DDISCI);
\r
break;
\r
}
\r
USB_INT_Clear(USB_INT_DDISCI);
\r
break;
\r
}
\r