X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/54e69dbee146182a60c258076b8d26e8f5ac752a..0da99447d3e88e83f9977501bee56af5c7aa56c0:/Bootloaders/CDC/BootloaderCDC.c

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index 0b2eb810b..af778c76f 100644
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -32,35 +32,81 @@
  *
  *  Main source file for the CDC class bootloader. This file contains the complete bootloader logic.
  */
- 
+
 #define  INCLUDE_FROM_BOOTLOADERCDC_C
 #include "BootloaderCDC.h"
 
-/** Line coding options for the virtual serial port. Although the virtual serial port data is never
- *  sent through a physical serial port, the line encoding data must still be read and preserved from
- *  the host, or the host will detect a problem and fail to open the port. This structure contains the
- *  current encoding options, including baud rate, character format, parity mode and total number of 
- *  bits in each data chunk.
+/** Contains the current baud rate and other settings of the first virtual serial port. This must be retained as some
+ *  operating systems will not open the port unless the settings can be set successfully.
  */
-CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
-                                 .CharFormat  = OneStopBit,
-                                 .ParityType  = Parity_None,
-                                 .DataBits    = 8            };
+static CDC_LineEncoding_t LineEncoding = { .BaudRateBPS = 0,
+                                           .CharFormat  = CDC_LINEENCODING_OneStopBit,
+                                           .ParityType  = CDC_PARITY_None,
+                                           .DataBits    = 8                            };
 
 /** Current address counter. This stores the current address of the FLASH or EEPROM as set by the host,
  *  and is used when reading or writing to the AVRs memory (either FLASH or EEPROM depending on the issued
  *  command.)
  */
-uint32_t CurrAddress;
+static uint32_t CurrAddress;
 
 /** Flag to indicate if the bootloader should be running, or should exit and allow the application code to run
  *  via a watchdog reset. When cleared the bootloader will exit, starting the watchdog and entering an infinite
  *  loop until the AVR restarts and the application runs.
  */
-bool RunBootloader = true;
+static bool RunBootloader = true;
+
+/** Magic lock for forced application start. If the HWBE fuse is programmed and BOOTRST is unprogrammed, the bootloader
+ *  will start if the /HWB line of the AVR is held low and the system is reset. However, if the /HWB line is still held
+ *  low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value
+ *  \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start.
+ */
+uint16_t MagicBootKey ATTR_NO_INIT;
+
+
+/** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application
+ *  start key has been loaded into \ref MagicBootKey. If the bootloader started via the watchdog and the key is valid,
+ *  this will force the user application to start via a software jump.
+ */
+void Application_Jump_Check(void)
+{
+	bool JumpToApplication = false;
+
+	#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+		/* Disable JTAG debugging */
+		JTAG_DISABLE();
+
+		/* Enable pull-up on the JTAG TCK pin so we can use it to select the mode */
+		PORTF |= (1 << 4);
+		Delay_MS(10);
+
+		/* If the TCK pin is not jumpered to ground, start the user application instead */
+		JumpToApplication |= ((PINF & (1 << 4)) != 0);
+
+		/* Re-enable JTAG debugging */
+		JTAG_ENABLE();
+	#endif
+
+	/* If the reset source was the bootloader and the key is correct, clear it and jump to the application */
+	if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
+	  JumpToApplication |= true;
 
+	/* If a request has been made to jump to the user application, honor it */
+	if (JumpToApplication)
+	{
+		/* Turn off the watchdog */
+		MCUSR &= ~(1<<WDRF);
+		wdt_disable(); 
+
+		/* Clear the boot key and jump to the user application */
+		MagicBootKey = 0;
 
-/** Main program entry point. This routine configures the hardware required by the bootloader, then continuously 
+		// cppcheck-suppress constStatement
+		((void (*)(void))0x0000)();
+	}
+}
+
+/** Main program entry point. This routine configures the hardware required by the bootloader, then continuously
  *  runs the bootloader processing routine until instructed to soft-exit, or hard-reset via the watchdog to start
  *  the loaded application code.
  */
@@ -69,6 +115,9 @@ int main(void)
 	/* Setup hardware required for the bootloader */
 	SetupHardware();
 
+	/* Turn on first LED on the board to indicate that the bootloader has started */
+	LEDs_SetAllLEDs(LEDS_LED1);
+
 	/* Enable global interrupts so that the USB stack can function */
 	sei();
 
@@ -77,9 +126,12 @@ int main(void)
 		CDC_Task();
 		USB_USBTask();
 	}
-	
+
 	/* Disconnect from the host - USB interface will be reset later along with the AVR */
 	USB_Detach();
+	
+	/* Unlock the forced application start mode of the bootloader if it is restarted */
+	MagicBootKey = MAGIC_BOOT_KEY;
 
 	/* Enable the watchdog and force a timeout to reset the AVR */
 	wdt_enable(WDTO_250MS);
@@ -88,7 +140,7 @@ int main(void)
 }
 
 /** Configures all hardware required for the bootloader. */
