Add system controller register and clean-up PMC headers

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4396 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/io/sam3.h b/bertos/cpu/cortex-m3/io/sam3.h
index 385221b262b69f3256efcca04657d2234b0555b0..46425493fde0c603639ad6eb9f5da39fb8e59cb2 100644 (file)
--- a/bertos/cpu/cortex-m3/io/sam3.h
+++ b/bertos/cpu/cortex-m3/io/sam3.h
@@ -41,6 +41,8 @@
 #include <cpu/detect.h>
 #include <cfg/compiler.h>
 
+#include "sam3_sysctl.h"
+#include "sam3_pmc.h"
 #include "sam3_memmap.h"
 #include "sam3_ints.h"
 #include "sam3_gpio.h"

diff --git a/bertos/cpu/cortex-m3/io/sam3_pmc.h b/bertos/cpu/cortex-m3/io/sam3_pmc.h
index 3d561a883680777825bcf08ef45c37c9ef6d2a9f..398f6cbe7f80765b05249b041bb3934ceaeac523 100644 (file)
--- a/bertos/cpu/cortex-m3/io/sam3_pmc.h
+++ b/bertos/cpu/cortex-m3/io/sam3_pmc.h
@@ -253,7 +253,7 @@
  * Defines for bit fields in CKGR_MCFR register.
  */
 /*\{*/
-#define CKGR_MCFR_MAINF_M   0xffffu   ///< Main Clock Frequency mask
+#define CKGR_MCFR_MAINF_M   0xffff    ///< Main Clock Frequency mask
 #define CKGR_MCFR_MAINFRDY  BV(16)    ///< Main Clock Ready
 /*\}*/
 
@@ -281,15 +281,15 @@
 #define   PMC_MCKR_CSS_MAIN_CLK  0x1   ///< Main Clock is selected
 #define   PMC_MCKR_CSS_PLL_CLK   0x2   ///< PLL Clock is selected
 #define PMC_MCKR_PRES_S          4
-#define PMC_MCKR_PRES_M          (0x7u << PMC_MCKR_PRES_S)    ///< Processor Clock Prescaler mask
-#define   PMC_MCKR_PRES_CLK      (0x0u << PMC_MCKR_PRES_S)   ///< Selected clock
-#define   PMC_MCKR_PRES_CLK_2    (0x1u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 2
-#define   PMC_MCKR_PRES_CLK_4    (0x2u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 4
-#define   PMC_MCKR_PRES_CLK_8    (0x3u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 8
-#define   PMC_MCKR_PRES_CLK_16   (0x4u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 16
-#define   PMC_MCKR_PRES_CLK_32   (0x5u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 32
-#define   PMC_MCKR_PRES_CLK_64   (0x6u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 64
-#define   PMC_MCKR_PRES_CLK_3    (0x7u << PMC_MCKR_PRES_S)   ///< Selected clock divided by 3
+#define PMC_MCKR_PRES_M          (0x7 << PMC_MCKR_PRES_S)    ///< Processor Clock Prescaler mask
+#define   PMC_MCKR_PRES_CLK      (0x0 << PMC_MCKR_PRES_S)   ///< Selected clock
+#define   PMC_MCKR_PRES_CLK_2    (0x1 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 2
+#define   PMC_MCKR_PRES_CLK_4    (0x2 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 4
+#define   PMC_MCKR_PRES_CLK_8    (0x3 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 8
+#define   PMC_MCKR_PRES_CLK_16   (0x4 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 16
+#define   PMC_MCKR_PRES_CLK_32   (0x5 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 32
+#define   PMC_MCKR_PRES_CLK_64   (0x6 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 64
+#define   PMC_MCKR_PRES_CLK_3    (0x7 << PMC_MCKR_PRES_S)   ///< Selected clock divided by 3
 #define PMC_MCKR_PLLDIV2         BV(12)   ///< PLL Divisor by 2
 /*\}*/
 
@@ -303,14 +303,14 @@
 #define   PMC_PCK_CSS_PLL      0x2   ///< PLL Clock is selected
 #define   PMC_PCK_CSS_MCK      0x4   ///< Master Clock is selected
 #define PMC_PCK_PRES_S 4
