aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-11-25 00:36:18 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-11-25 00:36:18 +0000
commitc05c7c7df46a0377db8a72cb32f06aa40153d3e1 (patch)
tree0e51bc1ef2a4e32ce29f448299a62ca16c46c3a8 /LUFA
parentd3f11eb52809353d7f103cea8b4332f335c26697 (diff)
downloadlufa-c05c7c7df46a0377db8a72cb32f06aa40153d3e1.tar.gz
lufa-c05c7c7df46a0377db8a72cb32f06aa40153d3e1.tar.bz2
lufa-c05c7c7df46a0377db8a72cb32f06aa40153d3e1.zip
Added new XPLAIN serial Bridge project (thanks to John Steggall for the software UART code).
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/Drivers/USB/HighLevel/USBInterrupt.c2
-rw-r--r--LUFA/ManPages/ChangeLog.txt1
-rw-r--r--LUFA/ManPages/LibraryResources.txt1
3 files changed, 3 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index f58e67010..3cf4bb3e1 100644
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -229,7 +229,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
#endif
}
-#if defined(INTERRUPT_CONTROL_ENDPOINT)
+#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)
ISR(USB_COM_vect, ISR_BLOCK)
{
uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 5dc83cc65..ccc3e216e 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -11,6 +11,7 @@
* <b>New:</b>
* - Added activity LED indicators to the AVRISP project to indicate when the device is busy processing a command
* - The USB target family and allowable USB mode tokens are now public and documented (USB_CAN_BE_*, USB_SERIES_*_AVR)
+ * - Added new XPLAIN serial Bridge project (thanks to John Steggall)
*
* <b>Changed:</b>
* - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of keycodes
diff --git a/LUFA/ManPages/LibraryResources.txt b/LUFA/ManPages/LibraryResources.txt
index 759a8c0ef..7ba267fa5 100644
--- a/LUFA/ManPages/LibraryResources.txt
+++ b/LUFA/ManPages/LibraryResources.txt
@@ -12,6 +12,7 @@
* Discussion Group: http://groups.google.com/group/myusb-support-list \n
* SVN Access, Bug Reports and Feature Requests: http://code.google.com/p/lufa-lib/ \n
* Git Access: http://github.com/abcminiuser/lufa-lib
+ * Commit RSS: http://github.com/feeds/abcminiuser/commits/lufa-lib/master
* Author's Website: http://www.fourwalledcubicle.com \n
*
* WinAVR Website: http://winavr.sourceforge.net \n