You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/16 13:47:40 UTC
[incubator-nuttx] 35/35: arm: Use a consistent type (uintptr_t) for
g_idle_topstack
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 35c6b4ad103bfecf72597151662c5936b4dc3c6f
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Mon Nov 9 18:07:39 2020 +0900
arm: Use a consistent type (uintptr_t) for g_idle_topstack
---
arch/arm/src/common/arm_internal.h | 2 +-
arch/arm/src/cxd56xx/cxd56_allocateheap.c | 2 +-
arch/arm/src/kl/kl_start.c | 2 +-
arch/arm/src/lpc43xx/lpc43_allocateheap.c | 3 ++-
arch/arm/src/lpc54xx/lpc54_allocateheap.c | 3 ++-
arch/arm/src/max326xx/common/max326_start.c | 2 +-
arch/arm/src/nrf52/nrf52_allocateheap.c | 3 ++-
arch/arm/src/nuc1xx/nuc_start.c | 2 +-
arch/arm/src/samd2l2/sam_start.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_start.c | 2 +-
10 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/arch/arm/src/common/arm_internal.h b/arch/arm/src/common/arm_internal.h
index 396a4f3..d4f59f9 100644
--- a/arch/arm/src/common/arm_internal.h
+++ b/arch/arm/src/common/arm_internal.h
@@ -212,7 +212,7 @@ EXTERN volatile uint32_t *g_current_regs[1];
* CONFIG_RAM_END
*/
-EXTERN const uint32_t g_idle_topstack;
+EXTERN const uintptr_t g_idle_topstack;
/* Address of the saved user stack pointer */
diff --git a/arch/arm/src/cxd56xx/cxd56_allocateheap.c b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
index fa24c29..ae9279b 100644
--- a/arch/arm/src/cxd56xx/cxd56_allocateheap.c
+++ b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
@@ -69,7 +69,7 @@
* aligned).
*/
-const uint32_t g_idle_topstack = (uint32_t)&_ebss +
+const uintptr_t g_idle_topstack = (uintptr_t)&_ebss +
CONFIG_IDLETHREAD_STACKSIZE;
/****************************************************************************
diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c
index 35a2378..805a677 100644
--- a/arch/arm/src/kl/kl_start.c
+++ b/arch/arm/src/kl/kl_start.c
@@ -80,7 +80,7 @@
* Public Data
****************************************************************************/
-const uint32_t g_idle_topstack = IDLE_STACK;
+const uintptr_t g_idle_topstack = IDLE_STACK;
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
index 32ca412..e828726 100644
--- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c
+++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
@@ -340,7 +340,8 @@
* aligned).
*/
-const uint32_t g_idle_topstack = (uint32_t)&_ebss + CONFIG_IDLETHREAD_STACKSIZE;
+const uintptr_t g_idle_topstack = (uintptr_t)&_ebss +
+ CONFIG_IDLETHREAD_STACKSIZE;
#ifdef MM_HAVE_REGION
static uint8_t g_mem_region_next = 0;
diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
index 71a99ea..90b25dd 100644
--- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c
+++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
@@ -143,7 +143,8 @@
* aligned).
*/
-const uint32_t g_idle_topstack = (uint32_t)&_ebss + CONFIG_IDLETHREAD_STACKSIZE;
+const uintptr_t g_idle_topstack = (uintptr_t)&_ebss +
+ CONFIG_IDLETHREAD_STACKSIZE;
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/max326xx/common/max326_start.c b/arch/arm/src/max326xx/common/max326_start.c
index 53c1046..7136a97 100644
--- a/arch/arm/src/max326xx/common/max326_start.c
+++ b/arch/arm/src/max326xx/common/max326_start.c
@@ -95,7 +95,7 @@
* Public Data
****************************************************************************/
-const uint32_t g_idle_topstack = IDLE_STACK;
+const uintptr_t g_idle_topstack = IDLE_STACK;
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/nrf52/nrf52_allocateheap.c b/arch/arm/src/nrf52/nrf52_allocateheap.c
index 0633fe8..8f87b97 100644
--- a/arch/arm/src/nrf52/nrf52_allocateheap.c
+++ b/arch/arm/src/nrf52/nrf52_allocateheap.c
@@ -97,7 +97,8 @@
* aligned).
*/
-const uint32_t g_idle_topstack = (uint32_t)&_ebss + CONFIG_IDLETHREAD_STACKSIZE;
+const uintptr_t g_idle_topstack = (uintptr_t)&_ebss +
+ CONFIG_IDLETHREAD_STACKSIZE;
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c
index 50f5a32..ffa9ac8 100644
--- a/arch/arm/src/nuc1xx/nuc_start.c
+++ b/arch/arm/src/nuc1xx/nuc_start.c
@@ -77,7 +77,7 @@
* Public Data
****************************************************************************/
-const uint32_t g_idle_topstack = IDLE_STACK;
+const uintptr_t g_idle_topstack = IDLE_STACK;
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/samd2l2/sam_start.c b/arch/arm/src/samd2l2/sam_start.c
index 5a9eb40..27fee01 100644
--- a/arch/arm/src/samd2l2/sam_start.c
+++ b/arch/arm/src/samd2l2/sam_start.c
@@ -77,7 +77,7 @@
* Public Data
****************************************************************************/
-const uint32_t g_idle_topstack = IDLE_STACK;
+const uintptr_t g_idle_topstack = IDLE_STACK;
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/stm32f0l0g0/stm32_start.c b/arch/arm/src/stm32f0l0g0/stm32_start.c
index 421b153..6b830d1 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_start.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_start.c
@@ -65,7 +65,7 @@
* Public Data
****************************************************************************/
-const uint32_t g_idle_topstack = IDLE_STACK;
+const uintptr_t g_idle_topstack = IDLE_STACK;
/****************************************************************************
* Private Functions