Fix typo in the UC3 host pipe driver. Improve library TAR export exclusion filetype...
authorDean Camera <dean@fourwalledcubicle.com>
Wed, 6 Jun 2012 19:09:06 +0000 (19:09 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Wed, 6 Jun 2012 19:09:06 +0000 (19:09 +0000)
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
LUFA/makefile

index 0c3136e..0d313fe 100644 (file)
                        static inline uint8_t Pipe_GetPipeDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
                        static inline uint8_t Pipe_GetPipeDirection(void)
                        {
                        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
                        }
                        
                        /** Returns the pipe address of the currently selected pipe. This is typically used to save the
index 31c06b3..1e21371 100644 (file)
@@ -10,7 +10,7 @@
 # ---------------------------------------
 
 LUFA_VERSION_NUM        := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
 # ---------------------------------------
 
 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)
 
 
 DOXYGEN_OVERRIDE_PARAMS = PROJECT_NUMBER=$(LUFA_VERSION_NUM)