summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-02-11 19:16:45 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-02-11 19:16:45 +0000
commit86afffb7b3441d1ac33e5b82136bd58c3b0e8a97 (patch)
tree879ef02330adbf6a1dcd976cc90f649250592034 /nuttx/include
parentc57406e92f257c877a7dc8e9a8bfd21693f12b5c (diff)
downloadpx4-nuttx-86afffb7b3441d1ac33e5b82136bd58c3b0e8a97.tar.gz
px4-nuttx-86afffb7b3441d1ac33e5b82136bd58c3b0e8a97.tar.bz2
px4-nuttx-86afffb7b3441d1ac33e5b82136bd58c3b0e8a97.zip
Changes for Z8Encore\! compile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@668 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/compiler.h45
1 files changed, 27 insertions, 18 deletions
diff --git a/nuttx/include/nuttx/compiler.h b/nuttx/include/nuttx/compiler.h
index 4115559a1..7183288cb 100644
--- a/nuttx/include/nuttx/compiler.h
+++ b/nuttx/include/nuttx/compiler.h
@@ -226,7 +226,7 @@
/* At present, only the Zilog ZNeo compiler is recognized */
-# ifndef __ZNEO__
+# if !defined(__ZNEO__) && !defined(__EZ8__)
# warning "Unrecognized Zilog compiler"
# endif
@@ -258,24 +258,33 @@
# define reentrant_function
-/* Addressing */
-
-# define FAR _Far
-# define NEAR _Near
-# define DSEG _Far
-# define CODE _Erom
-
-/* Select the large, 32-bit addressing model */
-
-# undef CONFIG_SMALL_MEMORY
-
-/* Long and int are the same size */
-
-# undef CONFIG_LONG_IS_NOT_INT
-
-/* FAR pointers and int are the same size */
+/* Addressing.
+ *
+ * Z16F ZNEO: Far is 24-bits; near is 16-bits of address.
+ * The supported model is (1) all code on ROM, and (2) all data
+ * and stacks in external (far) RAM.
+ * Z8Encore!: Far is 16-bits; near is 8-bits of address.
+ * The supported model is (1) all code on ROM, and (2) all data
+ * and stacks in internal (far) RAM.
+ */
-# undef CONFIG_PTR_IS_NOT_INT
+# ifdef __ZNEO__
+# define FAR _Far
+# define NEAR _Near
+# define DSEG _Far
+# define CODE _Erom
+# undef CONFIG_SMALL_MEMORY /* Select the large, 32-bit addressing model */
+# undef CONFIG_LONG_IS_NOT_INT /* Long and int are the same size */
+# undef CONFIG_PTR_IS_NOT_INT /* FAR pointers and int are the same size */
+# else
+# define FAR far
+# define NEAR near
+# define DSEG far
+# define CODE rom
+# define CONFIG_SMALL_MEMORY 1 /* Select small, 16-bit address model */
+# define CONFIG_LONG_IS_NOT_INT 1 /* Long and int are not the same size */
+# undef CONFIG_PTR_IS_NOT_INT /* FAR pointers and int are the same size */
+# endif
/* The Zilog compiler does not support inline functions */