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@2352 42af7a65-404d-4744-a932-0658087f49c3

16 files changed, 62 insertions, 62 deletions

diff --git a/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c b/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c
index 63150f58f..96d48052d 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c
+++ b/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c
@@ -1,4 +1,4 @@
-#include <sys/types.h>

+#include <stdint.h>

 #include <nuttx/irq.h>

 #include "up_internal.h"

 

@@ -9,7 +9,7 @@ void os_start(void)
 	for (;;);

 }

 

-void up_assert_code(const ubyte *filename, int lineno, int errorcode)

+void up_assert_code(const uint8_t *filename, int lineno, int errorcode)

 {

 	up_lowputc('?');

 	up_lowputc('\n');

@@ -23,7 +23,7 @@ int irq_attach(int irq, xcpt_t isr)
 	for (;;);

 }

 

-uint32 *up_doirq(int irq, uint32 *regs)

+uint32 *up_doirq(int irq, uint32_t *regs)

 {

 	up_lowputc('I');

 	up_lowputc('\n');

diff --git a/nuttx/configs/stm3210e-eval/include/board.h b/nuttx/configs/stm3210e-eval/include/board.h
index 795054136..8ccb33d88 100755
--- a/nuttx/configs/stm3210e-eval/include/board.h
+++ b/nuttx/configs/stm3210e-eval/include/board.h
@@ -43,7 +43,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <sys/types.h>
+# include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
@@ -204,7 +204,7 @@ EXTERN void stm32_boardinitialize(void);
 
 #ifdef CONFIG_ARCH_BUTTONS
 EXTERN void up_buttoninit(void);
-EXTERN ubyte up_buttons(void);
+EXTERN uint8_t up_buttons(void);
 #endif
 
 #undef EXTERN
diff --git a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
index 867318043..c0c1f5406 100755
--- a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
+++ b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
@@ -43,7 +43,7 @@
 

 #include <nuttx/config.h>

 #include <nuttx/compiler.h>

-#include <sys/types.h>

+#include <stdint.h>

 

 /************************************************************************************

  * Definitions

@@ -111,14 +111,14 @@
 

 struct extmem_save_s

 {

-  uint32 gpiod_crl;

-  uint32 gpiod_crh;

-  uint32 gpioe_crl;

-  uint32 gpioe_crh;

-  uint32 gpiof_crl;

-  uint32 gpiof_crh;

-  uint32 gpiog_crl;

-  uint32 gpiog_crh;

+  uint32_t gpiod_crl;

+  uint32_t gpiod_crh;

+  uint32_t gpioe_crl;

+  uint32_t gpioe_crh;

+  uint32_t gpiof_crl;

+  uint32_t gpiof_crh;

+  uint32_t gpiog_crl;

+  uint32_t gpiog_crh;

 };

 

 /************************************************************************************

@@ -130,7 +130,7 @@ struct extmem_save_s
 /* GPIO configurations common to SRAM and NOR Flash */

 

 #define NCOMMON_CONFIG 37

-extern const uint16 g_commonconfig[NCOMMON_CONFIG];

+extern const uint16_t g_commonconfig[NCOMMON_CONFIG];

 

 /************************************************************************************

  * Public Functions

@@ -185,7 +185,7 @@ extern void stm32_extcontextrestore(struct extmem_save_s *restore);
  *

  ************************************************************************************/

 

-extern void stm32_extmemgpios(const uint16 *gpios, int ngpios);

+extern void stm32_extmemgpios(const uint16_t *gpios, int ngpios);

 

 /************************************************************************************

  * Name: stm32_enablefsmc

diff --git a/nuttx/configs/stm3210e-eval/src/up_boot.c b/nuttx/configs/stm3210e-eval/src/up_boot.c
index 527f9d919..8646fee5b 100755
--- a/nuttx/configs/stm3210e-eval/src/up_boot.c
+++ b/nuttx/configs/stm3210e-eval/src/up_boot.c
@@ -39,7 +39,6 @@
  ************************************************************************************/

 

 #include <nuttx/config.h>

-#include <sys/types.h>

 

 #include <debug.h>

 

diff --git a/nuttx/configs/stm3210e-eval/src/up_buttons.c b/nuttx/configs/stm3210e-eval/src/up_buttons.c
index 67b8537c7..99feacec5 100644
--- a/nuttx/configs/stm3210e-eval/src/up_buttons.c
+++ b/nuttx/configs/stm3210e-eval/src/up_buttons.c
@@ -38,7 +38,8 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
+
+#include <stdint.h>
 
 #include <arch/board/board.h>
 #include "stm3210e-internal.h"
@@ -53,7 +54,7 @@
  * Private Data
  ****************************************************************************/
 
-static const uint16 g_buttons[NUM_BUTTONS] =
+static const uint16_t g_buttons[NUM_BUTTONS] =
 {
   GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY,   GPIO_JOY_KEY,
   GPIO_JOY_DOWN,   GPIO_JOY_LEFT,   GPIO_JOY_RIGHT, GPIO_JOY_UP
@@ -89,9 +90,9 @@ void up_buttoninit(void)
  * Name: up_buttons
  ****************************************************************************/
 
-ubyte up_buttons(void)
+uint8_t up_buttons(void)
 {
-  ubyte ret = 0;
+  uint8_t ret = 0;
   int i;
 
   /* Check that state of each key */
diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectnor.c b/nuttx/configs/stm3210e-eval/src/up_deselectnor.c
index e0e3e4dbb..7450b8c72 100644
--- a/nuttx/configs/stm3210e-eval/src/up_deselectnor.c
+++ b/nuttx/configs/stm3210e-eval/src/up_deselectnor.c
@@ -40,7 +40,6 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
 #include <debug.h>
 
 #include "up_arch.h"
diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectsram.c b/nuttx/configs/stm3210e-eval/src/up_deselectsram.c
index b3cb877ba..51329eb15 100644
--- a/nuttx/configs/stm3210e-eval/src/up_deselectsram.c
+++ b/nuttx/configs/stm3210e-eval/src/up_deselectsram.c
@@ -40,7 +40,6 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
 #include <debug.h>
 
 #include "up_arch.h"
diff --git a/nuttx/configs/stm3210e-eval/src/up_extcontext.c b/nuttx/configs/stm3210e-eval/src/up_extcontext.c
index 05e6b267f..e96230a4b 100644
--- a/nuttx/configs/stm3210e-eval/src/up_extcontext.c
+++ b/nuttx/configs/stm3210e-eval/src/up_extcontext.c
@@ -40,7 +40,6 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
 #include <assert.h>
 #include <debug.h>
 
diff --git a/nuttx/configs/stm3210e-eval/src/up_extmem.c b/nuttx/configs/stm3210e-eval/src/up_extmem.c
index 88876c2ca..18c39e844 100644
--- a/nuttx/configs/stm3210e-eval/src/up_extmem.c
+++ b/nuttx/configs/stm3210e-eval/src/up_extmem.c
@@ -40,7 +40,7 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <assert.h>
 #include <debug.h>
 
@@ -95,7 +95,7 @@
 
 /* GPIO configurations common to SRAM and NOR Flash */
 
-const uint16 g_commonconfig[NCOMMON_CONFIG] =
+const uint16_t g_commonconfig[NCOMMON_CONFIG] =
 {
   /* A0... A18 */
 
@@ -123,13 +123,13 @@ const uint16 g_commonconfig[NCOMMON_CONFIG] =
 
 /* GPIO configurations unique to SRAM  */
 
-static const uint16 g_sramconfig[] =
+static const uint16_t g_sramconfig[] =
 {
   /* NE3, NBL0, NBL1,  */
 
   GPIO_NPS_NE3, GPIO_NPS_NBL0, GPIO_NPS_NBL1
 };
-#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16))
+#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16_t))
 
 /************************************************************************************
  * Private Functions
@@ -147,7 +147,7 @@ static const uint16 g_sramconfig[] =
  *
  ************************************************************************************/
 
-void stm32_extmemgpios(const uint16 *gpios, int ngpios)
+void stm32_extmemgpios(const uint16_t *gpios, int ngpios)
 {
   int i;
 
@@ -169,7 +169,7 @@ void stm32_extmemgpios(const uint16 *gpios, int ngpios)
 
 void stm32_enablefsmc(void)
 {
-  uint32 regval;
+  uint32_t regval;
 
   /* Enable AHB clocking to the FSMC */
 
@@ -188,7 +188,7 @@ void stm32_enablefsmc(void)
 
 void stm32_disablefsmc(void)
 {
-  uint32 regval;
+  uint32_t regval;
 
   /* Enable AHB clocking to the FSMC */
 
diff --git a/nuttx/configs/stm3210e-eval/src/up_leds.c b/nuttx/configs/stm3210e-eval/src/up_leds.c
index d6308d427..611a5c849 100755
--- a/nuttx/configs/stm3210e-eval/src/up_leds.c
+++ b/nuttx/configs/stm3210e-eval/src/up_leds.c
@@ -39,8 +39,9 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 
+#include <stdint.h>
+#include <stdbool.h>
 #include <debug.h>
 
 #include <arch/board/board.h>
@@ -135,7 +136,7 @@
  * Private Data
  ****************************************************************************/
 
-static const uint16 g_ledbits[8] =
+static const uint16_t g_ledbits[8] =
 {
   (LED_STARTED_ON_SETBITS       | LED_STARTED_ON_CLRBITS |
    LED_STARTED_OFF_SETBITS      | LED_STARTED_OFF_CLRBITS),
@@ -170,22 +171,22 @@ static inline void led_clrbits(unsigned int clrbits)
 {
   if ((clrbits & STM3210E_LED1) != 0)
     {
-      stm32_gpiowrite(GPIO_LED1, FALSE);
+      stm32_gpiowrite(GPIO_LED1, false);
     }
 
   if ((clrbits & STM3210E_LED2) != 0)
     {
-      stm32_gpiowrite(GPIO_LED2, FALSE);
+      stm32_gpiowrite(GPIO_LED2, false);
     }
 
   if ((clrbits & STM3210E_LED3) != 0)
     {
-      stm32_gpiowrite(GPIO_LED3, FALSE);
+      stm32_gpiowrite(GPIO_LED3, false);
     }
 
   if ((clrbits & STM3210E_LED4) != 0)
     {
-      stm32_gpiowrite(GPIO_LED4, FALSE);
+      stm32_gpiowrite(GPIO_LED4, false);
     }
 }
 
@@ -193,22 +194,22 @@ static inline void led_setbits(unsigned int setbits)
 {
   if ((setbits & STM3210E_LED1) != 0)
     {
-      stm32_gpiowrite(GPIO_LED1, TRUE);
+      stm32_gpiowrite(GPIO_LED1, true);
     }
 
   if ((setbits & STM3210E_LED2) != 0)
     {
-      stm32_gpiowrite(GPIO_LED2, TRUE);
+      stm32_gpiowrite(GPIO_LED2, true);
     }
 
   if ((setbits & STM3210E_LED3) != 0)
     {
-      stm32_gpiowrite(GPIO_LED3, TRUE);
+      stm32_gpiowrite(GPIO_LED3, true);
     }
 
   if ((setbits & STM3210E_LED4) != 0)
     {
-      stm32_gpiowrite(GPIO_LED4, TRUE);
+      stm32_gpiowrite(GPIO_LED4, true);
     }
 }
 
diff --git a/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c
index fe18f1c51..6c908951f 100755
--- a/nuttx/configs/stm3210e-eval/src/up_nsh.c
+++ b/nuttx/configs/stm3210e-eval/src/up_nsh.c
@@ -39,8 +39,8 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <debug.h>
 #include <errno.h>
@@ -207,7 +207,7 @@ int nsh_archinitialize(void)
    * the slot.
    */
 
-   sdio_mediachange(sdio, TRUE);
+   sdio_mediachange(sdio, true);
 #endif
   return OK;
 }
diff --git a/nuttx/configs/stm3210e-eval/src/up_selectnor.c b/nuttx/configs/stm3210e-eval/src/up_selectnor.c
index 0cc4be8dd..3c41b1c9f 100644
--- a/nuttx/configs/stm3210e-eval/src/up_selectnor.c
+++ b/nuttx/configs/stm3210e-eval/src/up_selectnor.c
@@ -40,7 +40,7 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <debug.h>
 
 #include "up_arch.h"
@@ -80,7 +80,7 @@
 
 /* GPIO configurations unique to NOR Flash  */
 
-static const uint16 g_norconfig[] =
+static const uint16_t g_norconfig[] =
 {
   /* A19... A22 */
 
@@ -90,7 +90,7 @@ static const uint16 g_norconfig[] =
 
   GPIO_NPS_NE2
 };
-#define NNOR_CONFIG (sizeof(g_norconfig)/sizeof(uint16))
+#define NNOR_CONFIG (sizeof(g_norconfig)/sizeof(uint16_t))
 
 /************************************************************************************
  * Private Functions
diff --git a/nuttx/configs/stm3210e-eval/src/up_selectsram.c b/nuttx/configs/stm3210e-eval/src/up_selectsram.c
index 5578b0713..0b3d2d495 100644
--- a/nuttx/configs/stm3210e-eval/src/up_selectsram.c
+++ b/nuttx/configs/stm3210e-eval/src/up_selectsram.c
@@ -40,7 +40,7 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <debug.h>
 
 #include "up_arch.h"
@@ -88,13 +88,13 @@
 
 /* GPIO configurations unique to SRAM  */
 
-static const uint16 g_sramconfig[] =
+static const uint16_t g_sramconfig[] =
 {
   /* NE3, NBL0, NBL1,  */
 
   GPIO_NPS_NE3, GPIO_NPS_NBL0, GPIO_NPS_NBL1
 };
-#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16))
+#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16_t))
 
 /************************************************************************************
  * Private Functions
diff --git a/nuttx/configs/stm3210e-eval/src/up_spi.c b/nuttx/configs/stm3210e-eval/src/up_spi.c
index 3c2c3e236..3fc6567de 100755
--- a/nuttx/configs/stm3210e-eval/src/up_spi.c
+++ b/nuttx/configs/stm3210e-eval/src/up_spi.c
@@ -39,8 +39,9 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 
+#include <stdint.h>
+#include <stdbool.h>
 #include <debug.h>
 
 #include <nuttx/spi.h>
@@ -132,7 +133,7 @@ void weak_function stm32_spiinitialize(void)
  ****************************************************************************/
 
 #ifdef CONFIG_STM32_SPI1
-void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
@@ -144,31 +145,31 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean s
   }
 }
 
-ubyte stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return SPI_STATUS_PRESENT;
 }
 #endif
 
 #ifdef CONFIG_STM32_SPI2
-void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-ubyte stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return SPI_STATUS_PRESENT;
 }
 #endif
 
 #ifdef CONFIG_STM32_SPI3
-void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-ubyte stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return SPI_STATUS_PRESENT;
 }
diff --git a/nuttx/configs/stm3210e-eval/src/up_usbdev.c b/nuttx/configs/stm3210e-eval/src/up_usbdev.c
index d13318de8..b1ff79a6a 100644
--- a/nuttx/configs/stm3210e-eval/src/up_usbdev.c
+++ b/nuttx/configs/stm3210e-eval/src/up_usbdev.c
@@ -39,8 +39,10 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include <debug.h>
 
 #include <nuttx/usbdev.h>
@@ -89,9 +91,9 @@ void stm32_usbinitialize(void)
  *
  ************************************************************************************/
 
-int stm32_usbpullup(FAR struct usbdev_s *dev,  boolean enable)
+int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 {
-  usbtrace(TRACE_DEVPULLUP, (uint16)enable);
+  usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
   stm32_gpiowrite(GPIO_USB_PULLUP, !enable);
   return OK;
 }
@@ -107,7 +109,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev,  boolean enable)
  *
  ************************************************************************************/
 
-void stm32_usbsuspend(FAR struct usbdev_s *dev, boolean resume)
+void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
   ulldbg("resume: %d\n", resume);
 }
diff --git a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c b/nuttx/configs/stm3210e-eval/src/up_usbstrg.c
index 72805b8d8..add9a7ed9 100755
--- a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c
+++ b/nuttx/configs/stm3210e-eval/src/up_usbstrg.c
@@ -40,7 +40,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/types.h>
 
 #include <stdio.h>
 #include <debug.h>
@@ -147,7 +146,7 @@ int usbstrg_archinitialize(void)
    * the slot.
    */
 
-   sdio_mediachange(sdio, TRUE);
+   sdio_mediachange(sdio, true);
    return OK;
 }