aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/Core
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-02-18 23:33:12 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-02-18 23:33:12 +0000
commit1132488e8f80b43473ce4e53db9dd8ce12e87e13 (patch)
treec0d138685f664d079e9218d611227aab5919bc15 /LUFA/Drivers/USB/Core
parent04b8360b15e3f1a78cb74e97b0c9acbb068f025a (diff)
downloadlufa-1132488e8f80b43473ce4e53db9dd8ce12e87e13.tar.gz
lufa-1132488e8f80b43473ce4e53db9dd8ce12e87e13.tar.bz2
lufa-1132488e8f80b43473ce4e53db9dd8ce12e87e13.zip
Add build tests to verify correct compilation of as many modules as possible under as many architectures as possible.
Fix broken compilation of LUFA under C++ compilers when the Serial peripheral module header file is included in a C++ source file. Fix missing semicolon in the UC3 architecture host pipe functions. Fix failed compilation for the XMEGA architecture if USB_DEVICE_ONLY us not specified.
Diffstat (limited to 'LUFA/Drivers/USB/Core')
-rw-r--r--LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c2
-rw-r--r--LUFA/Drivers/USB/Core/USBTask.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
index 39b31947c..770f28545 100644
--- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
@@ -80,7 +80,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
}
else
{
- UPCFG0Temp = (&AVR32_USBB.upcfg0)[PNum]
+ UPCFG0Temp = (&AVR32_USBB.upcfg0)[PNum];
}
if (!(UPCFG0Temp & AVR32_USBB_ALLOC_MASK))
diff --git a/LUFA/Drivers/USB/Core/USBTask.c b/LUFA/Drivers/USB/Core/USBTask.c
index 2710885bc..b0b6914af 100644
--- a/LUFA/Drivers/USB/Core/USBTask.c
+++ b/LUFA/Drivers/USB/Core/USBTask.c
@@ -52,8 +52,10 @@ void USB_USBTask(void)
#else
if (USB_CurrentMode == USB_MODE_Device)
USB_DeviceTask();
+ #if defined(USB_CAN_BE_HOST)
else if (USB_CurrentMode == USB_MODE_Host)
USB_HostTask();
+ #endif
#endif
}