From 292fc9b65eba6b874dd4c29087cf499123f8bd0c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 20 Jul 2009 14:23:47 +0000 Subject: [PATCH] Move unfinished SideShow source files to nested Lib directory for clarity. --- .../Incomplete/Sideshow/{ => Lib}/SideshowApplications.c | 0 .../Incomplete/Sideshow/{ => Lib}/SideshowApplications.h | 0 .../Incomplete/Sideshow/{ => Lib}/SideshowCommands.c | 0 .../Incomplete/Sideshow/{ => Lib}/SideshowCommands.h | 0 .../Device/Incomplete/Sideshow/{ => Lib}/SideshowCommon.c | 0 .../Device/Incomplete/Sideshow/{ => Lib}/SideshowCommon.h | 0 .../Incomplete/Sideshow/{ => Lib}/SideshowContent.c | 0 .../Incomplete/Sideshow/{ => Lib}/SideshowContent.h | 0 Demos/Device/Incomplete/Sideshow/makefile | 8 ++++---- LUFA.pnproj | 2 +- LUFA/Drivers/USB/LowLevel/Host.c | 4 ++-- LUFA/Drivers/USB/LowLevel/Host.h | 4 ++-- LUFA/Drivers/USB/LowLevel/Pipe.h | 5 ----- 13 files changed, 9 insertions(+), 14 deletions(-) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowApplications.c (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowApplications.h (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowCommands.c (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowCommands.h (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowCommon.c (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowCommon.h (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowContent.c (100%) rename Demos/Device/Incomplete/Sideshow/{ => Lib}/SideshowContent.h (100%) diff --git a/Demos/Device/Incomplete/Sideshow/SideshowApplications.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowApplications.c rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c diff --git a/Demos/Device/Incomplete/Sideshow/SideshowApplications.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.h similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowApplications.h rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.h diff --git a/Demos/Device/Incomplete/Sideshow/SideshowCommands.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.c similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowCommands.c rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.c diff --git a/Demos/Device/Incomplete/Sideshow/SideshowCommands.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.h similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowCommands.h rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.h diff --git a/Demos/Device/Incomplete/Sideshow/SideshowCommon.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowCommon.c rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c diff --git a/Demos/Device/Incomplete/Sideshow/SideshowCommon.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowCommon.h rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h diff --git a/Demos/Device/Incomplete/Sideshow/SideshowContent.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowContent.c rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c diff --git a/Demos/Device/Incomplete/Sideshow/SideshowContent.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h similarity index 100% rename from Demos/Device/Incomplete/Sideshow/SideshowContent.h rename to Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile index e5d40879c2..aa44b24ef8 100644 --- a/Demos/Device/Incomplete/Sideshow/makefile +++ b/Demos/Device/Incomplete/Sideshow/makefile @@ -135,10 +135,10 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ - SideshowCommon.c \ - SideshowCommands.c \ - SideshowApplications.c \ - SideshowContent.c \ + Lib/SideshowCommon.c \ + Lib/SideshowCommands.c \ + Lib/SideshowApplications.c \ + Lib/SideshowContent.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ diff --git a/LUFA.pnproj b/LUFA.pnproj index 0aa5673672..111ce3debd 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index 78a9ca8fbd..efe4baeeb2 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -288,7 +288,7 @@ static void USB_Host_ResetDevice(void) USB_INT_Enable(USB_INT_DDISCI); } -uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber) +uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber) { USB_ControlRequest = (USB_Request_Header_t) { @@ -304,7 +304,7 @@ uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber) return USB_Host_SendControlRequest(NULL); } -uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr) +uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr) { USB_ControlRequest = (USB_Request_Header_t) { diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h index d91c1d82d5..88634fdae0 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.h +++ b/LUFA/Drivers/USB/LowLevel/Host.h @@ -186,7 +186,7 @@ * * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. */ - uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber); + uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber); /** Convenience function. This routine sends a GetDescriptor standard request to the attached * device, requesting the device descriptor. This can be used to easily retrieve information @@ -199,7 +199,7 @@ * * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. */ - uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr); + uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr); /** Clears a stall condition on the given pipe, via a ClearFeature request to the attached device. * diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index f03ea09c24..fae8105ff5 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -175,11 +175,6 @@ */ #define PIPE_EPNUM_MASK 0x0F - /** Endpoint bank size mask, for masking against endpoint addresses to retrieve the endpoint's - * bank size in the attached device. - */ - #define PIPE_EPSIZE_MASK 0x7FF - /* Pseudo-Function Macros: */ #if defined(__DOXYGEN__) /** Indicates the number of bytes currently stored in the current pipes's selected bank.