Skip to content
Snippets Groups Projects
Commit 43d73012 authored by Gregory Nutt's avatar Gregory Nutt
Browse files

Trivial changes from review of last PR

parent 109a6861
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 73 deletions
configs/olimex-stm32-e407/nsh/Make.defs
+ 1
− 2
View file @ 43d73012
############################################################################
# configs/olimex-stm32-e407/nsh/Make.defs
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
......@@ -110,4 +110,3 @@ HOSTCC = gcc
HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS =
configs/olimex-stm32-e407/scripts/ld.script
+ 1
− 1
View file @ 43d73012
/****************************************************************************
* configs/olimex-stm32-h405/scripts/ld.script
* configs/olimex-stm32-e407/scripts/ld.script
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/olimex-stm32-e407/src/olimex-stm32-e407.h
+ 14
− 15
View file @ 43d73012
......@@ -162,7 +162,6 @@
GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN1)
#endif
/* USB OTG HS - miniUSB connector
*
* PB13 OTG_HS_VBUS VBUS sensing (also connected to the green LED)
......@@ -180,28 +179,28 @@
# define GPIO_OTGHS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11)
#endif
/****************************************************************************************************
/****************************************************************************
* Public Types
****************************************************************************************************/
****************************************************************************/
/****************************************************************************************************
/****************************************************************************
* Public data
****************************************************************************************************/
****************************************************************************/
#ifndef __ASSEMBLY__
/************************************************************************************
/****************************************************************************
* Public Functions
************************************************************************************/
****************************************************************************/
/************************************************************************************
/****************************************************************************
* Name: stm32_usbinitialize
*
* Description:
* Called from stm32_usbinitialize very early in initialization to setup USB-related
* GPIO pins for the Olimex-STM32-H405 board.
* Called from stm32_usbinitialize very early in initialization to setup
* USB-related GPIO pins for the Olimex-STM32-H405 board.
*
************************************************************************************/
****************************************************************************/
#if defined(CONFIG_STM32_OTGFS) || defined(CONFIG_STM32_OTGHS)
void weak_function stm32_usbinitialize(void);
......@@ -219,25 +218,25 @@ void weak_function stm32_usbinitialize(void);
int stm32_sdio_initialize(void);
#endif
/************************************************************************************
/****************************************************************************
* Name: stm32_adc_initialize
*
* Description:
* Called at application startup time to initialize the ADC functionality.
*
************************************************************************************/
****************************************************************************/
#ifdef CONFIG_ADC
int stm32_adc_initialize(void);
#endif
/************************************************************************************
/****************************************************************************
* Name: stm32_can_initialize
*
* Description:
* Called at application startup time to initialize the CAN functionality.
*
************************************************************************************/
****************************************************************************/
#if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
int stm32_can_initialize(void);
......
configs/olimex-stm32-e407/src/stm32_appinit.c
+ 0
− 1
View file @ 43d73012
......@@ -159,7 +159,6 @@ static void stm32_i2ctool(void)
# define stm32_i2ctool()
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
......
configs/olimex-stm32-e407/src/stm32_autoleds.c
+ 0
− 4
View file @ 43d73012
......@@ -54,10 +54,6 @@
#ifdef CONFIG_ARCH_LEDS
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
......
configs/olimex-stm32-e407/src/stm32_boot.c
+ 0
− 2
View file @ 43d73012
......@@ -91,8 +91,6 @@ void stm32_boardinitialize(void)
board_button_initialize();
#endif
}
/****************************************************************************
......
configs/olimex-stm32-e407/src/stm32_buttons.c
+ 24
− 23
View file @ 43d73012
/****************************************************************************
* configs/olimex-stm32-e407/src/stm32_buttons.c
*
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
......@@ -53,8 +53,8 @@
* Private Functions
****************************************************************************/
/* Pin configuration for each Olimex-STM32-H405 button. This array is indexed by
* the BUTTON_* definitions in board.h
/* Pin configuration for each Olimex-STM32-H405 button. This array is
* indexed by the BUTTON_* definitions in board.h
*/
static const uint32_t g_buttons[NUM_BUTTONS] =
......@@ -70,10 +70,10 @@ static const uint32_t g_buttons[NUM_BUTTONS] =
* Name: board_button_initialize
*
* Description:
* board_button_initialize() must be called to initialize button resources. After
* that, board_buttons() may be called to collect the current state of all
* buttons or board_button_irq() may be called to register button interrupt
* handlers.
* board_button_initialize() must be called to initialize button resources.
* After that, board_buttons() may be called to collect the current state
* of all buttons or board_button_irq() may be called to register button
* interrupt handlers.
*
****************************************************************************/
......@@ -109,28 +109,28 @@ uint8_t board_buttons(void)
return ret;
}
/************************************************************************************
/****************************************************************************
* Button support.
*
* Description:
* board_button_initialize() must be called to initialize button resources. After
* that, board_buttons() may be called to collect the current state of all
* buttons or board_button_irq() may be called to register button interrupt
* handlers.
* board_button_initialize() must be called to initialize button resources.
* After that, board_buttons() may be called to collect the current state
* of all buttons or board_button_irq() may be called to register button
* interrupt handlers.
*
* After board_button_initialize() has been called, board_buttons() may be called to
* collect the state of all buttons. board_buttons() returns an 8-bit bit set
* with each bit associated with a button. See the BUTTON_*_BIT
* After board_button_initialize() has been called, board_buttons() may be
* called to collect the state of all buttons. board_buttons() returns an
* 8-bit bit set with each bit associated with a button. See the BUTTON_*_BIT
* definitions in board.h for the meaning of each bit.
*
* board_button_irq() may be called to register an interrupt handler that will
* be called when a button is depressed or released. The ID value is a
* button enumeration value that uniquely identifies a button resource. See the
* BUTTON_* definitions in board.h for the meaning of enumeration
* value. The previous interrupt handler address is returned (so that it may
* restored, if so desired).
* board_button_irq() may be called to register an interrupt handler that
* will be called when a button is depressed or released. The ID value is
* a button enumeration value that uniquely identifies a button resource.
* See the BUTTON_* definitions in board.h for the meaning of enumeration
* value. The previous interrupt handler address is returned (so that it
* may restored, if so desired).
*
************************************************************************************/
****************************************************************************/
#ifdef CONFIG_ARCH_IRQBUTTONS
xcpt_t board_button_irq(int id, xcpt_t irqhandler)
......@@ -141,7 +141,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
{
oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
oldhandler =
stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
}
return oldhandler;
......
configs/olimex-stm32-e407/src/stm32_can.c
+ 2
− 2
View file @ 43d73012
......@@ -83,13 +83,13 @@ int board_can_initialize(void)
return stm32_can_initialize();
}
/****************************************************************************************************
/************************************************************************************
* Name: stm32_can_initialize
*
* Description:
* Called at application startup time to initialize the CAN functionality.
*
****************************************************************************************************/
************************************************************************************/
int stm32_can_initialize(void)
{
......
configs/olimex-stm32-e407/src/stm32_usb.c
+ 1
− 1
View file @ 43d73012
/************************************************************************************
* configs/stm32f4discovery/src/stm32_usb.c
*
* Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2012-2013, 2015-2916 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
......
configs/olimex-stm32-h407/scripts/ld.script
+ 1
− 1
View file @ 43d73012
/****************************************************************************
* configs/olimex-stm32-h405/scripts/ld.script
* configs/olimex-stm32-h407/scripts/ld.script
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/olimex-stm32-h407/src/stm32_buttons.c
+ 19
− 19
View file @ 43d73012
......@@ -70,10 +70,10 @@ static const uint32_t g_buttons[NUM_BUTTONS] =
* Name: board_button_initialize
*
* Description:
* board_button_initialize() must be called to initialize button resources. After
* that, board_buttons() may be called to collect the current state of all
* buttons or board_button_irq() may be called to register button interrupt
* handlers.
* board_button_initialize() must be called to initialize button resources.
* After that, board_buttons() may be called to collect the current state
* of all buttons or board_button_irq() may be called to register button
* interrupt handlers.
*
****************************************************************************/
......@@ -109,28 +109,28 @@ uint8_t board_buttons(void)
return ret;
}
/************************************************************************************
/****************************************************************************
* Button support.
*
* Description:
* board_button_initialize() must be called to initialize button resources. After
* that, board_buttons() may be called to collect the current state of all
* buttons or board_button_irq() may be called to register button interrupt
* handlers.
* board_button_initialize() must be called to initialize button resources.
* After that, board_buttons() may be called to collect the current state
* of all buttons or board_button_irq() may be called to register button
* interrupt handlers.
*
* After board_button_initialize() has been called, board_buttons() may be called to
* collect the state of all buttons. board_buttons() returns an 8-bit bit set
* with each bit associated with a button. See the BUTTON_*_BIT
* After board_button_initialize() has been called, board_buttons() may be
* called to collect the state of all buttons. board_buttons() returns an
* 8-bit bit set with each bit associated with a button. See the BUTTON_*_BIT
* definitions in board.h for the meaning of each bit.
*
* board_button_irq() may be called to register an interrupt handler that will
* be called when a button is depressed or released. The ID value is a
* button enumeration value that uniquely identifies a button resource. See the
* BUTTON_* definitions in board.h for the meaning of enumeration
* value. The previous interrupt handler address is returned (so that it may
* restored, if so desired).
* board_button_irq() may be called to register an interrupt handler that
* will be called when a button is depressed or released. The ID value is
* a button enumeration value that uniquely identifies a button resource.
* See the BUTTON_* definitions in board.h for the meaning of enumeration
* value. The previous interrupt handler address is returned (so that it
* may restored, if so desired).
*
************************************************************************************/
****************************************************************************/
#ifdef CONFIG_ARCH_IRQBUTTONS
xcpt_t board_button_irq(int id, xcpt_t irqhandler)
......
configs/olimex-stm32-h407/src/stm32_can.c
+ 2
− 2
View file @ 43d73012
......@@ -83,13 +83,13 @@ int board_can_initialize(void)
return stm32_can_initialize();
}
/****************************************************************************************************
/************************************************************************************
* Name: stm32_can_initialize
*
* Description:
* Called at application startup time to initialize the CAN functionality.
*
****************************************************************************************************/
************************************************************************************/
int stm32_can_initialize(void)
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment