X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/e5e7eaee7af719cee00a8c2cb6fb4649dde0aa05..d0db78432fc02bacbd57cc9f15eb05b4e56981cb:/Bootloaders/DFU/BootloaderDFU.c

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 289b4eb22..2086a91d2 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -96,7 +96,24 @@ uint16_t EndAddr = 0x0000;
  *  runs the bootloader processing routine until instructed to soft-exit, or hard-reset via the watchdog to start
  *  the loaded application code.
  */
-int main (void)
+int main(void)
+{
+	/* Configure hardware required by the bootloader */
+	SetupHardware();
+
+	/* Run the USB management task while the bootloader is supposed to be running */
+	while (RunBootloader || WaitForExit)
+	  USB_USBTask();
+	
+	/* Reset configured hardware back to their original states for the user application */
+	ResetHardware();
+	
+	/* Start the user application */
+	AppStartPtr();
+}
+
+/** Configures all hardware required for the bootloader. */
+void SetupHardware(void)
 {
 	/* Disable watchdog if enabled by bootloader/fuses */
 	MCUSR &= ~(1 << WDRF);
@@ -111,35 +128,23 @@ int main (void)
 
 	/* Initialize the USB subsystem */
 	USB_Init();
+}
 
-	/* Run the USB management task while the bootloader is supposed to be running */
-	while (RunBootloader || WaitForExit)
-	  USB_USBTask();
-	
+/** Resets all configured hardware required for the bootloader back to their original states. */
+void ResetHardware(void)
+{
 	/* Shut down the USB subsystem */
 	USB_ShutDown();
 	
 	/* Relocate the interrupt vector table back to the application section */
 	MCUCR = (1 << IVCE);
 	MCUCR = 0;
-
-	/* Reset any used hardware ports back to their defaults */
-	PORTD = 0;
-	DDRD  = 0;
-	
-	#if defined(PORTE)
-	PORTE = 0;
-	DDRE  = 0;
-	#endif
-	
-	/* Start the user application */
-	AppStartPtr();
 }
 
 /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user
  *  application started.
  */
-EVENT_HANDLER(USB_Disconnect)
+void EVENT_USB_Disconnect(void)
 {
 	/* Upon disconnection, run user application */
 	RunBootloader = false;
@@ -149,18 +154,12 @@ EVENT_HANDLER(USB_Disconnect)
  *  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.
  */
-EVENT_HANDLER(USB_UnhandledControlPacket)
+void EVENT_USB_UnhandledControlPacket(void)
 {
-	/* Discard unused wIndex value */
-	Endpoint_Discard_Word();
-	
-	/* Discard unused wValue value */
-	Endpoint_Discard_Word();
-
 	/* Get the size of the command and data from the wLength value */
-	SentCommand.DataSize = Endpoint_Read_Word_LE();
+	SentCommand.DataSize = USB_ControlRequest.wLength;
 
-	switch (bRequest)
+	switch (USB_ControlRequest.bRequest)
 	{
 		case DFU_DNLOAD:
 			Endpoint_ClearSETUP();
@@ -348,7 +347,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 						}
 
 						/* 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));							
@@ -455,7 +454,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 /** Routine to discard the specified number of bytes from the control endpoint stream. This is used to
  *  discard unused bytes in the stream from the host, including the memory program block suffix.
  *
- *  \param NumberOfBytes  Number of bytes to discard from the host from the control endpoint
+ *  \param[in] NumberOfBytes  Number of bytes to discard from the host from the control endpoint
  */
 static void DiscardFillerBytes(uint8_t NumberOfBytes)
 {
@@ -468,8 +467,10 @@ static void DiscardFillerBytes(uint8_t NumberOfBytes)
 			/* Wait until next data packet received */
 			while (!(Endpoint_IsOUTReceived()));
 		}
-
-		Endpoint_Discard_Byte();						
+		else
+		{
+			Endpoint_Discard_Byte();
+		}
 	}
 }
 
@@ -591,7 +592,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)
@@ -677,7 +678,7 @@ static void ProcessWriteCommand(void)
 static void ProcessReadCommand(void)
 {
 	const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};
-	const uint8_t SignatureInfo[3]  = {SIGNATURE_0, SIGNATURE_1, SIGNATURE_2};
+	const uint8_t SignatureInfo[3]  = {AVR_SIGNATURE_1,    AVR_SIGNATURE_2,     AVR_SIGNATURE_3};
 
 	uint8_t DataIndexToRead = SentCommand.Data[1];