-void SetupHardware(void)
+static void SetupHardware(void)
 {
 	/* Disable watchdog if enabled by bootloader/fuses */
 	MCUSR &= ~(1 << WDRF);
@@ -96,13 +148,24 @@ void SetupHardware(void)
 
 	/* Disable clock division */
 	clock_prescale_set(clock_div_1);
-	
+
 	/* Relocate the interrupt vector table to the bootloader section */
 	MCUCR = (1 << IVCE);
 	MCUCR = (1 << IVSEL);
-	
-	/* Initialize USB Subsystem */
+
+	/* Initialize the USB and other board hardware drivers */
 	USB_Init();
+	LEDs_Init();
+
+	/* Bootloader active LED toggle timer initialization */
+	TIMSK1 = (1 << TOIE1);
+	TCCR1B = ((1 << CS11) | (1 << CS10));
+}
+
+/** ISR to periodically toggle the LEDs on the board to indicate that the bootloader is active. */
+ISR(TIMER1_OVF_vect, ISR_BLOCK)
+{
+	LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2);
 }
 
 /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready
@@ -111,76 +174,59 @@ void SetupHardware(void)
 void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	/* Setup CDC Notification, Rx and Tx Endpoints */
-	Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,
-		                       ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,
-	                           ENDPOINT_BANK_SINGLE);
+	Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPADDR, EP_TYPE_INTERRUPT,
+	                           CDC_NOTIFICATION_EPSIZE, 1);
 
-	Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,
-		                       ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,
-	                           ENDPOINT_BANK_SINGLE);
+	Endpoint_ConfigureEndpoint(CDC_TX_EPADDR, EP_TYPE_BULK, CDC_TXRX_EPSIZE, 1);
 
-	Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,
-		                       ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,
-	                           ENDPOINT_BANK_SINGLE);
+	Endpoint_ConfigureEndpoint(CDC_RX_EPADDR, EP_TYPE_BULK, CDC_TXRX_EPSIZE, 1);
 }
 
