projects
/
pub
/
lufa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed GenericHIDHost demo report write routine incorrect for control type requests...
[pub/lufa.git]
/
Bootloaders
/
DFU
/
BootloaderDFU.c
diff --git
a/Bootloaders/DFU/BootloaderDFU.c
b/Bootloaders/DFU/BootloaderDFU.c
index
5375b9c
..
f358016
100644
(file)
--- a/
Bootloaders/DFU/BootloaderDFU.c
+++ b/
Bootloaders/DFU/BootloaderDFU.c
@@
-163,7
+163,7
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
switch (bRequest)
\r
{
\r
case DFU_DNLOAD:
\r
switch (bRequest)
\r
{
\r
case DFU_DNLOAD:
\r
- Endpoint_Clear
SetupReceived
();
\r
+ Endpoint_Clear
ControlSETUP
();
\r
\r
/* Check if bootloader is waiting to terminate */
\r
if (WaitForExit)
\r
\r
/* Check if bootloader is waiting to terminate */
\r
if (WaitForExit)
\r
@@
-178,7
+178,7
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
/* If the request has a data stage, load it into the command struct */
\r
if (SentCommand.DataSize)
\r
{
\r
/* If the request has a data stage, load it into the command struct */
\r
if (SentCommand.DataSize)
\r
{
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
\r
/* First byte of the data stage is the DNLOAD request's command */
\r
SentCommand.Command = Endpoint_Read_Byte();
\r
\r
/* First byte of the data stage is the DNLOAD request's command */
\r
SentCommand.Command = Endpoint_Read_Byte();
\r
@@
-235,8
+235,8
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
/* Check if endpoint is empty - if so clear it and wait until ready for next packet */
\r
if (!(Endpoint_BytesInEndpoint()))
\r
{
\r
/* Check if endpoint is empty - if so clear it and wait until ready for next packet */
\r
if (!(Endpoint_BytesInEndpoint()))
\r
{
\r
- Endpoint_Clear
Setup
OUT();
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
+ Endpoint_Clear
Control
OUT();
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
}
\r
\r
/* Write the next word into the current flash page */
\r
}
\r
\r
/* Write the next word into the current flash page */
\r
@@
-279,8
+279,8
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
/* Check if endpoint is empty - if so clear it and wait until ready for next packet */
\r
if (!(Endpoint_BytesInEndpoint()))
\r
{
\r
/* Check if endpoint is empty - if so clear it and wait until ready for next packet */
\r
if (!(Endpoint_BytesInEndpoint()))
\r
{
\r
- Endpoint_Clear
Setup
OUT();
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
+ Endpoint_Clear
Control
OUT();
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
}
\r
\r
/* Read the byte from the USB interface and write to to the EEPROM */
\r
}
\r
\r
/* Read the byte from the USB interface and write to to the EEPROM */
\r
@@
-296,17
+296,17
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
}
\r
}
\r
\r
}
\r
}
\r
\r
- Endpoint_Clear
Setup
OUT();
\r
+ Endpoint_Clear
Control
OUT();
\r
\r
/* Acknowledge status stage */
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
- Endpoint_Clear
Setup
IN();
\r
+ while (!(Endpoint_IsINReady()));
\r
+ Endpoint_Clear
Control
IN();
\r
\r
break;
\r
case DFU_UPLOAD:
\r
\r
break;
\r
case DFU_UPLOAD:
\r
- Endpoint_Clear
SetupReceived
();
\r
+ Endpoint_Clear
ControlSETUP
();
\r
\r
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
+ while (!(Endpoint_IsINReady()));
\r
\r
if (DFU_State != dfuUPLOAD_IDLE)
\r
{
\r
\r
if (DFU_State != dfuUPLOAD_IDLE)
\r
{
\r
@@
-343,8
+343,8
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
/* Check if endpoint is full - if so clear it and wait until ready for next packet */
\r
if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)
\r
{
\r
/* Check if endpoint is full - if so clear it and wait until ready for next packet */
\r
if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)
\r
{
\r
- Endpoint_Clear
Setup
IN();
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
+ Endpoint_Clear
Control
IN();
\r
+ while (!(Endpoint_IsINReady()));
\r
}
\r
\r
/* Read the flash word and send it via USB to the host */
\r
}
\r
\r
/* Read the flash word and send it via USB to the host */
\r
@@
-368,8
+368,8
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
/* Check if endpoint is full - if so clear it and wait until ready for next packet */
\r
if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)
\r
{
\r
/* Check if endpoint is full - if so clear it and wait until ready for next packet */
\r
if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)
\r
{
\r
- Endpoint_Clear
Setup
IN();
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
+ Endpoint_Clear
Control
IN();
\r
+ while (!(Endpoint_IsINReady()));
\r
}
\r
\r
/* Read the EEPROM byte and send it via USB to the host */
\r
}
\r
\r
/* Read the EEPROM byte and send it via USB to the host */
\r
@@
-384,15
+384,15
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
DFU_State = dfuIDLE;
\r
}
\r
\r
DFU_State = dfuIDLE;
\r
}
\r
\r
- Endpoint_Clear
Setup
IN();
\r
+ Endpoint_Clear
Control
IN();
\r
\r
/* Acknowledge status stage */
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
- Endpoint_Clear
Setup
OUT();
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
+ Endpoint_Clear
Control
OUT();
\r
\r
break;
\r
case DFU_GETSTATUS:
\r
\r
break;
\r
case DFU_GETSTATUS:
\r
- Endpoint_Clear
SetupReceived
();
\r
+ Endpoint_Clear
ControlSETUP
();
\r
\r
/* Write 8-bit status value */
\r
Endpoint_Write_Byte(DFU_Status);
\r
\r
/* Write 8-bit status value */
\r
Endpoint_Write_Byte(DFU_Status);
\r
@@
-407,46
+407,46
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
/* Write 8-bit state string ID number */
\r
Endpoint_Write_Byte(0);
\r
\r
/* Write 8-bit state string ID number */
\r
Endpoint_Write_Byte(0);
\r
\r
- Endpoint_Clear
Setup
IN();
\r
+ Endpoint_Clear
Control
IN();
\r
\r
/* Acknowledge status stage */
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
- Endpoint_Clear
Setup
OUT();
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
+ Endpoint_Clear
Control
OUT();
\r
\r
break;
\r
case DFU_CLRSTATUS:
\r
\r
break;
\r
case DFU_CLRSTATUS:
\r
- Endpoint_Clear
SetupReceived
();
\r
+ Endpoint_Clear
ControlSETUP
();
\r
\r
/* Reset the status value variable to the default OK status */
\r
DFU_Status = OK;
\r
\r
/* Acknowledge status stage */
\r
\r
/* Reset the status value variable to the default OK status */
\r
DFU_Status = OK;
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
- Endpoint_Clear
Setup
IN();
\r
+ while (!(Endpoint_IsINReady()));
\r
+ Endpoint_Clear
Control
IN();
\r
\r
break;
\r
case DFU_GETSTATE:
\r
\r
break;
\r
case DFU_GETSTATE:
\r
- Endpoint_Clear
SetupReceived
();
\r
+ Endpoint_Clear
ControlSETUP
();
\r
\r
/* Write the current device state to the endpoint */
\r
Endpoint_Write_Byte(DFU_State);
\r
\r
\r
/* Write the current device state to the endpoint */
\r
Endpoint_Write_Byte(DFU_State);
\r
\r
- Endpoint_Clear
Setup
IN();
\r
+ Endpoint_Clear
Control
IN();
\r
\r
/* Acknowledge status stage */
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
- Endpoint_Clear
Setup
OUT();
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
+ Endpoint_Clear
Control
OUT();
\r
\r
break;
\r
case DFU_ABORT:
\r
\r
break;
\r
case DFU_ABORT:
\r
- Endpoint_Clear
SetupReceived
();
\r
+ Endpoint_Clear
ControlSETUP
();
\r
\r
/* Reset the current state variable to the default idle state */
\r
DFU_State = dfuIDLE;
\r
\r
/* Acknowledge status stage */
\r
\r
/* Reset the current state variable to the default idle state */
\r
DFU_State = dfuIDLE;
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
- Endpoint_Clear
Setup
IN();
\r
+ while (!(Endpoint_IsINReady()));
\r
+ Endpoint_Clear
Control
IN();
\r
\r
break;
\r
}
\r
\r
break;
\r
}
\r
@@
-463,10
+463,10
@@
static void DiscardFillerBytes(uint8_t NumberOfBytes)
{
\r
if (!(Endpoint_BytesInEndpoint()))
\r
{
\r
{
\r
if (!(Endpoint_BytesInEndpoint()))
\r
{
\r
- Endpoint_Clear
Setup
OUT();
\r
+ Endpoint_Clear
Control
OUT();
\r
\r
/* Wait until next data packet received */
\r
\r
/* Wait until next data packet received */
\r
- while (!(Endpoint_Is
Setup
OUTReceived()));
\r
+ while (!(Endpoint_IsOUTReceived()));
\r
}
\r
\r
Endpoint_Discard_Byte();
\r
}
\r
\r
Endpoint_Discard_Byte();
\r
projects / pub / lufa.git / blobdiff