From 0ab26a05a8b41e0aa9f07f33ed1b997fb4fabf1f Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 21:11:09 -0700
Subject: [PATCH] Moved spi header over to common and created F2 specific
 header.

---
 .../{stm32f1 => stm32_common}/spi.h           |  4 +-
 include/libopencm3/stm32f2/spi.h              | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/spi.h (98%)
 create mode 100644 include/libopencm3/stm32f2/spi.h

diff --git a/include/libopencm3/stm32f1/spi.h b/include/libopencm3/stm32_common/spi.h
similarity index 98%
rename from include/libopencm3/stm32f1/spi.h
rename to include/libopencm3/stm32_common/spi.h
index d85c0dcb..32494570 100644
--- a/include/libopencm3/stm32f1/spi.h
+++ b/include/libopencm3/stm32_common/spi.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_SPI_H
 #define LIBOPENCM3_SPI_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* Registers can be accessed as 16bit or 32bit values. */
@@ -212,7 +212,7 @@
 /* RXNE: Receive buffer not empty */
 #define SPI_SR_RXNE			(1 << 0)
 
-/* --- SPI_SR values ------------------------------------------------------- */
+/* --- SPI_DR values ------------------------------------------------------- */
 
 /* SPI_DR[15:0]: Data Register. */
 
diff --git a/include/libopencm3/stm32f2/spi.h b/include/libopencm3/stm32f2/spi.h
new file mode 100644
index 00000000..d4aa02ed
--- /dev/null
+++ b/include/libopencm3/stm32f2/spi.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_SPI_F2_H
+#define LIBOPENCM3_SPI_F2_H
+
+#include <libopencm3/stm32_common/spi.h>
+
+/*
+ * This file extends the version in stm_common with definitions only
+ * applicable to the STM32F2 series of devices.
+ */
+
+/* --- SPI_CR2 values ------------------------------------------------------ */
+
+/* FRF: Frame format. */
+#define SPI_CR2_FRF			(1 << 4)
+#define SPI_CR2_FRF_TI		       	(1 << 4)
+#define SPI_CR2_FRF_MOTOROLA			(1 << 4)
+
+/* --- SPI_SR values ------------------------------------------------------- */
+
+/* TIFRFE: TI frame format error. */
+#define SPI_SR_RXNE			(1 << 0)
+
+#endif