Use default NVM base address in the AVRISP programmer project in case the host progra...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index a8502f3..4769919 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -61,7 +61,7 @@
   *  - Fixed the definition of the Endpoint_BytesInEndpoint() macro for the U4 series AVR parts\r
   *  - Fixed MIDI host Class driver MIDI_Host_SendEventPacket() routine not properly checking for Pipe ready before writing\r
   *  - Fixed use of deprecated struct initializers, removed library unused parameter warnings when compiled with -Wextra enabled\r
   *  - Fixed the definition of the Endpoint_BytesInEndpoint() macro for the U4 series AVR parts\r
   *  - Fixed MIDI host Class driver MIDI_Host_SendEventPacket() routine not properly checking for Pipe ready before writing\r
   *  - Fixed use of deprecated struct initializers, removed library unused parameter warnings when compiled with -Wextra enabled\r

-  *  - Fixed Still Image Host Class driver truncating the PIMA response code (thanks to Daniel)\r
+  *  - Fixed Still Image Host Class driver truncating the PIMA response code (thanks to Daniel Seibert)\r

   *\r
   *  \section Sec_ChangeLog091122 Version 091122\r
   *\r
   *\r
   *  \section Sec_ChangeLog091122 Version 091122\r
   *\r

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 1b3fc53..43370c7 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -38,7 +38,7 @@
 \r
 #if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
 /** Base absolute address for the target's NVM controller */\r
 \r
 #if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
 /** Base absolute address for the target's NVM controller */\r

-uint32_t XPROG_Param_NVMBase;\r
+uint32_t XPROG_Param_NVMBase = 0x010001C0;\r

 \r
 /** Size in bytes of the target's EEPROM page */\r
 uint32_t XPROG_Param_EEPageSize;\r
 \r
 /** Size in bytes of the target's EEPROM page */\r
 uint32_t XPROG_Param_EEPageSize;\r

diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDITarget.c
index 1bbb4d5..a8fe21e 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.c
+++ b/Projects/AVRISP/Lib/PDITarget.c
@@ -39,14 +39,15 @@
 #if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
 \r
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */\r
 #if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
 \r
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */\r

-volatile bool     IsSending;\r
+volatile bool               IsSending;\r

 \r
 #if !defined(PDI_VIA_HARDWARE_USART)\r
 /** Software USART raw frame bits for transmission/reception. */\r
 \r
 #if !defined(PDI_VIA_HARDWARE_USART)\r
 /** Software USART raw frame bits for transmission/reception. */\r

-volatile uint16_t SoftUSART_Data;\r
+volatile uint16_t           SoftUSART_Data;\r

 \r
 /** Bits remaining to be sent or received via the software USART - set as a GPIOR for speed. */\r
 \r
 /** Bits remaining to be sent or received via the software USART - set as a GPIOR for speed. */\r

-#define SoftUSART_BitCount   GPIOR2\r
+#define SoftUSART_BitCount  GPIOR2\r
+\r

 \r
 /** ISR to manage the software USART when bit-banged USART mode is selected. */\r
 ISR(TIMER1_COMPA_vect, ISR_BLOCK)\r
 \r
 /** ISR to manage the software USART when bit-banged USART mode is selected. */\r
 ISR(TIMER1_COMPA_vect, ISR_BLOCK)\r