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 a6fcb44..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


@@ -29,7 +29,7 @@
 */
 
 /** \file
 */
 
 /** \file

- *  \brief Master include file for the USART peripheral driver.
+ *  \brief Hardware Serial USART driver.

  *
  *  This file is the master dispatch header file for the device-specific USART driver, for microcontrollers
  *  containing a hardware USART.
  *
  *  This file is the master dispatch header file for the device-specific USART driver, for microcontrollers
  *  containing a hardware USART.


@@ -40,10 +40,11 @@
 
 /** \ingroup Group_PeripheralDrivers
  *  \defgroup Group_Serial Serial USART Driver - LUFA/Drivers/Peripheral/Serial.h
 
 /** \ingroup Group_PeripheralDrivers
  *  \defgroup Group_Serial Serial USART Driver - LUFA/Drivers/Peripheral/Serial.h

+ *  \brief Hardware Serial USART driver.

  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:

- *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/Serial.c <i>(Makefile source module name: LUFA_SRC_SERIAL)</i>
+ *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/Serial_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_SERIAL)</i>

  *
  *  \section Sec_ModDescription Module Description
  *  Hardware serial USART driver. This module provides an easy to use driver for the setup and transfer
  *
  *  \section Sec_ModDescription Module Description
  *  Hardware serial USART driver. This module provides an easy to use driver for the setup and transfer


@@ -57,18 +58,19 @@
 #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: */
                #if (ARCH == ARCH_AVR8)
 
        /* Includes: */
                #include "../../Common/Common.h"
 
        /* Includes: */
                #if (ARCH == ARCH_AVR8)

-                       #include "AVR8/Serial.h"
+                       #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

+