-/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
- *  control requests that are not handled internally by the USB library, so that they can be handled appropriately
- *  for the application.
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
+ *  the device from the USB host before passing along unhandled control requests to the library for processing
+ *  internally.
  */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+void EVENT_USB_Device_ControlRequest(void)
 {
-	uint8_t* LineCodingData = (uint8_t*)&LineCoding;
+	/* Ignore any requests that aren't directed to the CDC interface */
+	if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) !=
+	    (REQTYPE_CLASS | REQREC_INTERFACE))
+	{
+		return;
+	}
+
+	/* Activity - toggle indicator LEDs */
+	LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2);
 
 	/* Process CDC specific control requests */
 	switch (USB_ControlRequest.bRequest)
 	{
-		case REQ_GetLineEncoding:
+		case CDC_REQ_GetLineEncoding:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
 			{
 				Endpoint_ClearSETUP();
 
-				for (uint8_t i = 0; i < sizeof(LineCoding); i++)
-				  Endpoint_Write_Byte(*(LineCodingData++));	
-				
-				Endpoint_ClearIN();
-				
-				Endpoint_ClearStatusStage();
-			}
-			
-			break;
-		case REQ_SetLineEncoding:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-
-				while (!(Endpoint_IsOUTReceived()))
-				{				
-					if (USB_DeviceState == DEVICE_STATE_Unattached)
-					  return;
-				}
-			
-				for (uint8_t i = 0; i < sizeof(LineCoding); i++)
-				  *(LineCodingData++) = Endpoint_Read_Byte();
-
+				/* Write the line coding data to the control endpoint */
+				Endpoint_Write_Control_Stream_LE(&LineEncoding, sizeof(CDC_LineEncoding_t));
 				Endpoint_ClearOUT();
-
-				Endpoint_ClearStatusStage();
 			}
-	
+
 			break;
-		case REQ_SetControlLineState:
+		case CDC_REQ_SetLineEncoding:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
 			{
 				Endpoint_ClearSETUP();
-				
-				Endpoint_ClearStatusStage();
+
+				/* Read the line coding data in from the host into the global struct */
+				Endpoint_Read_Control_Stream_LE(&LineEncoding, sizeof(CDC_LineEncoding_t));
+				Endpoint_ClearIN();
 			}
-	
+
 			break;
 	}
 }
 
+#if !defined(NO_BLOCK_SUPPORT)
 /** Reads or writes a block of EEPROM or FLASH memory to or from the appropriate CDC data endpoint, depending
  *  on the AVR910 protocol command issued.
  *
@@ -190,20 +236,20 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 {
 	uint16_t BlockSize;
 	char     MemoryType;
-	
+
 	bool     HighByte = false;
 	uint8_t  LowByte  = 0;
-	
+
 	BlockSize  = (FetchNextCommandByte() << 8);
 	BlockSize |=  FetchNextCommandByte();
-	
+
 	MemoryType =  FetchNextCommandByte();
 
 	if ((MemoryType != 'E') && (MemoryType != 'F'))
 	{
 		/* Send error byte back to the host */
 		WriteNextResponseByte('?');
-		
+
 		return;
 	}
 
@@ -221,13 +267,13 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 				#if (FLASHEND > 0xFFFF)
 				WriteNextResponseByte(pgm_read_byte_far(CurrAddress | HighByte));
 				#else
-				WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte));					
+				WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte));
 				#endif
-				
+
 				/* If both bytes in current word have been read, increment the address counter */
 				if (HighByte)
 				  CurrAddress += 2;
-				
+
 				HighByte = !HighByte;
 			}
 			else
@@ -237,7 +283,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 
 				/* Increment the address counter after use */
 				CurrAddress += 2;
-			}			
+			}
 		}
 	}
 	else
@@ -249,11 +295,11 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 			boot_page_erase(PageStartAddress);
 			boot_spm_busy_wait();
 		}
-		
+
 		while (BlockSize--)
 		{
 			if (MemoryType == 'F')
-			{	
+			{
 				/* If both bytes in current word have been written, increment the address counter */
 				if (HighByte)
 				{
@@ -262,20 +308,18 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 
 					/* Increment the address counter after use */
 					CurrAddress += 2;
-
-					HighByte = false;
 				}
 				else
 				{
 					LowByte = FetchNextCommandByte();
-				
-					HighByte = true;
 				}
+
+				HighByte = !HighByte;
 			}
 			else
 			{
 				/* Write the next EEPROM byte from the endpoint */
-				eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());					
+				eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
 
 				/* Increment the address counter after use */
 				CurrAddress += 2;
@@ -287,15 +331,16 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 		{
 			/* Commit the flash page to memory */
 			boot_page_write(PageStartAddress);
-			
+
 			/* Wait until write operation has completed */
 			boot_spm_busy_wait();
 		}
-	
+
 		/* Send response byte back to the host */
-		WriteNextResponseByte('\r');		
+		WriteNextResponseByte('\r');
 	}
 }
