aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Host
diff options
context:
space:
mode:
Diffstat (limited to 'Demos/Host')
-rw-r--r--Demos/Host/GenericHIDHost/makefile2
-rw-r--r--Demos/Host/MassStorageHost/Lib/MassStoreCommands.c4
-rw-r--r--Demos/Host/StillImageHost/Lib/StillImageCommands.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/Demos/Host/GenericHIDHost/makefile b/Demos/Host/GenericHIDHost/makefile
index b17ae1641..b912b2ff8 100644
--- a/Demos/Host/GenericHIDHost/makefile
+++ b/Demos/Host/GenericHIDHost/makefile
@@ -138,7 +138,7 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
- $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
+ $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c
index 95aafca8c..f47e9f5ed 100644
--- a/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c
+++ b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c
@@ -119,10 +119,10 @@ static uint8_t MassStore_WaitForDataReceived(void)
while (!(Pipe_IsINReceived()))
{
/* Check to see if a new frame has been issued (1ms elapsed) */
- if (USB_INT_HasOccurred(USB_INT_HSOFI))
+ if (FrameElapsed)
{
/* Clear the flag and decrement the timeout period counter */
- USB_INT_Clear(USB_INT_HSOFI);
+ FrameElapsed = false;
TimeoutMSRem--;
/* Check to see if the timeout period for the command has elapsed */
diff --git a/Demos/Host/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/StillImageHost/Lib/StillImageCommands.c
index 8f05e48f4..f2f666bd1 100644
--- a/Demos/Host/StillImageHost/Lib/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/Lib/StillImageCommands.c
@@ -109,10 +109,10 @@ uint8_t SImage_RecieveBlockHeader(void)
while (!(Pipe_IsReadWriteAllowed()))
{
/* Check to see if a new frame has been issued (1ms elapsed) */
- if (USB_INT_HasOccurred(USB_INT_HSOFI))
+ if (FrameElapsed)
{
/* Clear the flag and decrement the timeout period counter */
- USB_INT_Clear(USB_INT_HSOFI);
+ FrameElapsed = false;
TimeoutMSRem--;
/* Check to see if the timeout period for the command has elapsed */