Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / LUFA / Drivers / Peripheral / Serial.h

diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h
index addee07..e0a7747 100644 (file)
--- a/LUFA/Drivers/Peripheral/Serial.h
+++ b/LUFA/Drivers/Peripheral/Serial.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -58,9 +58,7 @@
 #define __SERIAL_H__
 
        /* Macros: */
 #define __SERIAL_H__
 
        /* Macros: */

-               #if !defined(__DOXYGEN__)
-                       #define __INCLUDE_FROM_SERIAL_H
-               #endif
+               #define __INCLUDE_FROM_SERIAL_H

 
        /* Includes: */
                #include "../../Common/Common.h"
 
        /* Includes: */
                #include "../../Common/Common.h"


@@ -68,8 +66,11 @@
        /* Includes: */
                #if (ARCH == ARCH_AVR8)
                        #include "AVR8/Serial_AVR8.h"
        /* Includes: */
                #if (ARCH == ARCH_AVR8)
                        #include "AVR8/Serial_AVR8.h"

+               #elif (ARCH == ARCH_XMEGA)
+                       #include "XMEGA/Serial_XMEGA.h"

                #else
                        #error The Serial peripheral driver is not currently available for your selected architecture.
                #endif
 
 #endif
                #else
                        #error The Serial peripheral driver is not currently available for your selected architecture.
                #endif
 
 #endif

+