aboutsummaryrefslogtreecommitdiff
path: root/include/libopencm3/stm32/usart.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/libopencm3/stm32/usart.h')
-rw-r--r--include/libopencm3/stm32/usart.h31
1 files changed, 14 insertions, 17 deletions
diff --git a/include/libopencm3/stm32/usart.h b/include/libopencm3/stm32/usart.h
index 9994002..c6ac545 100644
--- a/include/libopencm3/stm32/usart.h
+++ b/include/libopencm3/stm32/usart.h
@@ -1,23 +1,8 @@
-/** @defgroup STM32F_usart_defines USART Defines
-
-@brief <b>libopencm3 Defined Constants and Types for the STM32F Digital to Analog Converter </b>
-
-@ingroup STM32F_defines
-
-@version 1.0.0
-
-@author @htmlonly &copy; @endhtmlonly 2009 Uwe Hermann <uwe@hermann-uwe.de>
-
-@date 1 September 2012
-
-LGPL License Terms @ref lgpl_license
- */
+/* This provides unification of code over STM32F subfamilies */
/*
* This file is part of the libopencm3 project.
*
- * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
- *
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -32,6 +17,7 @@ LGPL License Terms @ref lgpl_license
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+<<<<<<< HEAD
/**@{*/
#ifndef LIBOPENCM3_USART_H
@@ -378,6 +364,17 @@ bool usart_get_interrupt_source(u32 usart, u32 flag);
END_DECLS
+=======
+#if defined(STM32F1)
+# include <libopencm3/stm32/f1/usart.h>
+#elif defined(STM32F2)
+# include <libopencm3/stm32/f2/usart.h>
+#elif defined(STM32F4)
+# include <libopencm3/stm32/f4/usart.h>
+#elif defined(STM32L1)
+# include <libopencm3/stm32/l1/usart.h>
+#else
+# error "stm32 family not defined."
+>>>>>>> Move usart files to common area
#endif
-/**@}*/