X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/2ee9fc707784e115d744dbc229bdc893f4bb6bc1..e6881fd166586793a5a90effeefe4188092f383b:/Bootloaders/DFU/BootloaderDFU.c

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 10a30167b..1850803d4 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -139,7 +139,7 @@ int main (void)
 /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user
  *  application started.
  */
-void EventHandler_USB_Disconnect(void)
+void EVENT_USB_Disconnect(void)
 {
 	/* Upon disconnection, run user application */
 	RunBootloader = false;
@@ -149,7 +149,7 @@ void EventHandler_USB_Disconnect(void)
  *  control requests that are not handled internally by the USB library (including the DFU commands, which are
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.
  */
-void EventHandler_USB_UnhandledControlPacket(void)
+void EVENT_USB_UnhandledControlPacket(void)
 {
 	/* Get the size of the command and data from the wLength value */
 	SentCommand.DataSize = USB_ControlRequest.wLength;
@@ -342,7 +342,7 @@ void EventHandler_USB_UnhandledControlPacket(void)
 						}
 
 						/* Read the flash word and send it via USB to the host */
-						#if defined(RAMPZ)
+						#if (FLASHEND > 0xFFFF)
 							Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long));
 						#else
 							Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long));							
@@ -585,7 +585,7 @@ static void ProcessMemReadCommand(void)
 		while (CurrFlashAddress < BOOT_START_ADDR)
 		{
 			/* Check if the current byte is not blank */
-			#if defined(RAMPZ)
+			#if (FLASHEND > 0xFFFF)
 			if (pgm_read_byte_far(CurrFlashAddress) != 0xFF)
 			#else
 			if (pgm_read_byte(CurrFlashAddress) != 0xFF)