From d9752503312da46ec805400e2e05cf03d4b33431 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 12 Sep 2010 12:37:16 +0000
Subject: [PATCH] Add the "REQ_" prefix to the DFU class bootloader
 class-specific request constants.

---
 Bootloaders/DFU/BootloaderDFU.c | 12 ++++++------
 Bootloaders/DFU/BootloaderDFU.h | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 7136b972b7..6f8acc80da 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -156,7 +156,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 
 	switch (USB_ControlRequest.bRequest)
 	{
-		case DFU_DNLOAD:
+		case REQ_DFU_DNLOAD:
 			Endpoint_ClearSETUP();
 			
 			/* Check if bootloader is waiting to terminate */
@@ -309,7 +309,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 			Endpoint_ClearStatusStage();
 
 			break;
-		case DFU_UPLOAD:
+		case REQ_DFU_UPLOAD:
 			Endpoint_ClearSETUP();
 
 			while (!(Endpoint_IsINReady()))
@@ -408,7 +408,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 
 			Endpoint_ClearStatusStage();
 			break;
-		case DFU_GETSTATUS:
+		case REQ_DFU_GETSTATUS:
 			Endpoint_ClearSETUP();
 			
 			/* Write 8-bit status value */
@@ -428,7 +428,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 			
 			Endpoint_ClearStatusStage();
 			break;		
-		case DFU_CLRSTATUS:
+		case REQ_DFU_CLRSTATUS:
 			Endpoint_ClearSETUP();
 			
 			/* Reset the status value variable to the default OK status */
@@ -436,7 +436,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 
 			Endpoint_ClearStatusStage();
 			break;
-		case DFU_GETSTATE:
+		case REQ_DFU_GETSTATE:
 			Endpoint_ClearSETUP();
 			
 			/* Write the current device state to the endpoint */
@@ -446,7 +446,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 			
 			Endpoint_ClearStatusStage();
 			break;
-		case DFU_ABORT:
+		case REQ_DFU_ABORT:
 			Endpoint_ClearSETUP();
 			
 			/* Reset the current state variable to the default idle state */
diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index 43ea70f5c5..3ddd395c15 100644
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -102,25 +102,25 @@
 		#define DFU_FILLER_BYTES_SIZE    26
 	
 		/** 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. */
-		#define DFU_DNLOAD               0x01
+		#define REQ_DFU_DNLOAD           0x01
 
 		/** 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. */
-		#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. */
-		#define DFU_CLRSTATUS            0x04
+		#define REQ_DFU_CLRSTATUS        0x04
 
 		/** 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. */
-		#define DFU_ABORT                0x06
+		#define REQ_DFU_ABORT            0x06
 
 		/** DFU command to begin programming the device's memory. */
 		#define COMMAND_PROG_START       0x01