ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix nrf section iter macro check

pull/10652/head
Desmond Chen 2019-01-24 16:53:03 +08:00 committed by desmond.chen
parent e8e1ef2a70
commit 4e8eed07e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/components/libraries/experimental_section_vars/nrf_section_iter.c
View File

@ -45,7 +45,7 @@
#include "nrf_section_iter.h" #include "nrf_section_iter.h"
#if !defined(__GNUC__) #if !defined(__GNUC__) || defined(__CC_ARM)
static void nrf_section_iter_item_set(nrf_section_iter_t * p_iter) static void nrf_section_iter_item_set(nrf_section_iter_t * p_iter)
{ {
ASSERT(p_iter != NULL); ASSERT(p_iter != NULL);
@ -82,7 +82,7 @@ void nrf_section_iter_init(nrf_section_iter_t * p_iter, nrf_section_set_t const
p_iter->p_set = p_set; p_iter->p_set = p_set;
#if defined(__GNUC__) #if defined(__GNUC__) && !defined(__CC_ARM)
p_iter->p_item = p_iter->p_set->section.p_start; p_iter->p_item = p_iter->p_set->section.p_start;
if (p_iter->p_item == p_iter->p_set->section.p_end) if (p_iter->p_item == p_iter->p_set->section.p_end)
{ {
@ -106,7 +106,7 @@ void nrf_section_iter_next(nrf_section_iter_t * p_iter)
p_iter->p_item = (void *)((size_t)(p_iter->p_item) + p_iter->p_set->item_size); p_iter->p_item = (void *)((size_t)(p_iter->p_item) + p_iter->p_set->item_size);
#if defined(__GNUC__) #if defined(__GNUC__) && !defined(__CC_ARM)
if (p_iter->p_item == p_iter->p_set->section.p_end) if (p_iter->p_item == p_iter->p_set->section.p_end)
{ {
p_iter->p_item = NULL; p_iter->p_item = NULL;

6
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/components/libraries/experimental_section_vars/nrf_section_iter.h
View File

@ -68,7 +68,7 @@ typedef struct
/**@brief Set of the sections description structure. */ /**@brief Set of the sections description structure. */
typedef struct typedef struct
{ {
#if defined(__GNUC__) #if defined(__GNUC__) && !defined(__CC_ARM)
nrf_section_t section; //!< Description of the set of sections. nrf_section_t section; //!< Description of the set of sections.
/**< /**<
* In case of GCC all sections in the set are sorted and * In case of GCC all sections in the set are sorted and
@ -87,7 +87,7 @@ typedef struct
typedef struct typedef struct
{ {
nrf_section_set_t const * p_set; //!< Pointer to the appropriate section set. nrf_section_set_t const * p_set; //!< Pointer to the appropriate section set.
#if !defined(__GNUC__) #if !defined(__GNUC__) || defined(__CC_ARM)
nrf_section_t const * p_section; //!< Pointer to the selected section. nrf_section_t const * p_section; //!< Pointer to the selected section.
/**< /**<
* In case of GCC all sections in the set are sorted and * In case of GCC all sections in the set are sorted and
@ -110,7 +110,7 @@ typedef struct
* @param[in] _count Number of the sections in the set. This parameter is ignored in case of GCC. * @param[in] _count Number of the sections in the set. This parameter is ignored in case of GCC.
* @hideinitializer * @hideinitializer
*/ */
#if defined(__GNUC__) #if defined(__GNUC__) && !defined(__CC_ARM)
#define NRF_SECTION_SET_DEF(_name, _type, _count) \ #define NRF_SECTION_SET_DEF(_name, _type, _count) \
\ \