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

More missed SPI initialization function renaming; clean up some warnings

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-28 09:53:22 -06:00
parent c1a7a20263
commit c9137abe72
17 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/dk-tm4c129x/src/dk-tm4c129x.h
View File

@ -138,14 +138,14 @@
#ifndef __ASSEMBLY__
/************************************************************************************
* Name: tm4c_ssiinitialize
* Name: tm4c_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the DK-TM4C129X.
*
************************************************************************************/
void weak_function tm4c_ssiinitialize(void);
void weak_function tm4c_spidev_initialize(void);
/****************************************************************************
* Name: tm4c_led_initialize

6
configs/dk-tm4c129x/src/tm4c_boot.c
View File

@ -73,15 +73,15 @@
void tiva_boardinitialize(void)
{
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* tm4c_ssiinitialize() has been brought into the link.
* tm4c_spidev_initialize() has been brought into the link.
*/
/* The DK-TM4C129X microSD CS and OLED are on SSI0 */
#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
if (tm4c_ssiinitialize)
if (tm4c_spidev_initialize)
{
tm4c_ssiinitialize();
tm4c_spidev_initialize();
}
#endif

4
configs/dk-tm4c129x/src/tm4c_ssi.c
View File

@ -86,14 +86,14 @@
************************************************************************************/
/************************************************************************************
* Name: tm4c_ssiinitialize
* Name: tm4c_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the DK-TM4C129X.
*
************************************************************************************/
void weak_function tm4c_ssiinitialize(void)
void weak_function tm4c_spidev_initialize(void)
{
}

4
configs/eagle100/src/eagle100.h
View File

@ -77,14 +77,14 @@
#ifndef __ASSEMBLY__
/************************************************************************************
* Name: lm_ssiinitialize
* Name: lm_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Eagle100 board.
*
************************************************************************************/
void weak_function lm_ssiinitialize(void);
void weak_function lm_spidev_initialize(void);
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_EAGLE100_SRC_EAGLE100_H */

4
configs/eagle100/src/lm_nsh.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* config/eagle100/src/lm_nsh.c
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -47,6 +47,8 @@
#include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h>
#include "tiva_ssi.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/

4
configs/eagle100/src/lm_ssi.c
View File

@ -85,10 +85,6 @@
# define ssi_dumpgpio(m)
#endif
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/

4
configs/ekk-lm3s9b96/src/ekk-lm3s9b96.h
View File

@ -98,14 +98,14 @@
#ifndef __ASSEMBLY__
/************************************************************************************
* Name: lm_ssiinitialize
* Name: lm_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.
*
************************************************************************************/
extern void weak_function lm_ssiinitialize(void);
extern void weak_function lm_spidev_initialize(void);
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_EKK_LM3S9B96_SRC_EKKLM3S9B96_H */

4
configs/lm3s6432-s2e/src/lm3s6432-s2e.h
View File

@ -110,14 +110,14 @@
#ifndef __ASSEMBLY__
/************************************************************************************
* Name: lm_ssiinitialize
* Name: lm_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the MDL-S2E.
*
************************************************************************************/
void weak_function lm_ssiinitialize(void);
void weak_function lm_spidev_initialize(void);
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_LM3S6432_S2E_SRC_LM3S6432S2E_H */

6
configs/lm3s6432-s2e/src/lm_boot.c
View File

@ -79,13 +79,13 @@
void tiva_boardinitialize(void)
{
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* lm_ssiinitialize() has been brought into the link.
* lm_spidev_initialize() has been brought into the link.
*/
#if defined(CONFIG_TIVA_SSI0)
if (lm_ssiinitialize)
if (lm_spidev_initialize)
{
lm_ssiinitialize();
lm_spidev_initialize();
}
#endif

2
configs/lm4f120-launchpad/src/lm4f_boot.c
View File

@ -73,7 +73,7 @@
void tiva_boardinitialize(void)
{
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* lm_ssiinitialize() has been brought into the link.
* lm_spidev_initialize() has been brought into the link.
*/
/* The LM4F LaunchPad microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */

2
configs/mcu123-lpc214x/src/lpc2148_nsh.c
View File

@ -47,6 +47,8 @@
#include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h>
#include "lpc214x_spi.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/

4
configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
View File

@ -182,14 +182,14 @@
#ifndef __ASSEMBLY__
/************************************************************************************
* Name: tm4c_ssiinitialize
* Name: tm4c_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the TM4C123G LaunchPad.
*
************************************************************************************/
void weak_function tm4c_ssiinitialize(void);
void weak_function tm4c_spidev_initialize(void);
/****************************************************************************
* Name: tm4c_led_initialize

6
configs/tm4c123g-launchpad/src/tm4c_boot.c
View File

@ -73,15 +73,15 @@
void tiva_boardinitialize(void)
{
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* tm4c_ssiinitialize() has been brought into the link.
* tm4c_spidev_initialize() has been brought into the link.
*/
/* The TM4C123G LaunchPad microSD CS and OLED are on SSI0 */
#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
if (tm4c_ssiinitialize)
if (tm4c_spidev_initialize)
{
tm4c_ssiinitialize();
tm4c_spidev_initialize();
}
#endif

4
configs/tm4c123g-launchpad/src/tm4c_ssi.c
View File

@ -86,14 +86,14 @@
************************************************************************************/
/************************************************************************************
* Name: tm4c_ssiinitialize
* Name: tm4c_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the TM4C123G LaunchPad.
*
************************************************************************************/
void weak_function tm4c_ssiinitialize(void)
void weak_function tm4c_spidev_initialize(void)
{
}

4
configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
View File

@ -127,14 +127,14 @@
#ifndef __ASSEMBLY__
/************************************************************************************
* Name: tm4c_ssiinitialize
* Name: tm4c_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the EK-TM4C1294XL.
*
************************************************************************************/
void weak_function tm4c_ssiinitialize(void);
void weak_function tm4c_spidev_initialize(void);
/****************************************************************************
* Name: tm4c_led_initialize

6
configs/tm4c1294-launchpad/src/tm4c_boot.c
View File

@ -73,15 +73,15 @@
void tiva_boardinitialize(void)
{
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* tm4c_ssiinitialize() has been brought into the link.
* tm4c_spidev_initialize() has been brought into the link.
*/
/* The DK-TM4C129X microSD CS and OLED are on SSI0 */
#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
if (tm4c_ssiinitialize)
if (tm4c_spidev_initialize)
{
tm4c_ssiinitialize();
tm4c_spidev_initialize();
}
#endif

1
configs/zp214xpa/src/lpc2148_ug2864ambag01.c
View File

@ -49,6 +49,7 @@
#include "up_arch.h"
#include "chip.h"
#include "lpc214x_pinsel.h"
#include "lpc214x_spi.h"
#ifdef CONFIG_LCD_UG2864AMBAG01