diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-04-20 11:21:36 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-04-20 11:21:36 +0000 |
| commit | f05c19a8eaea1a4df179cfc3ee967280cf0ae309 (patch) | |
| tree | 0288d41e710e3142696765cb76288357439c296b /LUFA/Drivers/USB | |
| parent | 545bce765dfa0095133156ac42a882cb13ec944d (diff) | |
Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander).
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@517 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers/USB')
| -rw-r--r-- | LUFA/Drivers/USB/Class/ConfigDescriptor.c | 10 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/USBTask.c | 20 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Pipe.h | 6 |
3 files changed, 17 insertions, 19 deletions
diff --git a/LUFA/Drivers/USB/Class/ConfigDescriptor.c b/LUFA/Drivers/USB/Class/ConfigDescriptor.c index c9f8c3cb..dd782c81 100644 --- a/LUFA/Drivers/USB/Class/ConfigDescriptor.c +++ b/LUFA/Drivers/USB/Class/ConfigDescriptor.c @@ -37,11 +37,11 @@ uint8_t USB_GetDeviceConfigDescriptor(uint16_t* const ConfigSizePtr, void* Buffe USB_HostRequest = (USB_Host_Request_Header_t)
{
- bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
- bRequest: REQ_GetDescriptor,
- wValue: (DTYPE_Configuration << 8),
- wIndex: 0,
- wLength: sizeof(USB_Descriptor_Configuration_Header_t),
+ .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
+ .bRequest = REQ_GetDescriptor,
+ .wValue = (DTYPE_Configuration << 8),
+ .wIndex = 0,
+ .wLength = sizeof(USB_Descriptor_Configuration_Header_t),
};
Pipe_SelectPipe(PIPE_CONTROLPIPE);
diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c index 80731ac1..e1c06590 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.c +++ b/LUFA/Drivers/USB/HighLevel/USBTask.c @@ -171,11 +171,11 @@ static void USB_HostTask(void) case HOST_STATE_Default:
USB_HostRequest = (USB_Host_Request_Header_t)
{
- bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
- bRequest: REQ_GetDescriptor,
- wValue: (DTYPE_Device << 8),
- wIndex: 0,
- wLength: PIPE_CONTROLPIPE_DEFAULT_SIZE,
+ .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
+ .bRequest = REQ_GetDescriptor,
+ .wValue = (DTYPE_Device << 8),
+ .wIndex = 0,
+ .wLength = PIPE_CONTROLPIPE_DEFAULT_SIZE,
};
uint8_t DataBuffer[PIPE_CONTROLPIPE_DEFAULT_SIZE];
@@ -216,11 +216,11 @@ static void USB_HostTask(void) USB_HostRequest = (USB_Host_Request_Header_t)
{
- bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
- bRequest: REQ_SetAddress,
- wValue: USB_HOST_DEVICEADDRESS,
- wIndex: 0,
- wLength: 0,
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
+ .bRequest = REQ_SetAddress,
+ .wValue = USB_HOST_DEVICEADDRESS,
+ .wIndex = 0,
+ .wLength = 0,
};
if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index 4e2ffec5..c4a58b47 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -805,8 +805,8 @@ *
* \ingroup Group_PipeRW
*/
- static inline void Pipe_Ignore_DWord(void) ATTR_ALWAYS_INLINE;
- static inline void Pipe_Ignore_DWord(void)
+ static inline void Pipe_Discard_DWord(void) ATTR_ALWAYS_INLINE;
+ static inline void Pipe_Discard_DWord(void)
{
uint8_t Dummy;
@@ -854,8 +854,6 @@ /** Spinloops until the currently selected non-control pipe is ready for the next packed of data
* to be read or written to it.
*
- * \note This routine should not be called on CONTROL type pipes.
- *
* \ingroup Group_PipeRW
*
* \return A value from the Pipe_WaitUntilReady_ErrorCodes_t enum.
|