-#define PMC_PCK_PRES_M         (0x7u << PMC_PCK_PRES_S)   ///< Programmable Clock Prescaler
-#define   PMC_PCK_PRES_CLK     (0x0u << PMC_PCK_PRES_S)   ///< Selected clock
-#define   PMC_PCK_PRES_CLK_2   (0x1u << PMC_PCK_PRES_S)   ///< Selected clock divided by 2
-#define   PMC_PCK_PRES_CLK_4   (0x2u << PMC_PCK_PRES_S)   ///< Selected clock divided by 4
-#define   PMC_PCK_PRES_CLK_8   (0x3u << PMC_PCK_PRES_S)   ///< Selected clock divided by 8
-#define   PMC_PCK_PRES_CLK_16  (0x4u << PMC_PCK_PRES_S)   ///< Selected clock divided by 16
-#define   PMC_PCK_PRES_CLK_32  (0x5u << PMC_PCK_PRES_S)   ///< Selected clock divided by 32
-#define   PMC_PCK_PRES_CLK_64  (0x6u << PMC_PCK_PRES_S)   ///< Selected clock divided by 64
+#define PMC_PCK_PRES_M         (0x7 << PMC_PCK_PRES_S)   ///< Programmable Clock Prescaler
+#define   PMC_PCK_PRES_CLK     (0x0 << PMC_PCK_PRES_S)   ///< Selected clock
+#define   PMC_PCK_PRES_CLK_2   (0x1 << PMC_PCK_PRES_S)   ///< Selected clock divided by 2
+#define   PMC_PCK_PRES_CLK_4   (0x2 << PMC_PCK_PRES_S)   ///< Selected clock divided by 4
+#define   PMC_PCK_PRES_CLK_8   (0x3 << PMC_PCK_PRES_S)   ///< Selected clock divided by 8
+#define   PMC_PCK_PRES_CLK_16  (0x4 << PMC_PCK_PRES_S)   ///< Selected clock divided by 16
+#define   PMC_PCK_PRES_CLK_32  (0x5 << PMC_PCK_PRES_S)   ///< Selected clock divided by 32
+#define   PMC_PCK_PRES_CLK_64  (0x6 << PMC_PCK_PRES_S)   ///< Selected clock divided by 64
 /*\}*/
 
 /**

diff --git a/bertos/cpu/cortex-m3/io/sam3_sysctl.h b/bertos/cpu/cortex-m3/io/sam3_sysctl.h
new file mode 100644 (file)
index 0000000..4be5129
--- /dev/null
+++ b/bertos/cpu/cortex-m3/io/sam3_sysctl.h
@@ -0,0 +1,102 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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 2 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief ATSAM3 system controller registers.
+ */
+
+#ifndef SAM3_SYSCTL_H
+#define SAM3_SYSCTL_H
+
+/**
+ * Supply controller registers.
+ */
+/*\{*/
+#define SUPC_CR_R   (*((reg32_t *)0x400E1410))   ///< Supply Controller Control
+#define SUPC_SMMR_R (*((reg32_t *)0x400E1414))   ///< Supply Controller Supply Monitor Mode
+#define SUPC_MR_R   (*((reg32_t *)0x400E1418))   ///< Supply Controller Mode
+#define SUPC_WUMR_R (*((reg32_t *)0x400E141C))   ///< Supply Controller Wake Up Mode
+#define SUPC_WUIR_R (*((reg32_t *)0x400E1420))   ///< Supply Controller Wake Up Inputs
+#define SUPC_SR_R   (*((reg32_t *)0x400E1424))   ///< Supply Controller Status
+/*\}*/
+
+/**
+ * Supply controller addresses.
+ */
+/*\{*/
+#define SUPC_CR   0x400E1410   ///< Supply Controller Control
+#define SUPC_SMMR 0x400E1414   ///< Supply Controller Supply Monitor Mode
+#define SUPC_MR   0x400E1418   ///< Supply Controller Mode
+#define SUPC_WUMR 0x400E141C   ///< Supply Controller Wake Up Mode
+#define SUPC_WUIR 0x400E1420   ///< Supply Controller Wake Up Inputs #define SUPC_SR   0x400E1424   ///< Supply Controller Status
+/*\}*/
+
+/**
+ * Defines for bit fields in SUPC_CR register.
+ */
+/*\{*/
+#define SUPC_CR_VROFF       BV(2)                     ///< Voltage Regulator Off
+#define SUPC_CR_XTALSEL     BV(3)                     ///< Crystal Oscillator Select
+#define SUPC_CR_KEY_P       24
+#define SUPC_CR_KEY_M       (0xff << SUPC_CR_KEY_P)   ///< SUPC_CR key
+#define SUPC_CR_KEY(value)  (SUPC_CR_KEY_M & ((value) << SUPC_CR_KEY_P))
+/*\}*/
+
+/**
+ * Defines for bit fields in SUPC_SR register.
+ */
+/*\{*/
+#define SUPC_SR_WKUPS     BV(1)   ///< WKUP Wake Up Status
+#define SUPC_SR_SMWS      BV(2)   ///< Supply Monitor Detection Wake Up Status
+#define SUPC_SR_BODRSTS   BV(3)   ///< Brownout Detector Reset Status
+#define SUPC_SR_SMRSTS    BV(4)   ///< Supply Monitor Reset Status
+#define SUPC_SR_SMS       BV(5)   ///< Supply Monitor Status
+#define SUPC_SR_SMOS      BV(6)   ///< Supply Monitor Output Status
+#define SUPC_SR_OSCSEL    BV(7)   ///< 32-kHz Oscillator Selection Status
+#define SUPC_SR_WKUPIS0   BV(16)  ///< WKUP Input Status 0
+#define SUPC_SR_WKUPIS1   BV(17)  ///< WKUP Input Status 1
+#define SUPC_SR_WKUPIS2   BV(18)  ///< WKUP Input Status 2
+#define SUPC_SR_WKUPIS3   BV(19)  ///< WKUP Input Status 3
+#define SUPC_SR_WKUPIS4   BV(20)  ///< WKUP Input Status 4
+#define SUPC_SR_WKUPIS5   BV(21)  ///< WKUP Input Status 5
+#define SUPC_SR_WKUPIS6   BV(22)  ///< WKUP Input Status 6
+#define SUPC_SR_WKUPIS7   BV(23)  ///< WKUP Input Status 7
+#define SUPC_SR_WKUPIS8   BV(24)  ///< WKUP Input Status 8
+#define SUPC_SR_WKUPIS9   BV(25)  ///< WKUP Input Status 9
+#define SUPC_SR_WKUPIS10  BV(26)  ///< WKUP Input Status 10
+#define SUPC_SR_WKUPIS11  BV(27)  ///< WKUP Input Status 11
+#define SUPC_SR_WKUPIS12  BV(28)  ///< WKUP Input Status 12
+#define SUPC_SR_WKUPIS13  BV(29)  ///< WKUP Input Status 13
+#define SUPC_SR_WKUPIS14  BV(30)  ///< WKUP Input Status 14
+#define SUPC_SR_WKUPIS15  BV(31)  ///< WKUP Input Status 15
+/*\}*/
+
+#endif /* SAM3_SYSCTL_H */