diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-02 22:49:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-02 22:49:59 +0000 |
| commit | ff65a46c2824524b9366792ef46d9ab95a75f031 (patch) | |
| tree | c471bdd70d55d710517267ddcb08e46e65033aa0 | |
| parent | 17a999f9af875c16f1e50bc60e38840eba8e47e8 (diff) | |
| download | px4-nuttx-ff65a46c2824524b9366792ef46d9ab95a75f031.tar.gz px4-nuttx-ff65a46c2824524b9366792ef46d9ab95a75f031.tar.bz2 px4-nuttx-ff65a46c2824524b9366792ef46d9ab95a75f031.zip | |
Changes for clean STM32 compile with DEBUG on
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3332 42af7a65-404d-4744-a932-0658087f49c3
| -rwxr-xr-x | nuttx/arch/arm/src/sam3u/sam3u_hsmci.c | 2 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_gpio.c | 3 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_extcontext.c | 3 | ||||
| -rwxr-xr-x | nuttx/include/nuttx/sdio.h | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c index d41546058..1ab0dbc75 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c +++ b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c @@ -1560,7 +1560,7 @@ static void sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg /* 'OR' in Open Drain option */ #if 0 /* No MMC support */ - if ((cmd & MMCSD_OPENDRAN) != 0) + if ((cmd & MMCSD_OPENDRAIN) != 0) { regval |= HSMCI_CMDR_OPDCMD; } diff --git a/nuttx/arch/arm/src/stm32/stm32_gpio.c b/nuttx/arch/arm/src/stm32/stm32_gpio.c index d10c9328b..2e323f906 100755 --- a/nuttx/arch/arm/src/stm32/stm32_gpio.c +++ b/nuttx/arch/arm/src/stm32/stm32_gpio.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/stm32/stm32_gpio.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -47,6 +47,7 @@ #include "up_arch.h" #include "chip.h" #include "stm32_gpio.h" +#include "stm32_rcc.h" #include "stm32_internal.h" /**************************************************************************** diff --git a/nuttx/configs/stm3210e-eval/src/up_extcontext.c b/nuttx/configs/stm3210e-eval/src/up_extcontext.c index e96230a4b..346692cfc 100644 --- a/nuttx/configs/stm3210e-eval/src/up_extcontext.c +++ b/nuttx/configs/stm3210e-eval/src/up_extcontext.c @@ -2,7 +2,7 @@ * configs/stm3210e-eval/src/up_extcontext.c * arch/arm/src/board/up_extcontext.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011 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,7 @@ #include <nuttx/config.h> +#include <sys/types.h> #include <assert.h> #include <debug.h> diff --git a/nuttx/include/nuttx/sdio.h b/nuttx/include/nuttx/sdio.h index 65d44dbc6..232cdb3f3 100755 --- a/nuttx/include/nuttx/sdio.h +++ b/nuttx/include/nuttx/sdio.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/nuttx/sdio.h * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -240,7 +240,7 @@ /* Other options */ -#define MMCSD_OPENDRAN (1 << 15) +#define MMCSD_OPENDRAIN (1 << 15) /* Fully decorated MMC, SD, SDIO commands */ |