+#endif
 
 /** Retrieves the next byte from the host in the CDC data OUT endpoint, and clears the endpoint bank if needed
  *  to allow reception of the next data packet from the host.
@@ -305,8 +350,8 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 static uint8_t FetchNextCommandByte(void)
 {
 	/* Select the OUT endpoint so that the next data byte can be read */
-	Endpoint_SelectEndpoint(CDC_RX_EPNUM);
-	
+	Endpoint_SelectEndpoint(CDC_RX_EPADDR);
+
 	/* If OUT endpoint empty, clear it and wait for the next packet from the host */
 	while (!(Endpoint_IsReadWriteAllowed()))
 	{
@@ -318,9 +363,9 @@ static uint8_t FetchNextCommandByte(void)
 			  return 0;
 		}
 	}
-	
+
 	/* Fetch the next byte from the OUT endpoint */
-	return Endpoint_Read_Byte();
+	return Endpoint_Read_8();
 }
 
 /** Writes the next response byte to the CDC data IN endpoint, and sends the endpoint back if needed to free up the
@@ -331,246 +376,257 @@ static uint8_t FetchNextCommandByte(void)
 static void WriteNextResponseByte(const uint8_t Response)
 {
 	/* Select the IN endpoint so that the next data byte can be written */
-	Endpoint_SelectEndpoint(CDC_TX_EPNUM);
-	
+	Endpoint_SelectEndpoint(CDC_TX_EPADDR);
+
 	/* If IN endpoint full, clear it and wait until ready for the next packet to the host */
 	if (!(Endpoint_IsReadWriteAllowed()))
 	{
 		Endpoint_ClearIN();
-		
+
 		while (!(Endpoint_IsINReady()))
-		{				
+		{
 			if (USB_DeviceState == DEVICE_STATE_Unattached)
 			  return;
 		}
 	}
-	
-	/* Write the next byte to the OUT endpoint */
-	Endpoint_Write_Byte(Response);
+
+	/* Write the next byte to the IN endpoint */
+	Endpoint_Write_8(Response);
 }
 
 /** Task to read in AVR910 commands from the CDC data OUT endpoint, process them, perform the required actions
  *  and send the appropriate response back to the host.
  */
