forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the "REQ_" prefix to the DFU class bootloader class-specific request constants.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 6b59c9b834
commit d975250331
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

12
Bootloaders/DFU/BootloaderDFU.c
Unescape View File

@ -156,7 +156,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
switch (USB_ControlRequest.bRequest) switch (USB_ControlRequest.bRequest)
{ {
case DFU_DNLOAD: case REQ_DFU_DNLOAD:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Check if bootloader is waiting to terminate */ /* Check if bootloader is waiting to terminate */
@ -309,7 +309,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
break; break;
case DFU_UPLOAD: case REQ_DFU_UPLOAD:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
while (!(Endpoint_IsINReady())) while (!(Endpoint_IsINReady()))
@ -408,7 +408,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
break; break;
case DFU_GETSTATUS: case REQ_DFU_GETSTATUS:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write 8-bit status value */ /* Write 8-bit status value */
@ -428,7 +428,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
break; break;
case DFU_CLRSTATUS: case REQ_DFU_CLRSTATUS:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Reset the status value variable to the default OK status */ /* Reset the status value variable to the default OK status */
@ -436,7 +436,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
break; break;
case DFU_GETSTATE: case REQ_DFU_GETSTATE:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the current device state to the endpoint */ /* Write the current device state to the endpoint */
@ -446,7 +446,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
break; break;
case DFU_ABORT: case REQ_DFU_ABORT:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Reset the current state variable to the default idle state */ /* Reset the current state variable to the default idle state */

14
Bootloaders/DFU/BootloaderDFU.h
Unescape View File

@ -102,25 +102,25 @@
#define DFU_FILLER_BYTES_SIZE 26 #define DFU_FILLER_BYTES_SIZE 26
/** DFU class command request to detach from the host. */ /** DFU class command request to detach from the host. */
#define DFU_DETATCH 0x00 #define REQ_DFU_DETATCH 0x00
/** DFU class command request to send data from the host to the bootloader. */ /** DFU class command request to send data from the host to the bootloader. */
#define DFU_DNLOAD 0x01 #define REQ_DFU_DNLOAD 0x01
/** DFU class command request to send data from the bootloader to the host. */ /** DFU class command request to send data from the bootloader to the host. */
#define DFU_UPLOAD 0x02 #define REQ_DFU_UPLOAD 0x02
/** DFU class command request to get the current DFU status and state from the bootloader. */ /** DFU class command request to get the current DFU status and state from the bootloader. */
#define DFU_GETSTATUS 0x03 #define REQ_DFU_GETSTATUS 0x03
/** DFU class command request to reset the current DFU status and state variables to their defaults. */ /** DFU class command request to reset the current DFU status and state variables to their defaults. */
#define DFU_CLRSTATUS 0x04 #define REQ_DFU_CLRSTATUS 0x04
/** DFU class command request to get the current DFU state of the bootloader. */ /** DFU class command request to get the current DFU state of the bootloader. */
#define DFU_GETSTATE 0x05 #define REQ_DFU_GETSTATE 0x05
/** DFU class command request to abort the current multi-request transfer and return to the dfuIDLE state. */ /** DFU class command request to abort the current multi-request transfer and return to the dfuIDLE state. */
#define DFU_ABORT 0x06 #define REQ_DFU_ABORT 0x06
/** DFU command to begin programming the device's memory. */ /** DFU command to begin programming the device's memory. */
#define COMMAND_PROG_START 0x01 #define COMMAND_PROG_START 0x01

Write Preview
Loading…
Cancel
Save