diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-15 20:56:22 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-15 20:56:22 +0000 |
commit | 1375e4917dc9f9ec7ad488fa83c23d94a1053de9 (patch) | |
tree | cc9f00d272faed8cca17c115086ef4f542beec34 /nuttx/configs/eagle100 | |
parent | 08b2e5a5495fb08277274eaaf91c21069e0fbadf (diff) | |
download | px4-nuttx-1375e4917dc9f9ec7ad488fa83c23d94a1053de9.tar.gz px4-nuttx-1375e4917dc9f9ec7ad488fa83c23d94a1053de9.tar.bz2 px4-nuttx-1375e4917dc9f9ec7ad488fa83c23d94a1053de9.zip |
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
Diffstat (limited to 'nuttx/configs/eagle100')
-rw-r--r-- | nuttx/configs/eagle100/include/board.h | 3 | ||||
-rw-r--r-- | nuttx/configs/eagle100/src/eagle100_internal.h | 1 | ||||
-rw-r--r-- | nuttx/configs/eagle100/src/up_boot.c | 1 | ||||
-rw-r--r-- | nuttx/configs/eagle100/src/up_ethernet.c | 6 | ||||
-rw-r--r-- | nuttx/configs/eagle100/src/up_leds.c | 8 | ||||
-rw-r--r-- | nuttx/configs/eagle100/src/up_nsh.c | 1 | ||||
-rw-r--r-- | nuttx/configs/eagle100/src/up_ssi.c | 7 |
7 files changed, 11 insertions, 16 deletions
diff --git a/nuttx/configs/eagle100/include/board.h b/nuttx/configs/eagle100/include/board.h index febc93038..09d695938 100644 --- a/nuttx/configs/eagle100/include/board.h +++ b/nuttx/configs/eagle100/include/board.h @@ -41,9 +41,6 @@ * Included Files ************************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif #include "lm3s_internal.h" /************************************************************************************ diff --git a/nuttx/configs/eagle100/src/eagle100_internal.h b/nuttx/configs/eagle100/src/eagle100_internal.h index e2ff65fd3..67eec836d 100644 --- a/nuttx/configs/eagle100/src/eagle100_internal.h +++ b/nuttx/configs/eagle100/src/eagle100_internal.h @@ -43,7 +43,6 @@ #include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <sys/types.h>
/************************************************************************************
* Definitions
diff --git a/nuttx/configs/eagle100/src/up_boot.c b/nuttx/configs/eagle100/src/up_boot.c index 175e8e924..a545f7e0d 100644 --- a/nuttx/configs/eagle100/src/up_boot.c +++ b/nuttx/configs/eagle100/src/up_boot.c @@ -39,7 +39,6 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include <debug.h>
diff --git a/nuttx/configs/eagle100/src/up_ethernet.c b/nuttx/configs/eagle100/src/up_ethernet.c index d8ee03f8a..54145ff58 100644 --- a/nuttx/configs/eagle100/src/up_ethernet.c +++ b/nuttx/configs/eagle100/src/up_ethernet.c @@ -39,8 +39,8 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
+#include <stdint.h>
#include <debug.h>
#include <assert.h>
@@ -75,8 +75,8 @@ #ifdef CONFIG_LM3S_BOARDMAC
void lm3s_ethernetmac(struct ether_addr *ethaddr)
{
- uint32 user0;
- uint32 user1;
+ uint32_t user0;
+ uint32_t user1;
/* Get the current value of the user registers */
diff --git a/nuttx/configs/eagle100/src/up_leds.c b/nuttx/configs/eagle100/src/up_leds.c index f382e63a3..c080bf674 100644 --- a/nuttx/configs/eagle100/src/up_leds.c +++ b/nuttx/configs/eagle100/src/up_leds.c @@ -39,8 +39,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> #include <debug.h> #include <arch/board/board.h> @@ -89,7 +89,7 @@ * Public Functions ****************************************************************************/ -static boolean g_nest; +static uint8_t g_nest; /**************************************************************************** * Name: up_ledinit @@ -129,7 +129,7 @@ void up_ledon(int led) case LED_IRQSENABLED: case LED_STACKCREATED: led_dumpgpio("up_ledon: before lm3s_gpiowrite()"); - lm3s_gpiowrite(LED_GPIO, FALSE); + lm3s_gpiowrite(LED_GPIO, false); led_dumpgpio("up_ledon: after lm3s_gpiowrite()"); break; } @@ -157,7 +157,7 @@ void up_ledoff(int led) if (--g_nest <= 0) { led_dumpgpio("up_ledoff: before lm3s_gpiowrite()"); - lm3s_gpiowrite(LED_GPIO, TRUE); + lm3s_gpiowrite(LED_GPIO, true); led_dumpgpio("up_ledoff: after lm3s_gpiowrite()"); } break; diff --git a/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c index 0cb36ac10..184523c92 100644 --- a/nuttx/configs/eagle100/src/up_nsh.c +++ b/nuttx/configs/eagle100/src/up_nsh.c @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <stdio.h> #include <debug.h> diff --git a/nuttx/configs/eagle100/src/up_ssi.c b/nuttx/configs/eagle100/src/up_ssi.c index 217e4b3bc..3ee773f59 100644 --- a/nuttx/configs/eagle100/src/up_ssi.c +++ b/nuttx/configs/eagle100/src/up_ssi.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>
@@ -129,7 +130,7 @@ void weak_function lm3s_ssiinitialize(void) *
****************************************************************************/
-void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD)
@@ -142,7 +143,7 @@ void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean sel }
}
-ubyte lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{
#warning "Need to check schematic"
ssidbg("Returning SPI_STATUS_PRESENT\n");
|