-void CDC_Task(void)
+static void CDC_Task(void)
 {
 	/* Select the OUT endpoint */
-	Endpoint_SelectEndpoint(CDC_RX_EPNUM);
-	
+	Endpoint_SelectEndpoint(CDC_RX_EPADDR);
+
 	/* Check if endpoint has a command in it sent from the host */
-	if (Endpoint_IsOUTReceived())
+	if (!(Endpoint_IsOUTReceived()))
+	  return;
+
+	/* Read in the bootloader command (first byte sent from host) */
+	uint8_t Command = FetchNextCommandByte();
+
+	if (Command == 'E')
 	{
-		/* Read in the bootloader command (first byte sent from host) */
-		uint8_t Command = FetchNextCommandByte();
+		RunBootloader = false;
 
-		if ((Command == 'L') || (Command == 'P') || (Command == 'T') || (Command == 'E'))
-		{
-			if (Command == 'E')
-			  RunBootloader = false;
-			if (Command == 'T')
-			  FetchNextCommandByte();
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 'T')
+	{
+		FetchNextCommandByte();
 
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');			
-		}
-		else if (Command == 't')
-		{
-			/* Return ATMEGA128 part code - this is only to allow AVRProg to use the bootloader */
-			WriteNextResponseByte(0x44);
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if ((Command == 'L') || (Command == 'P'))
+	{
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 't')
+	{
+		/* Return ATMEGA128 part code - this is only to allow AVRProg to use the bootloader */
+		WriteNextResponseByte(0x44);
+		WriteNextResponseByte(0x00);
+	}
+	else if (Command == 'a')
+	{
+		/* Indicate auto-address increment is supported */
+		WriteNextResponseByte('Y');
+	}
+	else if (Command == 'A')
+	{
+		/* Set the current address to that given by the host */
+		CurrAddress   = (FetchNextCommandByte() << 9);
+		CurrAddress  |= (FetchNextCommandByte() << 1);
 
-			WriteNextResponseByte(0x00);
-		}
-		else if (Command == 'a')
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 'p')
+	{
+		/* Indicate serial programmer back to the host */
+		WriteNextResponseByte('S');
+	}
+	else if (Command == 'S')
+	{
+		/* Write the 7-byte software identifier to the endpoint */
+		for (uint8_t CurrByte = 0; CurrByte < 7; CurrByte++)
+		  WriteNextResponseByte(SOFTWARE_IDENTIFIER[CurrByte]);
+	}
+	else if (Command == 'V')
+	{
+		WriteNextResponseByte('0' + BOOTLOADER_VERSION_MAJOR);
+		WriteNextResponseByte('0' + BOOTLOADER_VERSION_MINOR);
+	}
+	else if (Command == 's')
+	{
+		WriteNextResponseByte(AVR_SIGNATURE_3);
+		WriteNextResponseByte(AVR_SIGNATURE_2);
+		WriteNextResponseByte(AVR_SIGNATURE_1);
+	}
+	else if (Command == 'e')
+	{
+		/* Clear the application section of flash */
+		for (uint32_t CurrFlashAddress = 0; CurrFlashAddress < (uint32_t)BOOT_START_ADDR; CurrFlashAddress += SPM_PAGESIZE)
 		{
-			/* Indicate auto-address increment is supported */
-			WriteNextResponseByte('Y');
+			boot_page_erase(CurrFlashAddress);
+			boot_spm_busy_wait();
+			boot_page_write(CurrFlashAddress);
+			boot_spm_busy_wait();
 		}
-		else if (Command == 'A')
-		{
-			/* Set the current address to that given by the host */
-			CurrAddress   = (FetchNextCommandByte() << 9);
-			CurrAddress  |= (FetchNextCommandByte() << 1);
 
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');
-		}
-		else if (Command == 'p')
-		{
-			/* Indicate serial programmer back to the host */
-			WriteNextResponseByte('S');		 
-		}
-		else if (Command == 'S')
-		{
-			/* Write the 7-byte software identifier to the endpoint */
-			for (uint8_t CurrByte = 0; CurrByte < 7; CurrByte++)
-			  WriteNextResponseByte(SOFTWARE_IDENTIFIER[CurrByte]);		
-		}
-		else if (Command == 'V')
-		{
-			WriteNextResponseByte('0' + BOOTLOADER_VERSION_MAJOR);
-			WriteNextResponseByte('0' + BOOTLOADER_VERSION_MINOR);
-		}
-		else if (Command == 's')
-		{
-			WriteNextResponseByte(AVR_SIGNATURE_3);		
-			WriteNextResponseByte(AVR_SIGNATURE_2);
-			WriteNextResponseByte(AVR_SIGNATURE_1);
-		}
-		else if (Command == 'b')
-		{
-			WriteNextResponseByte('Y');
-				
-			/* Send block size to the host */
-			WriteNextResponseByte(SPM_PAGESIZE >> 8);
-			WriteNextResponseByte(SPM_PAGESIZE & 0xFF);		
-		}
-		else if (Command == 'e')
-		{
-			/* Clear the application section of flash */
-			for (uint32_t CurrFlashAddress = 0; CurrFlashAddress < BOOT_START_ADDR; CurrFlashAddress++)
-			{
-				boot_page_erase(CurrFlashAddress);
-				boot_spm_busy_wait();
-				boot_page_write(CurrFlashAddress);
-				boot_spm_busy_wait();
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	#if !defined(NO_LOCK_BYTE_WRITE_SUPPORT)
+	else if (Command == 'l')
+	{
+		/* Set the lock bits to those given by the host */
+		boot_lock_bits_set(FetchNextCommandByte());
 
-				CurrFlashAddress += SPM_PAGESIZE;
-			}
-			
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
-		}
-		else if (Command == 'l')
-		{
-			/* Set the lock bits to those given by the host */
-			boot_lock_bits_set(FetchNextCommandByte());
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	#endif
+	else if (Command == 'r')
+	{
+		WriteNextResponseByte(boot_lock_fuse_bits_get(GET_LOCK_BITS));
+	}
+	else if (Command == 'F')
+	{
+		WriteNextResponseByte(boot_lock_fuse_bits_get(GET_LOW_FUSE_BITS));
+	}
+	else if (Command == 'N')
+	{
+		WriteNextResponseByte(boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS));
+	}
+	else if (Command == 'Q')
+	{
+		WriteNextResponseByte(boot_lock_fuse_bits_get(GET_EXTENDED_FUSE_BITS));
+	}
+	#if !defined(NO_BLOCK_SUPPORT)
+	else if (Command == 'b')
+	{
+		WriteNextResponseByte('Y');
 
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');
-		}
-		else if (Command == 'r')
-		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_LOCK_BITS));		
-		}
-		else if (Command == 'F')
-		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_LOW_FUSE_BITS));
-		}
-		else if (Command == 'N')
-		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS));		
-		}
-		else if (Command == 'Q')
-		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_EXTENDED_FUSE_BITS));		
-		}
-		else if (Command == 'C')
-		{			
-			/* Write the high byte to the current flash page */
-			boot_page_fill(CurrAddress, FetchNextCommandByte());
+		/* Send block size to the host */
+		WriteNextResponseByte(SPM_PAGESIZE >> 8);
+		WriteNextResponseByte(SPM_PAGESIZE & 0xFF);
+	}
+	else if ((Command == 'B') || (Command == 'g'))
+	{
+		/* Delegate the block write/read to a separate function for clarity */
+		ReadWriteMemoryBlock(Command);
+	}
+	#endif
+	#if !defined(NO_FLASH_BYTE_SUPPORT)
+	else if (Command == 'C')
+	{
+		/* Write the high byte to the current flash page */
+		boot_page_fill(CurrAddress, FetchNextCommandByte());
 
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
-		}
-		else if (Command == 'c')
-		{			
-			/* Write the low byte to the current flash page */
-			boot_page_fill(CurrAddress | 1, FetchNextCommandByte());
-			
-			/* Increment the address */
-			CurrAddress += 2;
-
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
-		}
-		else if (Command == 'm')
-		{
-			/* Commit the flash page to memory */
-			boot_page_write(CurrAddress);
-			
-			/* Wait until write operation has completed */
-			boot_spm_busy_wait();
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 'c')
+	{
+		/* Write the low byte to the current flash page */
+		boot_page_fill(CurrAddress | 0x01, FetchNextCommandByte());
 
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
-		}
-		else if ((Command == 'B') || (Command == 'g'))
-		{
-			/* Delegate the block write/read to a separate function for clarity */
-			ReadWriteMemoryBlock(Command);
-		}
-		else if (Command == 'R')
-		{
-			#if (FLASHEND > 0xFFFF)
-			uint16_t ProgramWord = pgm_read_word_far(CurrAddress);
-			#else
-			uint16_t ProgramWord = pgm_read_word(CurrAddress);			
-			#endif
-			
-			WriteNextResponseByte(ProgramWord >> 8);
-			WriteNextResponseByte(ProgramWord & 0xFF);
-		}
-		else if (Command == 'D')
-		{
-			/* Read the byte from the endpoint and write it to the EEPROM */
-			eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
-			
-			/* Increment the address after use */			
-			CurrAddress += 2;
-	
-			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
-		}
-		else if (Command == 'd')
-		{
-			/* Read the EEPROM byte and write it to the endpoint */
-			WriteNextResponseByte(eeprom_read_byte((uint8_t*)((intptr_t)(CurrAddress >> 1))));
+		/* Increment the address */
+		CurrAddress += 2;
 
-			/* Increment the address after use */
-			CurrAddress += 2;
-		}
-		else if (Command == 27)
-		{
-			/* Escape is sync, ignore */
-		}
-		else
-		{
-			/* Unknown command, return fail code */
-			WriteNextResponseByte('?');
-		}
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 'm')
+	{
+		/* Commit the flash page to memory */
+		boot_page_write(CurrAddress);
+
+		/* Wait until write operation has completed */
+		boot_spm_busy_wait();
+
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 'R')
+	{
+		#if (FLASHEND > 0xFFFF)
+		uint16_t ProgramWord = pgm_read_word_far(CurrAddress);
+		#else
+		uint16_t ProgramWord = pgm_read_word(CurrAddress);
+		#endif
+
+		WriteNextResponseByte(ProgramWord >> 8);
+		WriteNextResponseByte(ProgramWord & 0xFF);
+	}
+	#endif
+	#if !defined(NO_EEPROM_BYTE_SUPPORT)
+	else if (Command == 'D')
+	{
+		/* Read the byte from the endpoint and write it to the EEPROM */
+		eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
 
-		/* Select the IN endpoint */
-		Endpoint_SelectEndpoint(CDC_TX_EPNUM);
+		/* Increment the address after use */
+		CurrAddress += 2;
 
-		/* Remember if the endpoint is completely full before clearing it */
-		bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());
+		/* Send confirmation byte back to the host */
+		WriteNextResponseByte('\r');
+	}
+	else if (Command == 'd')
+	{
+		/* Read the EEPROM byte and write it to the endpoint */
+		WriteNextResponseByte(eeprom_read_byte((uint8_t*)((intptr_t)(CurrAddress >> 1))));
 
-		/* Send the endpoint data to the host */
-		Endpoint_ClearIN();
-		
-		/* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */
-		if (IsEndpointFull)
-		{
-			while (!(Endpoint_IsINReady()))
-			{				
-				if (USB_DeviceState == DEVICE_STATE_Unattached)
-				  return;
-			}
+		/* Increment the address after use */
+		CurrAddress += 2;
+	}
+	#endif
+	else if (Command != 27)
+	{
+		/* Unknown (non-sync) command, return fail code */
+		WriteNextResponseByte('?');
+	}
 
-			Endpoint_ClearIN();
-		}
+	/* Select the IN endpoint */
+	Endpoint_SelectEndpoint(CDC_TX_EPADDR);
+
+	/* Remember if the endpoint is completely full before clearing it */
+	bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());
 
-		/* Wait until the data has been sent to the host */
+	/* Send the endpoint data to the host */
+	Endpoint_ClearIN();
+
+	/* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */
+	if (IsEndpointFull)
+	{
 		while (!(Endpoint_IsINReady()))
-		{				
+		{
 			if (USB_DeviceState == DEVICE_STATE_Unattached)
 			  return;
 		}
-		
-		/* Select the OUT endpoint */
-		Endpoint_SelectEndpoint(CDC_RX_EPNUM);
 
-		/* Acknowledge the command from the host */
-		Endpoint_ClearOUT();
+		Endpoint_ClearIN();
+	}
+
+	/* Wait until the data has been sent to the host */
+	while (!(Endpoint_IsINReady()))
+	{
+		if (USB_DeviceState == DEVICE_STATE_Unattached)
+		  return;
 	}
+
+	/* Select the OUT endpoint */
+	Endpoint_SelectEndpoint(CDC_RX_EPADDR);
+
+	/* Acknowledge the command from the host */
+	Endpoint_ClearOUT();
 }
+