diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-01 11:03:39 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-01 11:03:39 +0000 |
| commit | d1e52660368d34d693131f6aff3c8fd8584162e5 (patch) | |
| tree | 333916f85f9fd38a80b0785478aa596f11f166b6 /Demos/Host | |
| parent | 2440ca268ac444c1aed2441cefe9e25a767d961a (diff) | |
| download | lufa-d1e52660368d34d693131f6aff3c8fd8584162e5.tar.gz lufa-d1e52660368d34d693131f6aff3c8fd8584162e5.tar.bz2 lufa-d1e52660368d34d693131f6aff3c8fd8584162e5.zip | |
Commit of new class abstraction APIs for all device demos other than the MIDI demo - not documented yet.
Removed scheduler and memory allocation libraries.
Added new EVENT_USB_StartOfFrame event in the library to indicate the start of each USB frame (when generated).
Removed Tx interrupt from the USBtoSerial demo; now sends characters via polling to ensure more time for the Rx interrupt.
Diffstat (limited to 'Demos/Host')
| -rw-r--r-- | Demos/Host/GenericHIDHost/makefile | 2 | ||||
| -rw-r--r-- | Demos/Host/MassStorageHost/Lib/MassStoreCommands.c | 4 | ||||
| -rw-r--r-- | Demos/Host/StillImageHost/Lib/StillImageCommands.c | 4 |
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 */
|