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

For Kinetis MCUs, rename up_spiinitialize to kinetis_spibus_initialize

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-26 16:25:44 -06:00
parent 77cb9f1729
commit 54730e55db
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/kwikstik-k40/src/k40_boot.c
View File

@ -72,13 +72,13 @@
void kinetis_boardinitialize(void) void kinetis_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* kinetis_spiinitialize() has been brought into the link. * kinetis_spidev_initialize() has been brought into the link.
*/ */
#if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2) #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
if (kinetis_spiinitialize) if (kinetis_spidev_initialize)
{ {
kinetis_spiinitialize(); kinetis_spidev_initialize();
} }
#endif #endif

10
configs/kwikstik-k40/src/k40_spi.c
View File

@ -81,14 +81,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: kinetis_spiinitialize * Name: kinetis_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the KwikStik-K40 board. * Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function kinetis_spiinitialize(void) void weak_function kinetis_spidev_initialize(void)
{ {
# warning "Missing logic" # warning "Missing logic"
} }
@ -100,7 +100,7 @@ void weak_function kinetis_spiinitialize(void)
* The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be * The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
* provided by board-specific logic. They are implementations of the select * provided by board-specific logic. They are implementations of the select
* and status methods of the SPI interface defined by struct spi_ops_s (see * and status methods of the SPI interface defined by struct spi_ops_s (see
* include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * include/nuttx/spi/spi.h). All other methods (including kinetis_spibus_initialize())
* are provided by common Kinetis logic. To use this common SPI logic on your * are provided by common Kinetis logic. To use this common SPI logic on your
* board: * board:
* *
@ -109,9 +109,9 @@ void weak_function kinetis_spiinitialize(void)
* 2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your * 2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your
* board-specific logic. These functions will perform chip selection and * board-specific logic. These functions will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 3. Add a calls to up_spiinitialize() in your low level application * 3. Add a calls to kinetis_spibus_initialize() in your low level application
* initialization logic * initialization logic
* 4. The handle returned by up_spiinitialize() may then be used to bind the * 4. The handle returned by kinetis_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

4
configs/kwikstik-k40/src/kwikstik-k40.h
View File

@ -160,14 +160,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: kinetis_spiinitialize * Name: kinetis_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the KwikStik-K40 board. * Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
* *
************************************************************************************/ ************************************************************************************/
extern void weak_function kinetis_spiinitialize(void); extern void weak_function kinetis_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: kinetis_usbinitialize * Name: kinetis_usbinitialize

6
configs/teensy-3.x/src/k20_boot.c
View File

@ -73,12 +73,12 @@ void kinetis_boardinitialize(void)
{ {
#if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2) #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* kinetis_spiinitialize() has been brought into the link. * kinetis_spidev_initialize() has been brought into the link.
*/ */
if (kinetis_spiinitialize) if (kinetis_spidev_initialize)
{ {
kinetis_spiinitialize(); kinetis_spidev_initialize();
} }
#endif #endif

10
configs/teensy-3.x/src/k20_spi.c
View File

@ -81,14 +81,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: kinetis_spiinitialize * Name: kinetis_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the KwikStik-K40 board. * Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function kinetis_spiinitialize(void) void weak_function kinetis_spidev_initialize(void)
{ {
# warning "Missing logic" # warning "Missing logic"
} }
@ -100,7 +100,7 @@ void weak_function kinetis_spiinitialize(void)
* The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be * The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
* provided by board-specific logic. They are implementations of the select * provided by board-specific logic. They are implementations of the select
* and status methods of the SPI interface defined by struct spi_ops_s (see * and status methods of the SPI interface defined by struct spi_ops_s (see
* include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * include/nuttx/spi/spi.h). All other methods (including kinetis_spibus_initialize())
* are provided by common Kinetis logic. To use this common SPI logic on your * are provided by common Kinetis logic. To use this common SPI logic on your
* board: * board:
* *
@ -109,9 +109,9 @@ void weak_function kinetis_spiinitialize(void)
* 2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your * 2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your
* board-specific logic. These functions will perform chip selection and * board-specific logic. These functions will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 3. Add a calls to up_spiinitialize() in your low level application * 3. Add a calls to kinetis_spibus_initialize() in your low level application
* initialization logic * initialization logic
* 4. The handle returned by up_spiinitialize() may then be used to bind the * 4. The handle returned by kinetis_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

4
configs/teensy-3.x/src/teensy-3x.h
View File

@ -83,14 +83,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: kinetis_spiinitialize * Name: kinetis_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the KwikStik-K40 board. * Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
* *
************************************************************************************/ ************************************************************************************/
extern void weak_function kinetis_spiinitialize(void); extern void weak_function kinetis_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: kinetis_usbinitialize * Name: kinetis_usbinitialize

6
configs/twr-k60n512/src/k60_boot.c
View File

@ -72,13 +72,13 @@
void kinetis_boardinitialize(void) void kinetis_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* kinetis_spiinitialize() has been brought into the link. * kinetis_spidev_initialize() has been brought into the link.
*/ */
#if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2) #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
if (kinetis_spiinitialize) if (kinetis_spidev_initialize)
{ {
kinetis_spiinitialize(); kinetis_spidev_initialize();
} }
#endif #endif

10
configs/twr-k60n512/src/k60_spi.c
View File

@ -81,14 +81,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: kinetis_spiinitialize * Name: kinetis_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the TWR-K60N512 board. * Called to configure SPI chip select GPIO pins for the TWR-K60N512 board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function kinetis_spiinitialize(void) void weak_function kinetis_spidev_initialize(void)
{ {
# warning "Missing logic" # warning "Missing logic"
} }
@ -100,7 +100,7 @@ void weak_function kinetis_spiinitialize(void)
* The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be * The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
* provided by board-specific logic. They are implementations of the select * provided by board-specific logic. They are implementations of the select
* and status methods of the SPI interface defined by struct spi_ops_s (see * and status methods of the SPI interface defined by struct spi_ops_s (see
* include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * include/nuttx/spi/spi.h). All other methods (including kinetis_spibus_initialize())
* are provided by common Kinetis logic. To use this common SPI logic on your * are provided by common Kinetis logic. To use this common SPI logic on your
* board: * board:
* *
@ -109,9 +109,9 @@ void weak_function kinetis_spiinitialize(void)
* 2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your * 2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your
* board-specific logic. These functions will perform chip selection and * board-specific logic. These functions will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 3. Add a calls to up_spiinitialize() in your low level application * 3. Add a calls to kinetis_spibus_initialize() in your low level application
* initialization logic * initialization logic
* 4. The handle returned by up_spiinitialize() may then be used to bind the * 4. The handle returned by kinetis_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

4
configs/twr-k60n512/src/twr-k60n512.h
View File

@ -273,14 +273,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: kinetis_spiinitialize * Name: kinetis_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the TWR-K60N512 board. * Called to configure SPI chip select GPIO pins for the TWR-K60N512 board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function kinetis_spiinitialize(void); void weak_function kinetis_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: kinetis_usbinitialize * Name: kinetis_usbinitialize