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
02a1c21
..
5f3eeb8
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/Host.c
+++ b/
LUFA/Drivers/USB/LowLevel/Host.c
@@
-214,9
+214,9
@@
uint8_t USB_Host_WaitMS(uint8_t MS)
\r
while (MS)
\r
{
\r
\r
while (MS)
\r
{
\r
- if (
FrameElapsed
)
\r
+ if (
USB_INT_HasOccurred(USB_INT_HSOFI)
)
\r
{
\r
{
\r
-
FrameElapsed = false
;
\r
+
USB_INT_Clear(USB_INT_HSOFI)
;
\r
MS--;
\r
}
\r
\r
MS--;
\r
}
\r
\r
@@
-259,9
+259,9
@@
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
-
FrameElapsed = false
;
\r
+ USB_Host_ResumeBus();
\r
+
\r
+
USB_INT_Clear(USB_INT_HSOFI)
;
\r
\r
for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
\r
{
\r
\r
for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
\r
{
\r
@@
-270,10
+270,9
@@
static void USB_Host_ResetDevice(void)
looked for - if it is found within 10ms, the device is still
\r
present. */
\r
\r
looked for - if it is found within 10ms, the device is still
\r
present. */
\r
\r
- if (
FrameElapsed
)
\r
+ if (
USB_INT_HasOccurred(USB_INT_HSOFI)
)
\r
{
\r
{
\r
- FrameElapsed = false;
\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