Double bank CDC endpoints in the XPLAIN Bridge project, re-enable JTAG once the mode...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 4e6b7c5..fe43103 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -18,6 +18,7 @@
   *  - Webserver project now uses the board LEDs to indicate the current IP configuration state\r
   *  - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired\r
   *  - Increased throughput of the USBtoSerial demo on systems that send multiple bytes per packet (thanks to Opendous Inc.)\r
   *  - Webserver project now uses the board LEDs to indicate the current IP configuration state\r
   *  - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired\r
   *  - Increased throughput of the USBtoSerial demo on systems that send multiple bytes per packet (thanks to Opendous Inc.)\r

+  *  - Double bank CDC endpoints in the XPLAIN Bridge project, re-enable JTAG once the mode selection pin has been sampled.\r

   *\r
   *  <b>Fixed:</b>\r
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin\r
   *\r
   *  <b>Fixed:</b>\r
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin\r

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 13752ef..e5b282e 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -51,11 +51,11 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
 \r
                                .DataINEndpointNumber           = CDC_TX_EPNUM,\r
                                .DataINEndpointSize             = CDC_TXRX_EPSIZE,\r
 \r
                                .DataINEndpointNumber           = CDC_TX_EPNUM,\r
                                .DataINEndpointSize             = CDC_TXRX_EPSIZE,\r

-                               .DataINEndpointDoubleBank       = false,\r
+                               .DataINEndpointDoubleBank       = true,\r

 \r
                                .DataOUTEndpointNumber          = CDC_RX_EPNUM,\r
                                .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,\r
 \r
                                .DataOUTEndpointNumber          = CDC_RX_EPNUM,\r
                                .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,\r

-                               .DataOUTEndpointDoubleBank      = false,\r
+                               .DataOUTEndpointDoubleBank      = true,\r

 \r
                                .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,\r
                                .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,\r
 \r
                                .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,\r
                                .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,\r


@@ -169,6 +169,10 @@ void SetupHardware(void)
 \r
        /* Select the firmware mode based on the JTD pin's value */\r
        CurrentFirmwareMode = (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER;\r
 \r
        /* Select the firmware mode based on the JTD pin's value */\r
        CurrentFirmwareMode = (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER;\r

+\r
+       /* Re-enable JTAG debugging */\r
+       MCUCR &= ~(1 << JTD);\r
+       MCUCR &= ~(1 << JTD);\r

 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r