Removed Pipe_ClearErrorFlags(), pipe error flags are now automatically cleared when...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / AVR8 / Pipe_AVR8.h

diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
index 201ac0b..4a55968 100644 (file)
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
@@ -410,10 +410,11 @@
                                return ((UPCONX & (1 << PFREEZE)) ? true : false);
                        }
 
-                       /** Clears the master pipe error flag. */
+                       /** Clears the error flags for the currently selected pipe. */
                        static inline void Pipe_ClearError(void) ATTR_ALWAYS_INLINE;
                        static inline void Pipe_ClearError(void)
                        {
+                               UPERRX = 0;
                                UPINTX &= ~(1 << PERRI);
                        }
 
@@ -430,15 +431,6 @@
                                return ((UPINTX & (1 << PERRI)) ? true : false);
                        }
 
-                       /** Clears all the currently selected pipe's hardware error flags, but does not clear the master error
-                        *  flag for the pipe.
-                        */
-                       static inline void Pipe_ClearErrorFlags(void) ATTR_ALWAYS_INLINE;
-                       static inline void Pipe_ClearErrorFlags(void)
-                       {
-                               UPERRX = 0;
-                       }
-
                        /** Gets a mask of the hardware error flags which have occurred on the currently selected pipe. This
                         *  value can then be masked against the \c PIPE_ERRORFLAG_* masks to determine what error has occurred.
                         *