aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-06-06 19:09:06 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-06-06 19:09:06 +0000
commitfab1678602ff0e560a4bd9a1ba6b5db6f3872732 (patch)
treea0787afc2a9a1dfc93b43db4007ad15cc4edb0f7 /LUFA
parent000c4c6c5ccc2c136f25fc4bcede6de093b301c6 (diff)
downloadlufa-fab1678602ff0e560a4bd9a1ba6b5db6f3872732.tar.gz
lufa-fab1678602ff0e560a4bd9a1ba6b5db6f3872732.tar.bz2
lufa-fab1678602ff0e560a4bd9a1ba6b5db6f3872732.zip
Fix typo in the UC3 host pipe driver. Improve library TAR export exclusion filetype filter.
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h2
-rw-r--r--LUFA/makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
index 0c3136e15..0d313fed6 100644
--- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
@@ -204,7 +204,7 @@
static inline uint8_t Pipe_GetPipeDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
static inline uint8_t Pipe_GetPipeDirection(void)
{
- return (((&AVR32_USBB.UPCFG0)[USB_Endpoint_SelectedEndpoint].ptoken == PIPE_TOKEN_OUT) ? PIPE_DIR_OUT : PIPE_DIR_IN);
+ return (((&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].ptoken == PIPE_TOKEN_OUT) ? PIPE_DIR_OUT : PIPE_DIR_IN);
}
/** Returns the pipe address of the currently selected pipe. This is typically used to save the
diff --git a/LUFA/makefile b/LUFA/makefile
index 31c06b32f..1e21371ff 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -10,7 +10,7 @@
# ---------------------------------------
LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
-EXCLUDE_FROM_EXPORT := Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.lss *.lst *.hex *.elf *.bin
+EXCLUDE_FROM_EXPORT := Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin *.d *.o.d
DOXYGEN_OVERRIDE_PARAMS = PROJECT_NUMBER=$(LUFA_VERSION_NUM)