aboutsummaryrefslogtreecommitdiff
path: root/include/libopencm3/stm32/f4
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2013-01-06 18:05:49 -0800
committerPiotr Esden-Tempski2013-01-06 18:05:49 -0800
commitc03cbc41a1c260b160bee5b4a99fed9946f26c07 (patch)
tree8eaa1d803f7519095e8a89af9e3a16fb69c4b9d3 /include/libopencm3/stm32/f4
parent1f9911e35be3c57e43bcf2dbee5d649c885872ff (diff)
parentb9180a81d8a228a0ca4f37aae8e317a9d81fe4c9 (diff)
Merge pull request #73 RNG
Merge remote-tracking branch 'oojah/master'
Diffstat (limited to 'include/libopencm3/stm32/f4')
-rw-r--r--include/libopencm3/stm32/f4/rng.h45
1 files changed, 4 insertions, 41 deletions
diff --git a/include/libopencm3/stm32/f4/rng.h b/include/libopencm3/stm32/f4/rng.h
index 5f517c8..b72f801 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
-
-#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_EN (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)
+#ifndef LIBOPENCM3_RNG_F4_H
+#define LIBOPENCM3_RNG_F4_H
-/* 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