From 670ac9fb2f4bd6de7b43918eafc5ac590ac7a21d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 5 Jan 2016 14:46:49 -0600 Subject: [PATCH] Fix an ommission in compiler.h --- configs | 2 +- include/nuttx/compiler.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configs b/configs index d4540c0f83..16d7a0dab2 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit d4540c0f83378a6680ffd792ff1e4a8ca0ddd8b8 +Subproject commit 16d7a0dab2c4a48583d40bcf1dbf8e9a74316e91 diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h index 4ad2400456..f14d55c152 100644 --- a/include/nuttx/compiler.h +++ b/include/nuttx/compiler.h @@ -147,12 +147,17 @@ # undef CONFIG_PTR_IS_NOT_INT #elif defined(__AVR__) - +# if defined(CONFIG_AVR_HAS_MEMX_PTR) /* I-space access qualifiers needed by Harvard architecture */ -# if defined(CONFIG_AVR_HAS_MEMX_PTR) # define IOBJ __flash # define IPTR __memx + +# else +/* No I-space access qualifiers */ + +# define IOBJ +# define IPTR # endif /* Select the small, 16-bit addressing model */