9 files changed, 55 insertions, 20 deletions
diff --git a/nuttx/arch/pjrc-8051/include/types.h b/nuttx/arch/pjrc-8051/include/types.h
index fad90f25d..f334b176f 100644
--- a/nuttx/arch/pjrc-8051/include/types.h
+++ b/nuttx/arch/pjrc-8051/include/types.h
@@ -1,7 +1,7 @@
 /************************************************************
- * types.h
+ * arch/types.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -58,9 +58,6 @@
  *
  * For SDCC, sizeof(int) is 16 and sizeof(long) is 32.
  * long long and double are not supported.
- *
- * Generic pointers are 3 bytes in length with the
- * first byte holding data space intformation.
  */
 
 typedef char sbyte;
@@ -72,6 +69,12 @@ typedef unsigned int uint16;
 typedef long sint32;
 typedef unsigned long uint32;
 
+/* For SDCC, a Generic pointer is 3 bytes in length with the
+ * first byte holding data space information.
+ */
+
+typedef unsigned long uintptr;
+
 /* This is the size of the interrupt state save returned by
  * irqsave()
  */
diff --git a/nuttx/arch/sh/include/m16c/types.h b/nuttx/arch/sh/include/m16c/types.h
index 4c3cad9bd..8037a4617 100644
--- a/nuttx/arch/sh/include/m16c/types.h
+++ b/nuttx/arch/sh/include/m16c/types.h
@@ -68,6 +68,10 @@ typedef unsigned long uint32;
 typedef long long sint64;
 typedef unsigned long long uint64;
 
+/* A pointer is 2 bytes */
+
+typedef unsigned int uintptr;
+
 /* This is the size of the interrupt state save returned by
  * irqsave()
  */
diff --git a/nuttx/arch/sh/include/sh1/types.h b/nuttx/arch/sh/include/sh1/types.h
index 1166fb40c..7b8876c93 100644
--- a/nuttx/arch/sh/include/sh1/types.h
+++ b/nuttx/arch/sh/include/sh1/types.h
@@ -67,6 +67,10 @@ typedef unsigned int uint32;
 typedef long long sint64;
 typedef unsigned long long uint64;
 
+/* A pointer is 4 bytes */
+
+typedef unsigned int uintptr;
+
 /* This is the size of the interrupt state save returned by
  * irqsave()
  */
diff --git a/nuttx/arch/sh/include/types.h b/nuttx/arch/sh/include/types.h
index 593d88306..e50a71c00 100644
--- a/nuttx/arch/sh/include/types.h
+++ b/nuttx/arch/sh/include/types.h
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/nuttx/arch/sim/include/types.h b/nuttx/arch/sim/include/types.h
index 1c7636886..9648b12ae 100644
--- a/nuttx/arch/sim/include/types.h
+++ b/nuttx/arch/sim/include/types.h
@@ -1,7 +1,7 @@
 /************************************************************
  * types.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@ typedef unsigned int uint32;
 typedef long long sint64;
 typedef unsigned long long uint64;
 
+/* A pointer is 4 bytes */
+
+typedef unsigned int uintptr;
+
 /* This is the size of the interrupt state save returned by
  * irqsave()
  */
diff --git a/nuttx/arch/z16/include/types.h b/nuttx/arch/z16/include/types.h
index 890779849..1de8149b6 100644
--- a/nuttx/arch/z16/include/types.h
+++ b/nuttx/arch/z16/include/types.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/types.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,10 @@ typedef unsigned short uint16;
 typedef int sint32;
 typedef unsigned int uint32;
 
+/* A pointer is 4 bytes */
+
+typedef unsigned int uintptr;
+
 /* This is the size of the interrupt state save returned by
  * irqsave()
  */
diff --git a/nuttx/arch/z80/include/ez80/types.h b/nuttx/arch/z80/include/ez80/types.h
index f8de240c4..52c95ac6b 100644
--- a/nuttx/arch/z80/include/ez80/types.h
+++ b/nuttx/arch/z80/include/ez80/types.h
@@ -2,7 +2,7 @@
  * arch/z80/include/ez80/types.h
  * include/arch/chip/types.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -62,11 +62,6 @@
  *   long   - 32-bits
  *   char   - 8-bits
  *   float  - 32-bits
- *
- * Pointers:
- *
- *   Z80 mode - 16 bits
- *   ADL mode - 24 bits
  */
 
 typedef char sbyte;
@@ -80,6 +75,19 @@ typedef unsigned int uint24;
 typedef long sint32;
 typedef unsigned long uint32;
 
+/* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80
+ * compatibility mode or not
+ *
+ *   Z80 mode - 16 bits
+ *   ADL mode - 24 bits
+ */
+
+#ifdef CONFIG_EZ80_Z80MODE
+typedef unsigned short uintptr;
+#else
+typedef unsigned int uintptr;
+#endif
+
 /* This is the size of the interrupt state save returned by irqsave().
  * It holds the AF regiser pair + a zero pad byte
  */
diff --git a/nuttx/arch/z80/include/z8/types.h b/nuttx/arch/z80/include/z8/types.h
index 5cf8f1341..79f2682f6 100644
--- a/nuttx/arch/z80/include/z8/types.h
+++ b/nuttx/arch/z80/include/z8/types.h
@@ -2,7 +2,7 @@
  * arch/z80/include/z8/types.h
  * include/arch/chip/types.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -80,6 +80,10 @@ typedef unsigned int uint16;
 typedef long sint32;
 typedef unsigned long uint32;
 
+/* A pointer is 2 bytes */
+
+typedef unsigned int uintptr;
+
 /* This is the size of the interrupt state save returned by irqsave() */
 
 typedef ubyte irqstate_t;
diff --git a/nuttx/arch/z80/include/z80/types.h b/nuttx/arch/z80/include/z80/types.h
index 97efa0761..d482725bc 100644
--- a/nuttx/arch/z80/include/z80/types.h
+++ b/nuttx/arch/z80/include/z80/types.h
@@ -2,7 +2,7 @@
  * arch/z80/include/z80/types.h
  * include/arch/chip/types.h
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -73,6 +73,10 @@ typedef unsigned int uint16;
 typedef long sint32;
 typedef unsigned long uint32;
 
+/* A pointer is 2 bytes */
+
+typedef unsigned int uintptr;
+
 /* This is the size of the interrupt state save returned by irqsave() */
 
 typedef uint16 irqstate_t;