From 58613c9052eed88a010eb8bf42ade514655c904e Mon Sep 17 00:00:00 2001
From: edolomb <none@example.com>
Date: Thu, 4 Jan 2018 16:10:52 +0000
Subject: Added Region Mask

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11225 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/SAMA/SAMA5D2x/sama_matrix.h | 65 +++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 10 deletions(-)

(limited to 'os/hal/ports/SAMA/SAMA5D2x')

diff --git a/os/hal/ports/SAMA/SAMA5D2x/sama_matrix.h b/os/hal/ports/SAMA/SAMA5D2x/sama_matrix.h
index 7a58e9126..a29be16da 100644
--- a/os/hal/ports/SAMA/SAMA5D2x/sama_matrix.h
+++ b/os/hal/ports/SAMA/SAMA5D2x/sama_matrix.h
@@ -93,6 +93,51 @@
 #define FIXED_DEFAULT_MASTER     0x2u
 /** @} */
 
+/**
+ * @name    REGION MATRIX MASK macros
+ * @{
+ */
+/**
+ * @brief   Region 0.
+ */
+#define REGION_0_MSK             (0x1u << 0)
+
+/**
+ * @brief   Region 1.
+ */
+#define REGION_1_MSK             (0x1u << 1)
+
+/**
+ * @brief   Region 2.
+ */
+#define REGION_2_MSK             (0x1u << 2)
+
+/**
+ * @brief   Region 3.
+ */
+#define REGION_3_MSK             (0x1u << 3)
+
+/**
+ * @brief   Region 4.
+ */
+#define REGION_4_MSK             (0x1u << 4)
+
+/**
+ * @brief   Region 5.
+ */
+#define REGION_5_MSK             (0x1u << 5)
+
+/**
+ * @brief   Region 6.
+ */
+#define REGION_6_MSK             (0x1u << 6)
+
+/**
+ * @brief   Region 7.
+ */
+#define REGION_7_MSK             (0x1u << 7)
+/** @} */
+
 /**
  * @name    REGION MATRIX macros
  * @{
@@ -100,42 +145,42 @@
 /**
  * @brief   Region 0.
  */
-#define REGION_0                 (0x1u << 0)
+#define REGION_0                 0x0u
 
 /**
  * @brief   Region 1.
  */
-#define REGION_1                 (0x1u << 1)
+#define REGION_1                 0x1u
 
 /**
  * @brief   Region 2.
  */
-#define REGION_2                 (0x1u << 2)
+#define REGION_2                 0x2u
 
 /**
  * @brief   Region 3.
  */
-#define REGION_3                 (0x1u << 3)
+#define REGION_3                 0x3u
 
 /**
  * @brief   Region 4.
  */
-#define REGION_4                 (0x1u << 4)
+#define REGION_4                 0x4u
 
 /**
  * @brief   Region 5.
  */
-#define REGION_5                 (0x1u << 5)
+#define REGION_5                 0x5u
 
 /**
  * @brief   Region 6.
  */
-#define REGION_6                 (0x1u << 6)
+#define REGION_6                 0x6u
 
 /**
  * @brief   Region 7.
  */
-#define REGION_7                 (0x1u << 7)
+#define REGION_7                 0x7u
 /** @} */
 
 /**
@@ -256,7 +301,7 @@
  *
  * @api
  */
-#define mtxRegionRdnsech(region, rdnsech)                   ((rdnsech << 8) << region)
+#define mtxRegionRdnsech(region, rdnsech)                   (rdnsech << region)
 
 /**
  * @brief   Configure WRNSECH per Region.
@@ -266,7 +311,7 @@
  *
  * @api
  */
-#define mtxRegionWrnsech(region, wrnsech)                   ((wrnsech << 16) << region)
+#define mtxRegionWrnsech(region, wrnsech)                   (wrnsech << region)
 
 /*===========================================================================*/
 /* External declarations.                                                    */
-- 
cgit v1.2.3