Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2359 42af7a65-404d-4744-a932-0658087f49c3

8 files changed, 39 insertions, 28 deletions

diff --git a/nuttx/arch/arm/include/arch.h b/nuttx/arch/arm/include/arch.h
index 426f4b959..dd750ad77 100644
--- a/nuttx/arch/arm/include/arch.h
+++ b/nuttx/arch/arm/include/arch.h
@@ -45,6 +45,9 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#ifndef __ASSEMBLY__
+#  include <stdint.h>
+#endif
 
 /****************************************************************************
  * Definitions
@@ -60,14 +63,14 @@
 #define PIC_REG_STRING "r10"
 
 /* Macros to get and set the PIC base register.  picbase is assumed to be
- * of type (void*) and that it will fit into a uint32.  These must be
+ * of type (void*) and that it will fit into a uint32_t.  These must be
  * inline so that they will be compatible with the ABIs rules for
  * preserving the PIC register
  */
 
 #define up_getpicbase(ppicbase) \
 do { \
-  uint32 picbase; \
+  uint32_t picbase; \
   __asm__ \
   ( \
     "\tmov %0, " PIC_REG_STRING "\n\t" \
@@ -78,7 +81,7 @@ do { \
 
 #define up_setpicbase(picbase) \
 do { \
-  uint32 _picbase = (uint32)picbase; \
+  uint32_t _picbase = (uint32_t)picbase; \
   __asm__ \
   ( \
     "\tmov " PIC_REG_STRING ", %0\n\t" \
diff --git a/nuttx/arch/arm/include/arm/irq.h b/nuttx/arch/arm/include/arm/irq.h
index 98335c23f..38ea20553 100644
--- a/nuttx/arch/arm/include/arm/irq.h
+++ b/nuttx/arch/arm/include/arm/irq.h
@@ -45,7 +45,9 @@
  ****************************************************************************/
 
 #include <nuttx/irq.h>
-#include <sys/types.h>
+#ifndef __ASSEMBLY__
+#  include <stdint.h>
+#endif
 
 /****************************************************************************
  * Definitions
@@ -147,13 +149,13 @@ struct xcptcontext
    * signal processing.
    */
 
-  uint32 saved_pc;
-  uint32 saved_cpsr;
+  uint32_t saved_pc;
+  uint32_t saved_cpsr;
 #endif
 
   /* Register save area */
 
-  uint32 regs[XCPTCONTEXT_REGS];
+  uint32_t regs[XCPTCONTEXT_REGS];
 };
 #endif
 
diff --git a/nuttx/arch/arm/include/cortexm3/irq.h b/nuttx/arch/arm/include/cortexm3/irq.h
index 91be3e8b3..de38585c3 100644
--- a/nuttx/arch/arm/include/cortexm3/irq.h
+++ b/nuttx/arch/arm/include/cortexm3/irq.h
@@ -45,7 +45,10 @@
  ****************************************************************************/
 
 #include <nuttx/irq.h>
-#include <sys/types.h>
+#ifndef __ASSEMBLY__
+#  include <stdint.h>
+#endif
+
 
 /****************************************************************************
  * Definitions
@@ -137,14 +140,14 @@ struct xcptcontext
    * signal processing.
    */
 
-  uint32 saved_pc;
-  uint32 saved_primask;
-  uint32 saved_xpsr;
+  uint32_t saved_pc;
+  uint32_t saved_primask;
+  uint32_t saved_xpsr;
 #endif
 
   /* Register save area */
 
-  uint32 regs[XCPTCONTEXT_REGS];
+  uint32_t regs[XCPTCONTEXT_REGS];
 };
 #endif
 
@@ -195,19 +198,19 @@ static inline void irqrestore(irqstate_t primask)
 
 /* Get/set the primask register */
 
-static inline ubyte getprimask(void)
+static inline uint8_t getprimask(void)
 {
-  uint32 primask;
+  uint32_t primask;
   __asm__ __volatile__
     (
      "\tmrs  %0, primask\n"
      : "=r" (primask)
      :
      : "memory");
-  return (ubyte)primask;
+  return (uint8_t)primask;
 }
 
-static inline void setprimask(uint32 primask)
+static inline void setprimask(uint32_t primask)
 {
   __asm__ __volatile__
     (
@@ -219,19 +222,19 @@ static inline void setprimask(uint32 primask)
 
 /* Get/set the basepri register */
 
-static inline ubyte getbasepri(void)
+static inline uint8_t getbasepri(void)
 {
-  uint32 basepri;
+  uint32_t basepri;
   __asm__ __volatile__
     (
      "\tmrs  %0, basepri\n"
      : "=r" (basepri)
      :
      : "memory");
-  return (ubyte)basepri;
+  return (uint8_t)basepri;
 }
 
-static inline void setbasepri(uint32 basepri)
+static inline void setbasepri(uint32_t basepri)
 {
   __asm__ __volatile__
     (
@@ -243,9 +246,9 @@ static inline void setbasepri(uint32 basepri)
 
 /* Get IPSR */
 
-static inline uint32 getipsr(void)
+static inline uint32_t getipsr(void)
 {
-  uint32 ipsr;
+  uint32_t ipsr;
   __asm__ __volatile__
     (
      "\tmrs  %0, ipsr\n"
@@ -257,7 +260,7 @@ static inline uint32 getipsr(void)
 
 /* SVC system call */
 
-static inline void svcall(uint32 cmd, uint32 arg)
+static inline void svcall(uint32_t cmd, uint32_t arg)
 {
   __asm__ __volatile__
     (
diff --git a/nuttx/arch/arm/include/lm3s/irq.h b/nuttx/arch/arm/include/lm3s/irq.h
index 1c838790a..e10a884d5 100644
--- a/nuttx/arch/arm/include/lm3s/irq.h
+++ b/nuttx/arch/arm/include/lm3s/irq.h
@@ -45,7 +45,6 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 #include <nuttx/irq.h>
 
 /************************************************************************************
diff --git a/nuttx/arch/arm/include/lpc214x/irq.h b/nuttx/arch/arm/include/lpc214x/irq.h
index 911f51df9..221644a07 100644
--- a/nuttx/arch/arm/include/lpc214x/irq.h
+++ b/nuttx/arch/arm/include/lpc214x/irq.h
@@ -44,6 +44,10 @@
  * Included Files
  ****************************************************************************/
 
+#ifndef __ASSEMBLY__
+#  include <stdint.h>
+#endif
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
@@ -88,7 +92,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-typedef void (*vic_vector_t)(uint32 *regs);
+typedef void (*vic_vector_t)(uint32_t *regs);
 #endif
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/include/serial.h b/nuttx/arch/arm/include/serial.h
index f361ed99b..636e90947 100644
--- a/nuttx/arch/arm/include/serial.h
+++ b/nuttx/arch/arm/include/serial.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/include/serial.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
@@ -40,6 +40,8 @@
  * Included Files
  ****************************************************************************/
 
+#include <sys/types.h>
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
diff --git a/nuttx/arch/arm/include/stm32/irq.h b/nuttx/arch/arm/include/stm32/irq.h
index 19815c552..108dfd10b 100644
--- a/nuttx/arch/arm/include/stm32/irq.h
+++ b/nuttx/arch/arm/include/stm32/irq.h
@@ -45,7 +45,6 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 #include <nuttx/irq.h>
 
 /************************************************************************************
diff --git a/nuttx/arch/arm/include/str71x/irq.h b/nuttx/arch/arm/include/str71x/irq.h
index 26a9d1eb6..137dab715 100644
--- a/nuttx/arch/arm/include/str71x/irq.h
+++ b/nuttx/arch/arm/include/str71x/irq.h
@@ -45,7 +45,6 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 
 /************************************************************************************
  * Definitions