sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in david_s5/nuttx/upstream_nucleo-144 (pull request #82)

Browse Source 
Upstream_nucleo 144
This commit is contained in:
Gregory Nutt 2016-06-28 16:56:14 -06:00
commit 8323e97201
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32f7/stm32_bbsram.c
View File

@ -756,7 +756,7 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
memset(g_bbsram, 0, sizeof(g_bbsram));
/* Clocking for the PWR block must be provided. However, this is done
* unconditionally in stm32f40xxx_rcc.c on power up. This done
* unconditionally in stm32f7xxxx_rcc.c on power up. This done
* unconditionally because the PWR block is also needed to set the
* internal voltage regulator for maximum performance.
*/

4
arch/arm/src/stm32f7/stm32_dma.c
View File

@ -521,9 +521,9 @@ void weak_function up_dmainitialize(void)
* version. Feel free to do that if that is what you need.
*
* Input parameter:
* dmamap - Identifies the stream/channel resource. For the STM32 F4, this
* dmamap - Identifies the stream/channel resource. For the STM32 F7, this
* is a bit-encoded value as provided by the DMAMAP_* definitions
* in chip/stm32f40xxx_dma.h
* in chip/stm32f7xxxxxxx_dma.h
*
* Returned Value:
* Provided that 'dmamap' is valid, this function ALWAYS returns a non-NULL,

10
arch/arm/src/stm32f7/stm32_dma.h
View File

@ -62,8 +62,8 @@
* Public Types
************************************************************************************/
/* DMA_HANDLE provides an opaque are reference that can be used to represent a DMA
* channel (F1) or a DMA stream (F4).
/* DMA_HANDLE Provides an opaque are reference that can be used to represent a DMA
* a DMA stream.
*/
typedef FAR void *DMA_HANDLE;
@ -137,10 +137,8 @@ extern "C"
*
* Input parameter:
* chan - Identifies the stream/channel resource
* For the STM32 F1, this is simply the channel number as provided by
* the DMACHAN_* definitions in chip/stm32f10xxx_dma.h.
* For the STM32 F4, this is a bit encoded value as provided by the
* the DMAMAP_* definitions in chip/stm32f40xxx_dma.h
* For the STM32 F7, this is a bit encoded value as provided by the
* the DMAMAP_* definitions in chip/stm32f7xxxxxxx_dma.h
*
* Returned Value:
* Provided that 'chan' is valid, this function ALWAYS returns a non-NULL,

4
arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
View File

@ -2,8 +2,8 @@
* arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
*
* Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* David Sidrane <david_s5@nscdg.com>
* Authors: Gregory Nutt <gnutt@nuttx.org>
* David Sidrane <david_s5@nscdg.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions

4
configs/nucleo-144/src/stm32_buttons.c
View File

@ -40,9 +40,13 @@
#include <nuttx/config.h>
#include <stddef.h>
#include <nuttx/irq.h>
#include <nuttx/board.h>
#include <arch/board/board.h>
#include "stm32_gpio.h"
#include "nucleo-144.h"