From a4a4255555797a975eff9b0168d625a6f4285af2 Mon Sep 17 00:00:00 2001
From: Roger Light <roger@atchoo.org>
Date: Wed, 12 Dec 2012 20:47:38 +0000
Subject: [PATCH] STM32: Move RNG to common area and add support for the F2.

---
 .../libopencm3/stm32/common/rng_common_f24.h  | 61 +++++++++++++++++++
 include/libopencm3/stm32/f2/rng.h             | 24 ++++++++
 include/libopencm3/stm32/f4/rng.h             | 45 ++------------
 3 files changed, 89 insertions(+), 41 deletions(-)
 create mode 100644 include/libopencm3/stm32/common/rng_common_f24.h
 create mode 100644 include/libopencm3/stm32/f2/rng.h

diff --git a/include/libopencm3/stm32/common/rng_common_f24.h b/include/libopencm3/stm32/common/rng_common_f24.h
new file mode 100644
index 00000000..7d98bfab
--- /dev/null
+++ b/include/libopencm3/stm32/common/rng_common_f24.h
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This library 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_RNG_COMMON_F24_H
+#define LIBOPENCM3_RNG_COMMON_F24_H
+
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+
+/* --- Random number generator registers ----------------------------------- */
+
+/* Control register */
+#define RNG_CR			MMIO32(RNG_BASE + 0x00) 
+
+/* Status register */
+#define RNG_SR			MMIO32(RNG_BASE + 0x04)
+
+/* Data register */
+#define RNG_DR			MMIO32(RNG_BASE + 0x08)
+
+/* --- RNG_CR values ------------------------------------------------------- */
+
+/* RNG ENABLE */
+#define RNG_CR_RNGEN		(1 << 2)
+
+/* RNG interupt enable */
+#define RNG_CR_IE			(1 << 3)
+
+/* --- RNG_SR values ------------------------------------------------------- */
+
+/* Data ready */
+#define RNG_SR_DRDY		(1 << 0)
+
+/* Clock error current status */
+#define RNG_SR_CECS		(1 << 1)
+
+/* Seed error current status */
+#define RNG_SR_SECS		(1 << 2)
+
+/* Clock error interup status */
+#define RNG_SR_CEIS		(1 << 5)
+
+/* Seed error interup status */
+#define RNG_SR_SEIS		(1 << 6)
+
+#endif
diff --git a/include/libopencm3/stm32/f2/rng.h b/include/libopencm3/stm32/f2/rng.h
new file mode 100644
index 00000000..63d03fe5
--- /dev/null
+++ b/include/libopencm3/stm32/f2/rng.h
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This library 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_RNG_F2_H
+#define LIBOPENCM3_RNG_F2_H
+
+#include <libopencm3/stm32/f2/memorymap.h>
+#include <libopencm3/stm32/common/rng_common_f24.h>
+
+#endif
diff --git a/include/libopencm3/stm32/f4/rng.h b/include/libopencm3/stm32/f4/rng.h
index 5553dd3b..b72f8014 100644
--- a/include/libopencm3/stm32/f4/rng.h
+++ b/include/libopencm3/stm32/f4/rng.h
@@ -1,7 +1,6 @@
 /*
  * This file is part of the libopencm3 project.
  *
- *
  * 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
@@ -16,46 +15,10 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENCM3_RNG_H
-#define LIBOPENCM3_RNG_H
+#ifndef LIBOPENCM3_RNG_F4_H
+#define LIBOPENCM3_RNG_F4_H
 
-#include <libopencm3/stm32/memorymap.h>
-#include <libopencm3/cm3/common.h>
-
-/* --- Random number generator registers ----------------------------------- */
-
-/* Control register */
-#define RNG_CR			MMIO32(RNG_BASE + 0x00) 
-
-/* Status register */
-#define RNG_SR			MMIO32(RNG_BASE + 0x04)
-
-/* Data register */
-#define RNG_DR			MMIO32(RNG_BASE + 0x08)
-
-/* --- RNG_CR values ------------------------------------------------------- */
-
-/* RNG ENABLE */
-#define RNG_CR_RNGEN		(1 << 2)
-
-/* RNG interupt enable */
-#define RNG_CR_IE			(1 << 3)
-
-/* --- RNG_SR values ------------------------------------------------------- */
-
-/* Data ready */
-#define RNG_SR_DRDY		(1 << 0)
-
-/* Clock error current status */
-#define RNG_SR_CECS		(1 << 1)
-
-/* Seed error current status */
-#define RNG_SR_SECS		(1 << 2)
-
-/* Clock error interup status */
-#define RNG_SR_CEIS		(1 << 5)
-
-/* Seed error interup status */
-#define RNG_SR_SEIS		(1 << 6)
+#include <libopencm3/stm32/f4/memorymap.h>
+#include <libopencm3/stm32/common/rng_common_f24.h>
 
 #endif