diff --git a/configs/lincoln60/src/lincoln60.h b/configs/lincoln60/src/lincoln60.h index 1df8839cfe..45069e0a19 100644 --- a/configs/lincoln60/src/lincoln60.h +++ b/configs/lincoln60/src/lincoln60.h @@ -103,14 +103,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: lincoln60_sspinitialize + * Name: lincoln60_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the Lincoln 60 board. * ****************************************************************************/ -void weak_function lincoln60_sspinitialize(void); +void weak_function lincoln60_spidev_initialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_LINCOLN60_SRC_LINCOLN60_H */ diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_boot.c b/configs/lpcxpresso-lpc1115/src/lpc11_boot.c index c3f0963d13..f4da133bb7 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_boot.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_boot.c @@ -75,13 +75,13 @@ void lpc11_boardinitialize(void) { /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function lpcxpresso_sspinitialize() has been brought into the link. + * function lpcxpresso_spidev_initialize() has been brought into the link. */ #if defined(CONFIG_LPC11_SSP0) || defined(CONFIG_LPC11_SSP1) - if (lpcxpresso_sspinitialize) + if (lpcxpresso_spidev_initialize) { - lpcxpresso_sspinitialize(); + lpcxpresso_spidev_initialize(); } #endif diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_nsh.c b/configs/lpcxpresso-lpc1115/src/lpc11_nsh.c index 2806a941c6..efcb4f441f 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_nsh.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_nsh.c @@ -126,7 +126,7 @@ int nsh_archinitialize(void) /* Get the SSP port */ - ssp = lpc11_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + ssp = lpc11_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n", diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c index 2211e22e0d..0a12863625 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c @@ -93,18 +93,18 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpcxpresso_sspinitialize + * Name: lpcxpresso_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LPCXpresso. * ************************************************************************************/ -void weak_function lpcxpresso_sspinitialize(void) +void weak_function lpcxpresso_spidev_initialize(void) { /* Configure the SPI-based microSD CS GPIO */ - ssp_dumpgpio("lpcxpresso_sspinitialize() Entry)"); + ssp_dumpgpio("lpcxpresso_spidev_initialize() Entry)"); /* Configure card detect and chip select for the SD slot. NOTE: Jumper J55 must * be set correctly for the SD slot chip select. @@ -123,7 +123,7 @@ void weak_function lpcxpresso_sspinitialize(void) #endif #endif - ssp_dumpgpio("lpcxpresso_sspinitialize() Exit"); + ssp_dumpgpio("lpcxpresso_spidev_initialize() Exit"); } /************************************************************************************ @@ -133,7 +133,7 @@ void weak_function lpcxpresso_sspinitialize(void) * The external functions, lpc11_ssp0/ssp1select and lpc11_ssp0/ssp1status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc11_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc11_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -142,9 +142,9 @@ void weak_function lpcxpresso_sspinitialize(void) * 2. Provide lpc11_ssp0/ssp1select() and lpc11_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc11_sspinitialize() in your low level application + * 3. Add a calls to lpc11_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc11_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc11_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h b/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h index a5e8e9c993..6c3edc5934 100644 --- a/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h +++ b/configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h @@ -221,14 +221,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpcxpresso_sspinitialize + * Name: lpcxpresso_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LPCXpresso board. * ************************************************************************************/ -void weak_function lpcxpresso_sspinitialize(void); +void weak_function lpcxpresso_spidev_initialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_LPCXPRESSO_LPC1115_SRC_LPCXPRESSO_LPC1115L_H */ diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_boot.c b/configs/lpcxpresso-lpc1768/src/lpc17_boot.c index 0881b82333..e3296f344c 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_boot.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_boot.c @@ -75,13 +75,13 @@ void lpc17_boardinitialize(void) { /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function lpcxpresso_sspinitialize() has been brought into the link. + * function lpcxpresso_spidev_initialize() has been brought into the link. */ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) - if (lpcxpresso_sspinitialize) + if (lpcxpresso_spidev_initialize) { - lpcxpresso_sspinitialize(); + lpcxpresso_spidev_initialize(); } #endif diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c b/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c index 02ffaacf66..6d97d9cd3c 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c @@ -137,7 +137,7 @@ int board_app_initialize(void) /* Get the SSP port */ - ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n", diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c index 51d5250270..651ba0b8f5 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c @@ -125,7 +125,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) /* Get the SPI1 port (configure as a Freescale SPI port) */ - spi = lpc17_sspinitialize(1); + spi = lpc17_spibus_initialize(1); if (!spi) { glldbg("Failed to initialize SPI port 1\n"); diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c index 2e35f3f1e5..07657f3ea6 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c @@ -93,18 +93,18 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpcxpresso_sspinitialize + * Name: lpcxpresso_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LPCXpresso. * ************************************************************************************/ -void weak_function lpcxpresso_sspinitialize(void) +void weak_function lpcxpresso_spidev_initialize(void) { /* Configure the SPI-based microSD CS GPIO */ - ssp_dumpgpio("lpcxpresso_sspinitialize() Entry)"); + ssp_dumpgpio("lpcxpresso_spidev_initialize() Entry)"); /* Configure card detect and chip select for the SD slot. NOTE: Jumper J55 must * be set correctly for the SD slot chip select. @@ -123,7 +123,7 @@ void weak_function lpcxpresso_sspinitialize(void) #endif #endif - ssp_dumpgpio("lpcxpresso_sspinitialize() Exit"); + ssp_dumpgpio("lpcxpresso_spidev_initialize() Exit"); } /************************************************************************************ @@ -133,7 +133,7 @@ void weak_function lpcxpresso_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -142,9 +142,9 @@ void weak_function lpcxpresso_sspinitialize(void) * 2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc17_sspinitialize() in your low level application + * 3. Add a calls to lpc17_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c b/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c index 216534a83d..91a26f4b96 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c @@ -93,7 +93,7 @@ int usbmsc_archinitialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO); - spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO); + spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h b/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h index de90aebbae..83207d64b0 100644 --- a/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h +++ b/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h @@ -221,14 +221,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpcxpresso_sspinitialize + * Name: lpcxpresso_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LPCXpresso board. * ************************************************************************************/ -void weak_function lpcxpresso_sspinitialize(void); +void weak_function lpcxpresso_spidev_initialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_LPCXPRESSO_LPC1768_SRC_LPCXPRESSO_H */ diff --git a/configs/mbed/src/mbed.h b/configs/mbed/src/mbed.h index e78d984e3b..cd62ed067d 100644 --- a/configs/mbed/src/mbed.h +++ b/configs/mbed/src/mbed.h @@ -79,14 +79,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: mbed_sspinitialize + * Name: mbed_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the NUCLEUS-2G board. * ************************************************************************************/ -void weak_function mbed_sspinitialize(void); +void weak_function mbed_spidev_initialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_MBED_SRC_MBED_H */ diff --git a/configs/nucleus2g/src/lpc17_boot.c b/configs/nucleus2g/src/lpc17_boot.c index d37750a7ba..a9e4efff70 100644 --- a/configs/nucleus2g/src/lpc17_boot.c +++ b/configs/nucleus2g/src/lpc17_boot.c @@ -93,13 +93,13 @@ void lpc17_boardinitialize(void) #endif /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function nucleus2g_sspinitialize() has been brought into the link. + * function nucleus2g_spidev_initialize() has been brought into the link. */ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) - if (nucleus2g_sspinitialize) + if (nucleus2g_spidev_initialize) { - nucleus2g_sspinitialize(); + nucleus2g_spidev_initialize(); } #endif diff --git a/configs/nucleus2g/src/lpc17_nsh.c b/configs/nucleus2g/src/lpc17_nsh.c index 5d4a66c987..ac9078f40d 100644 --- a/configs/nucleus2g/src/lpc17_nsh.c +++ b/configs/nucleus2g/src/lpc17_nsh.c @@ -131,7 +131,7 @@ int board_app_initialize(void) /* Get the SSP port */ - ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n", diff --git a/configs/nucleus2g/src/lpc17_ssp.c b/configs/nucleus2g/src/lpc17_ssp.c index ec53c8d998..9573921296 100644 --- a/configs/nucleus2g/src/lpc17_ssp.c +++ b/configs/nucleus2g/src/lpc17_ssp.c @@ -93,18 +93,18 @@ ************************************************************************************/ /************************************************************************************ - * Name: nucleus2g_sspinitialize + * Name: nucleus2g_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the Nucleus 2G. * ************************************************************************************/ -void weak_function nucleus2g_sspinitialize(void) +void weak_function nucleus2g_spidev_initialize(void) { /* Configure the SPI-based microSD CS GPIO */ - ssp_dumpgpio("nucleus2g_sspinitialize() Entry)"); + ssp_dumpgpio("nucleus2g_spidev_initialize() Entry)"); /* SSP0 connects only to the MMC/SD slot on the Nucleus 1G board. * P0[15]/TXD1/SCK0/SCK MMC_CLK @@ -126,7 +126,7 @@ void weak_function nucleus2g_sspinitialize(void) #ifdef CONFIG_LPC17_SSP1 # warning "SSP1 chip selects not known" #endif - ssp_dumpgpio("nucleus2g_sspinitialize() Exit"); + ssp_dumpgpio("nucleus2g_spidev_initialize() Exit"); } /************************************************************************************ @@ -136,7 +136,7 @@ void weak_function nucleus2g_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -145,9 +145,9 @@ void weak_function nucleus2g_sspinitialize(void) * 2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc17_sspinitialize() in your low level application + * 3. Add a calls to lpc17_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/nucleus2g/src/lpc17_usbmsc.c b/configs/nucleus2g/src/lpc17_usbmsc.c index b2dcb2f918..61cd8f46d7 100644 --- a/configs/nucleus2g/src/lpc17_usbmsc.c +++ b/configs/nucleus2g/src/lpc17_usbmsc.c @@ -94,7 +94,7 @@ int usbmsc_archinitialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO); - spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO); + spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/nucleus2g/src/nucleus2g.h b/configs/nucleus2g/src/nucleus2g.h index a159d3acc8..3c94c0c467 100644 --- a/configs/nucleus2g/src/nucleus2g.h +++ b/configs/nucleus2g/src/nucleus2g.h @@ -139,14 +139,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: nucleus2g_sspinitialize + * Name: nucleus2g_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the NUCLEUS-2G board. * ************************************************************************************/ -void weak_function nucleus2g_sspinitialize(void); +void weak_function nucleus2g_spidev_initialize(void); void up_relayinit(void); diff --git a/configs/olimex-lpc1766stk/src/lpc1766stk.h b/configs/olimex-lpc1766stk/src/lpc1766stk.h index cbdb6f025d..9995a665dc 100644 --- a/configs/olimex-lpc1766stk/src/lpc1766stk.h +++ b/configs/olimex-lpc1766stk/src/lpc1766stk.h @@ -251,14 +251,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpc1766stk_sspinitialize + * Name: lpc1766stk_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the Olimex LPC1766-STK board. * ************************************************************************************/ -void weak_function lpc1766stk_sspinitialize(void); +void weak_function lpc1766stk_spidev_initialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_OLIMEX_LPC1766STK_SRC_LPC1766STK_H */ diff --git a/configs/olimex-lpc1766stk/src/lpc17_boot.c b/configs/olimex-lpc1766stk/src/lpc17_boot.c index 76859eb483..9ae1a86826 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_boot.c +++ b/configs/olimex-lpc1766stk/src/lpc17_boot.c @@ -75,13 +75,13 @@ void lpc17_boardinitialize(void) { /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function lpc1766stk_sspinitialize() has been brought into the link. + * function lpc1766stk_spidev_initialize() has been brought into the link. */ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) - if (lpc1766stk_sspinitialize) + if (lpc1766stk_spidev_initialize) { - lpc1766stk_sspinitialize(); + lpc1766stk_spidev_initialize(); } #endif diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c index 604321664e..f3f928b2c7 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c +++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c @@ -211,7 +211,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) /* Get the SSP0 port (configure as a Freescale SPI port) */ - spi = lpc17_sspinitialize(0); + spi = lpc17_spibus_initialize(0); if (!spi) { glldbg("Failed to initialize SSP port 0\n"); diff --git a/configs/olimex-lpc1766stk/src/lpc17_nsh.c b/configs/olimex-lpc1766stk/src/lpc17_nsh.c index fe98aa21c5..946895fa75 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_nsh.c +++ b/configs/olimex-lpc1766stk/src/lpc17_nsh.c @@ -195,7 +195,7 @@ static int nsh_sdinitialize(void) /* Get the SSP port */ - ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n", diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c index d21bedcb0f..c422307130 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c +++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c @@ -217,14 +217,14 @@ static int ssp1_cdinterrupt(int irq, FAR void *context) ************************************************************************************/ /************************************************************************************ - * Name: lpc1766stk_sspinitialize + * Name: lpc1766stk_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LPC1766-STK. * ************************************************************************************/ -void weak_function lpc1766stk_sspinitialize(void) +void weak_function lpc1766stk_spidev_initialize(void) { /* Configure the SSP0 chip select GPIOs. Only the Nokia LCD is connected to SSP0 */ @@ -263,7 +263,7 @@ void weak_function lpc1766stk_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -272,9 +272,9 @@ void weak_function lpc1766stk_sspinitialize(void) * 2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc17_sspinitialize() in your low level application + * 3. Add a calls to lpc17_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c b/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c index 39fba24072..012c509f7e 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c +++ b/configs/olimex-lpc1766stk/src/lpc17_usbmsc.c @@ -100,7 +100,7 @@ int usbmsc_archinitialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO); - spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO); + spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/open1788/src/lpc17_boardinitialize.c b/configs/open1788/src/lpc17_boardinitialize.c index 32d0185df4..b366899f39 100644 --- a/configs/open1788/src/lpc17_boardinitialize.c +++ b/configs/open1788/src/lpc17_boardinitialize.c @@ -91,13 +91,13 @@ void lpc17_boardinitialize(void) #endif /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function open1788_sspinitialize() has been brought into the link. + * function open1788_spidev_initialize() has been brought into the link. */ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) || defined(CONFIG_LPC17_SSP2) - if (open1788_sspinitialize) + if (open1788_spidev_initialize) { - open1788_sspinitialize(); + open1788_spidev_initialize(); } #endif diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c index daa0f60fd6..cf2181c1bc 100644 --- a/configs/open1788/src/lpc17_ssp.c +++ b/configs/open1788/src/lpc17_ssp.c @@ -100,14 +100,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: open1788_sspinitialize + * Name: open1788_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LPC1766-STK. * ****************************************************************************/ -void weak_function open1788_sspinitialize(void) +void weak_function open1788_spidev_initialize(void) { /* Configure the SSP0 chip select GPIOs. */ @@ -137,7 +137,7 @@ void weak_function open1788_sspinitialize(void) * The external functions, lpc17_ssp0/1/2select and lpc17_ssp0/1/2status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -146,9 +146,9 @@ void weak_function open1788_sspinitialize(void) * 2. Provide lpc17_ssp0/1/2select() and lpc17_ssp0/1/2status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc17_sspinitialize() in your low level application + * 3. Add a calls to lpc17_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c index c0bd83f007..0352882767 100644 --- a/configs/open1788/src/lpc17_touchscreen.c +++ b/configs/open1788/src/lpc17_touchscreen.c @@ -298,7 +298,7 @@ int board_tsc_setup(int minor) /* Get an instance of the SPI interface */ - dev = lpc17_sspinitialize(CONFIG_ADS7843E_SPIDEV); + dev = lpc17_spibus_initialize(CONFIG_ADS7843E_SPIDEV); if (!dev) { idbg("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV); diff --git a/configs/open1788/src/open1788.h b/configs/open1788/src/open1788.h index 39fd247229..941015ec82 100644 --- a/configs/open1788/src/open1788.h +++ b/configs/open1788/src/open1788.h @@ -166,14 +166,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: open1788_sspinitialize + * Name: open1788_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the WaveShare Open1788 board. * ************************************************************************************/ -void weak_function open1788_sspinitialize(void); +void weak_function open1788_spidev_initialize(void); /************************************************************************************ * Name: open1788_sdram_initialize diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c index af5162b586..856f5f0b8e 100644 --- a/configs/pic32mx-starterkit/src/pic32mx_spi.c +++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c @@ -86,14 +86,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: pic32mx_sspinitialize + * Name: pic32mx_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the Sure PIC32MX board. * ************************************************************************************/ -void weak_function pic32mx_sspinitialize(void) +void weak_function pic32mx_spidev_initialize(void) { /* Configure the SPI chip select GPIOs */ diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c index 4c3e1622ce..77422d601e 100644 --- a/configs/teensy-2.0/src/at90usb_spi.c +++ b/configs/teensy-2.0/src/at90usb_spi.c @@ -147,7 +147,7 @@ void weak_function at90usb_spidev_initialize(void) * other methods (including avr_spibus_initialize()) are provided by common AVR logic. * To use this common SPI logic on your board: * - * 1. Provide logic in avr_sspinitialize() to configure SPI chip select pins. + * 1. Provide logic in avr_spidev_initialize() to configure SPI chip select pins. * 2. Provide avr_spiselect() and avr_spistatus() functions in your board-specific * logic. These functions will perform chip selection and status operations * in the way your board is configured. diff --git a/configs/u-blox-c027/src/lpc17_nsh.c b/configs/u-blox-c027/src/lpc17_nsh.c index 84bf35b263..c9c7d2ca78 100644 --- a/configs/u-blox-c027/src/lpc17_nsh.c +++ b/configs/u-blox-c027/src/lpc17_nsh.c @@ -147,7 +147,7 @@ int board_app_initialize(void) /* Get the SSP port */ - ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n", diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c index 31be19ef77..faceaf31b6 100644 --- a/configs/u-blox-c027/src/lpc17_ssp.c +++ b/configs/u-blox-c027/src/lpc17_ssp.c @@ -119,7 +119,7 @@ void weak_function c027_ssp_initialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -128,9 +128,9 @@ void weak_function c027_ssp_initialize(void) * 2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc17_sspinitialize() in your low level application + * 3. Add a calls to lpc17_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/u-blox-c027/src/lpc17_usbmsc.c b/configs/u-blox-c027/src/lpc17_usbmsc.c index 217e28b1dd..76f2157bb0 100644 --- a/configs/u-blox-c027/src/lpc17_usbmsc.c +++ b/configs/u-blox-c027/src/lpc17_usbmsc.c @@ -94,7 +94,7 @@ int usbmsc_archinitialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO); - spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO); + spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/zkit-arm-1769/src/lpc17_boot.c b/configs/zkit-arm-1769/src/lpc17_boot.c index 937170a2ed..1675e5f57f 100644 --- a/configs/zkit-arm-1769/src/lpc17_boot.c +++ b/configs/zkit-arm-1769/src/lpc17_boot.c @@ -79,13 +79,13 @@ void lpc17_boardinitialize(void) { /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function zkit_sspinitialize() has been brought into the link. + * function zkit_spidev_initialize() has been brought into the link. */ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) - if (zkit_sspinitialize) + if (zkit_spidev_initialize) { - zkit_sspinitialize(); + zkit_spidev_initialize(); } #endif diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c index a397ddc6e0..af366a00ac 100644 --- a/configs/zkit-arm-1769/src/lpc17_lcd.c +++ b/configs/zkit-arm-1769/src/lpc17_lcd.c @@ -114,8 +114,8 @@ int board_lcd_initialize(void) lpc17_gpiowrite(ZKITARM_OLED_RST, 1); lpc17_gpiowrite(ZKITARM_OLED_RS, 1); - zkit_sspinitialize(); - g_spidev = lpc17_sspinitialize(0); + zkit_spidev_initialize(); + g_spidev = lpc17_spibus_initialize(0); if (!g_spidev) { glldbg("Failed to initialize SSP port 0\n"); diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c index dbfd52715e..99856cbdf7 100644 --- a/configs/zkit-arm-1769/src/lpc17_ssp.c +++ b/configs/zkit-arm-1769/src/lpc17_ssp.c @@ -94,18 +94,18 @@ ************************************************************************************/ /************************************************************************************ - * Name: zkit_sspinitialize + * Name: zkit_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the ZKIT-ARM-1769 Kit. * ************************************************************************************/ -void weak_function zkit_sspinitialize(void) +void weak_function zkit_spidev_initialize(void) { /* Configure the SPI-based LCD CS GPIO */ - ssp_dumpgpio("zkit_sspinitialize() Entry)"); + ssp_dumpgpio("zkit_spidev_initialize() Entry)"); /* Configure chip select for the LCD. */ @@ -115,7 +115,7 @@ void weak_function zkit_sspinitialize(void) #endif #endif /* CONFIG_LPC17_SSP0 */ - ssp_dumpgpio("zkit_sspinitialize() Exit"); + ssp_dumpgpio("zkit_spidev_initialize() Exit"); } /************************************************************************************ @@ -125,7 +125,7 @@ void weak_function zkit_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be 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 - * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -134,9 +134,9 @@ void weak_function zkit_sspinitialize(void) * 2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to lpc17_sspinitialize() in your low level application + * 3. Add a calls to lpc17_spibus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/configs/zkit-arm-1769/src/zkit-arm-1769.h b/configs/zkit-arm-1769/src/zkit-arm-1769.h index 6f2531f17d..759b4f1451 100644 --- a/configs/zkit-arm-1769/src/zkit-arm-1769.h +++ b/configs/zkit-arm-1769/src/zkit-arm-1769.h @@ -230,14 +230,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: zkit_sspinitialize + * Name: zkit_spidev_initialize * * Description: * Called to configure SSP chip select GPIO pins for the ZKit-ARM-1769 board. * ************************************************************************************/ -void weak_function zkit_sspinitialize(void); +void weak_function zkit_spidev_initialize(void); /************************************************************************************ * Name: zkit_spinitialize