X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d4ca7fb44c7d326b96cf391f0275dc323dbe24de..fc31973daffea3506051ce51a5f79383ce0867d6:/Bootloaders/DFU/BootloaderDFU.c?ds=sidebyside

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index f82213ff1..d90accb6c 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this 
   software and its documentation for any purpose is hereby granted
@@ -101,6 +101,9 @@ int main(void)
 {
 	/* Configure hardware required by the bootloader */
 	SetupHardware();
+	
+	/* Enable global interrupts so that the USB stack can function */
+	sei();
 
 	/* Run the USB management task while the bootloader is supposed to be running */
 	while (RunBootloader || WaitForExit)
@@ -205,8 +208,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 					/* Throw away the filler bytes before the start of the firmware */
 					DiscardFillerBytes(DFU_FILLER_BYTES_SIZE);
 
-					/* Throw away the page alignment filler bytes before the start of the firmware */
-					DiscardFillerBytes(StartAddr % SPM_PAGESIZE);
+					/* Throw away the packet alignment filler bytes before the start of the firmware */
+					DiscardFillerBytes(StartAddr % FIXED_CONTROL_ENDPOINT_SIZE);
 					
 					/* Calculate the number of bytes remaining to be written */
 					uint16_t BytesRemaining = ((EndAddr - StartAddr) + 1);