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

Remove the final vestiges of up_spiinitialize()

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-27 09:27:56 -06:00
parent 439620ab69
commit fd896330d8
5 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ChangeLog
View File

@ -11387,25 +11387,18 @@
* SPI: Rename the KL up_spiinitialize() to kl_spibus_intialize() (2016-01-26).
* SPI: Rename the Kinetis up_spiinitialize() to kinetis_spibus_intialize()
(2016-01-26).
* SPI: Rename the LPC31xx up_spiinitialize() to lpc31_spibus_intialize()
* SPI: Rename the LPC31xx up_spiinitialize() to lpc31_spibus_intialize(),
Rename the LPC17xx lpc17_spiinitialize() to lpc31_spibus_intialize(),
Rename the LPC43xx up_spiinitialize() to lpc43_spibus_intialize()
(2016-01-26).
* SPI: Rename the LPC17xx lpc17_spiinitialize() to lpc31_spibus_intialize()
(2016-01-26).
* SPI: Rename the LPC43xx up_spiinitialize() to lpc43_spibus_intialize()
(2016-01-26).
* SPI: Rename the AVR up_spiinitialize() to avr_spibus_intialize()
(2016-01-27).
* SPI: Rename the LPC2148 up_spiinitialize() to lpc214x_spibus_intialize()
(2016-01-27).
* SPI: Rename the Calypso up_spiinitialize() to calypso_spibus_intialize()
(2016-01-27).
* SPI: Rename the ez80 up_spiinitialize() to ez80_spibus_intialize()
(2016-01-27).
* SPI: Rename the STR71xx up_spiinitialize() to str71_spibus_intialize()
(2016-01-27).
* SPI: Rename the i.MX1 up_spiinitialize() to imx_spibus_intialize()
(2016-01-27).
* SPI: Rename the LPC2378 up_spiinitialize() to lpc23_spibus_intialize()
(2016-01-27).
* SPI: Rename the M9S12 up_spiinitialize() to hcs12_spibus_intialize()
(2016-01-27).
* SPI: Rename the AVR up_spiinitialize() to avr_spibus_intialize(),
Rename the LPC2148 up_spiinitialize() to lpc214x_spibus_intialize(),
Rename the Calypso up_spiinitialize() to calypso_spibus_intialize(),
Rename the ez80 up_spiinitialize() to ez80_spibus_intialize(),
Rename the STR71xx up_spiinitialize() to str71_spibus_intialize(),
Rename the i.MX1 up_spiinitialize() to imx_spibus_intialize(),
Rename the LPC2378 up_spiinitialize() to lpc23_spibus_intialize(),
Rename the M9S12 up_spiinitialize() to hcs12_spibus_intialize(),
Rename the x86 up_spiinitialize() to i486_spibus_intialize(),
Rename the z16f up_spiinitialize() to z16_spibus_intialize().
up_spiinitialize() has been completely eliminated. (2016-01-27).

2
arch

@ -1 +1 @@
Subproject commit a55bcb538ab7ea49c64c898f96d1b94cfb3e0aa8
Subproject commit b2139bdcb73ff4bacbbce121482285a7592d0bb9

5
drivers/mmcsd/mmcsd_spi.c
View File

@ -1903,8 +1903,9 @@ static void mmcsd_mediachanged(void *arg)
* slotno - The slot number to use. This is only meaningful for
* architectures that support multiple MMC/SD slots. This value must be
* in the range {0, ..., CONFIG_MMCSD_NSLOTS}.
* spi - And instance of an SPI interface obtained by called
* up_spiinitialize() with the appropriate port number (see spi.h)
* spi - And instance of an SPI interface obtained by called the
* approprite xyz_spibus_initialize() function for the MCU "xyz" with
* the appropriate port number.
*
****************************************************************************/

5
include/nuttx/mmcsd.h
View File

@ -92,8 +92,9 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev);
* slotno - The slot number to use. This is only meaningful for architectures
* that support multiple MMC/SD slots. This value must be in the range
* {0, ..., CONFIG_MMCSD_NSLOTS}.
* spi - And instance of an SPI interface obtained by called
* up_spiinitialize() with the appropriate port number (see spi.h)
* spi - And instance of an SPI interface obtained by called the
* approprite xyz_spibus_initialize() function for the MCU "xyz" with
* the appropriate port number.
*
****************************************************************************/

36
include/nuttx/spi/spi.h
View File

@ -479,42 +479,6 @@ extern "C"
#define EXTERN extern
#endif
/****************************************************************************
* Name: up_spiinitialize
*
* Description:
* Initialize the selected SPI port in master mode.
*
* This is a generic prototype for the SPI initialize logic. Specific
* architectures may support different SPI initialization functions if,
* for example, those architectures support multiple, incompatible SPI
* implementations. In any event, the prototype of those architecture-
* specific initialization functions should be the same as
* up_spiinitialize()
*
* As an example, the LPC17xx family supports an SPI block and several SSP
* blocks that may be programmed to support the SPI function. In this
* case, the LPC17xx architecture supports these two initialization
* functions:
*
* FAR struct spi_dev_s *lpc17_spiinitialize(int port);
* FAR struct spi_dev_s *lpc17_sspinitialize(int port);
*
* Another example would be the STM32 families that support both SPI
* blocks as well as USARTs that can be configured to perform the SPI
* function as well (the STM32 USARTs do not support SPI as of this
* writing).
*
* Input Parameter:
* Port number (for hardware that has multiple SPI interfaces)
*
* Returned Value:
* Valid SPI device structure reference on success; a NULL on failure
*
****************************************************************************/
FAR struct spi_dev_s *up_spiinitialize(int port);
#undef EXTERN
#if defined(__cplusplus)
}