aboutsummaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-04-21 06:05:50 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-04-21 06:05:50 +0000
commite5e7eaee7af719cee00a8c2cb6fb4649dde0aa05 (patch)
tree5172668936967b507e6804daeb2cb7009232a8e3 /Projects
parentba7cd3f22e0ec8c2fc7fd5dae3620aa75d926fd3 (diff)
downloadlufa-e5e7eaee7af719cee00a8c2cb6fb4649dde0aa05.tar.gz
lufa-e5e7eaee7af719cee00a8c2cb6fb4649dde0aa05.tar.bz2
lufa-e5e7eaee7af719cee00a8c2cb6fb4649dde0aa05.zip
Removed specialized Endpoint_ClearControl* and Pipe_ClearControl* macros in favour of the standard Endpoint_Clear* and Pipe_Clear* macros (Atmel have confirmed no effect from setting FIFOCON on control endpoints).
Diffstat (limited to 'Projects')
-rw-r--r--Projects/Magstripe/Magstripe.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 4511b1c54..94eed314d 100644
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -178,30 +178,30 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
if (wLength > sizeof(KeyboardReportData))
wLength = sizeof(KeyboardReportData);
- Endpoint_ClearControlSETUP();
+ Endpoint_ClearSETUP();
/* Write the report data to the control endpoint */
Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);
/* Finalize the stream transfer to send the last packet or clear the host abort */
- Endpoint_ClearControlOUT();
+ Endpoint_ClearOUT();
}
break;
case REQ_GetProtocol:
if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
{
- Endpoint_ClearControlSETUP();
+ Endpoint_ClearSETUP();
/* Write the current protocol flag to the host */
Endpoint_Write_Byte(UsingReportProtocol);
/* Send the flag to the host */
- Endpoint_ClearControlIN();
+ Endpoint_ClearIN();
/* Acknowledge status stage */
while (!(Endpoint_IsOUTReceived()));
- Endpoint_ClearControlOUT();
+ Endpoint_ClearOUT();
}
break;
@@ -211,14 +211,14 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
/* Read in the wValue parameter containing the new protocol mode */
uint16_t wValue = Endpoint_Read_Word_LE();
- Endpoint_ClearControlSETUP();
+ Endpoint_ClearSETUP();
/* Set or clear the flag depending on what the host indicates that the current Protocol should be */
UsingReportProtocol = (wValue != 0x0000);
/* Acknowledge status stage */
while (!(Endpoint_IsINReady()));
- Endpoint_ClearControlIN();
+ Endpoint_ClearIN();
}
break;
@@ -228,31 +228,31 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
/* Read in the wValue parameter containing the idle period */
uint16_t wValue = Endpoint_Read_Word_LE();
- Endpoint_ClearControlSETUP();
+ Endpoint_ClearSETUP();
/* Get idle period in MSB */
IdleCount = (wValue >> 8);
/* Acknowledge status stage */
while (!(Endpoint_IsINReady()));
- Endpoint_ClearControlIN();
+ Endpoint_ClearIN();
}
break;
case REQ_GetIdle:
if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
{
- Endpoint_ClearControlSETUP();
+ Endpoint_ClearSETUP();
/* Write the current idle duration to the host */
Endpoint_Write_Byte(IdleCount);
/* Send the flag to the host */
- Endpoint_ClearControlIN();
+ Endpoint_ClearIN();
/* Acknowledge status stage */
while (!(Endpoint_IsOUTReceived()));
- Endpoint_ClearControlOUT();
+ Endpoint_ClearOUT();
}
break;