From 48a7a4eff6d02c4d6d85aaa4d06778ca81bbccdb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Feb 2016 10:36:39 -0600 Subject: [PATCH] Rename all tiva_spi functions to tiva_ssi --- configs/dk-tm4c129x/src/tm4c_ssi.c | 18 +++++++++--------- configs/eagle100/src/lm_nsh.c | 2 +- configs/eagle100/src/lm_ssi.c | 18 +++++++++--------- configs/ekk-lm3s9b96/src/lm_ssi.c | 18 +++++++++--------- configs/lm3s6432-s2e/src/lm_ssi.c | 18 +++++++++--------- configs/lm3s6965-ek/src/lm_nsh.c | 2 +- configs/lm3s6965-ek/src/lm_oled.c | 6 +++--- configs/lm3s6965-ek/src/lm_ssi.c | 20 ++++++++++---------- configs/lm3s8962-ek/src/lm_nsh.c | 2 +- configs/lm3s8962-ek/src/lm_oled.c | 6 +++--- configs/lm3s8962-ek/src/lm_ssi.c | 20 ++++++++++---------- configs/lm4f120-launchpad/src/lm4f_ssi.c | 18 +++++++++--------- configs/tm4c123g-launchpad/src/tm4c_ssi.c | 18 +++++++++--------- 13 files changed, 83 insertions(+), 83 deletions(-) diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c index 2dcd45bc11..ac2e9eb5e6 100644 --- a/configs/dk-tm4c129x/src/tm4c_ssi.c +++ b/configs/dk-tm4c129x/src/tm4c_ssi.c @@ -98,32 +98,32 @@ void weak_function tm4c_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/eagle100/src/lm_nsh.c b/configs/eagle100/src/lm_nsh.c index 42216ef9fa..5ba0e62969 100644 --- a/configs/eagle100/src/lm_nsh.c +++ b/configs/eagle100/src/lm_nsh.c @@ -115,7 +115,7 @@ int board_app_initialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", CONFIG_NSH_MMCSDSPIPORTNO); - spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); + spi = tiva_ssibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c index 2f2337ad6e..5a52edb52f 100644 --- a/configs/eagle100/src/lm_ssi.c +++ b/configs/eagle100/src/lm_ssi.c @@ -107,38 +107,38 @@ void weak_function lm_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); if (devid == SPIDEV_MMCSD) { /* Assert the CS pin to the card */ - ssi_dumpgpio("tiva_spiselect() before tiva_gpiowrite()"); + ssi_dumpgpio("tiva_ssiselect() before tiva_gpiowrite()"); tiva_gpiowrite(SDCCS_GPIO, !selected); - ssi_dumpgpio("tiva_spiselect() after tiva_gpiowrite()"); + ssi_dumpgpio("tiva_ssiselect() after tiva_gpiowrite()"); } } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c index ff88e7c2a3..ad590c52b1 100644 --- a/configs/ekk-lm3s9b96/src/lm_ssi.c +++ b/configs/ekk-lm3s9b96/src/lm_ssi.c @@ -113,28 +113,28 @@ void weak_function lm_spidev_initialize(void) #if 0 /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) { /* Assert the CS pin to the card */ @@ -149,10 +149,10 @@ void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select tiva_gpiowrite(OLEDCS_GPIO, !selected); } #endif - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c index b3d31356cb..4e1e81badc 100644 --- a/configs/lm3s6432-s2e/src/lm_ssi.c +++ b/configs/lm3s6432-s2e/src/lm_ssi.c @@ -109,28 +109,28 @@ void weak_function lm_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) { @@ -139,10 +139,10 @@ void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select tiva_gpiowrite(SDCCS_GPIO, !selected); } - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/lm3s6965-ek/src/lm_nsh.c b/configs/lm3s6965-ek/src/lm_nsh.c index c04f4d5c3f..a62b19d93a 100644 --- a/configs/lm3s6965-ek/src/lm_nsh.c +++ b/configs/lm3s6965-ek/src/lm_nsh.c @@ -117,7 +117,7 @@ int board_app_initialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", CONFIG_NSH_MMCSDSPIPORTNO); - spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); + spi = tiva_ssibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c index e96926336a..6eee4e35ed 100644 --- a/configs/lm3s6965-ek/src/lm_oled.c +++ b/configs/lm3s6965-ek/src/lm_oled.c @@ -111,7 +111,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) /* Get the SSI port (configure as a Freescale SPI port) */ - spi = tiva_spibus_initialize(0); + spi = tiva_ssibus_initialize(0); if (!spi) { glldbg("Failed to initialize SSI port 0\n"); @@ -140,7 +140,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } /**************************************************************************** - * Name: tiva_spicmddata + * Name: tiva_ssicmddata * * Description: * Set or clear the SD1329 D/Cn bit to select data (true) or command @@ -162,7 +162,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) * ****************************************************************************/ -int tiva_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +int tiva_ssicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { if (devid == SPIDEV_DISPLAY) { diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c index 9640ec18f4..0322405c35 100644 --- a/configs/lm3s6965-ek/src/lm_ssi.c +++ b/configs/lm3s6965-ek/src/lm_ssi.c @@ -94,7 +94,7 @@ ************************************************************************************/ /************************************************************************************ - * Name: tiva_spidev_initialize + * Name: tiva_ssidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit. @@ -114,28 +114,28 @@ void weak_function lm_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) { @@ -151,10 +151,10 @@ void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select tiva_gpiowrite(OLEDCS_GPIO, !selected); } #endif - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/lm3s8962-ek/src/lm_nsh.c b/configs/lm3s8962-ek/src/lm_nsh.c index df9be8b677..4cc002447e 100644 --- a/configs/lm3s8962-ek/src/lm_nsh.c +++ b/configs/lm3s8962-ek/src/lm_nsh.c @@ -119,7 +119,7 @@ int board_app_initialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", CONFIG_NSH_MMCSDSPIPORTNO); - spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); + spi = tiva_ssibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c index d9fd3b5b2b..949fccec51 100644 --- a/configs/lm3s8962-ek/src/lm_oled.c +++ b/configs/lm3s8962-ek/src/lm_oled.c @@ -109,7 +109,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) /* Get the SSI port (configure as a Freescale SPI port) */ - spi = tiva_spibus_initialize(0); + spi = tiva_ssibus_initialize(0); if (!spi) { glldbg("Failed to initialize SSI port 0\n"); @@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } /**************************************************************************** - * Name: tiva_spicmddata + * Name: tiva_ssicmddata * * Description: * Set or clear the SD1329 D/Cn bit to select data (true) or command @@ -159,7 +159,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) * ****************************************************************************/ -int tiva_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +int tiva_ssicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { if (devid == SPIDEV_DISPLAY) { diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c index 708fcb0589..06d4935b33 100644 --- a/configs/lm3s8962-ek/src/lm_ssi.c +++ b/configs/lm3s8962-ek/src/lm_ssi.c @@ -94,7 +94,7 @@ ************************************************************************************/ /************************************************************************************ - * Name: tiva_spidev_initialize + * Name: tiva_ssidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the LM3S8962 Eval Kit. @@ -114,28 +114,28 @@ void weak_function lm_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) { @@ -151,10 +151,10 @@ void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select tiva_gpiowrite(OLEDCS_GPIO, !selected); } #endif - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c index dfbff75463..683b29249c 100644 --- a/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c @@ -99,32 +99,32 @@ void weak_function lm4f_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c index 18c9a9c284..4c1f75995e 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c @@ -98,32 +98,32 @@ void weak_function tm4c_spidev_initialize(void) } /**************************************************************************** - * The external functions, tiva_spiselect and tiva_spistatus must be provided + * The external functions, tiva_ssiselect and tiva_ssistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spibus_initialize()) are provided by common + * All othermethods (including tiva_ssibus_initialize()) are provided by common * logic. To use this common SPI logic on your board: * - * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your + * 1. Provide tiva_ssiselect() and tiva_ssistatus() functions in your * board-specific logic. This function will perform chip selection and * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spibus_initialize() in your low level initialization + * 2. Add a call to tiva_ssibus_initialize() in your low level initialization * logic - * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the + * 3. The handle returned by tiva_ssibus_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). * ****************************************************************************/ -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); - ssi_dumpgpio("tiva_spiselect() Exit"); + ssi_dumpgpio("tiva_ssiselect() Entry"); + ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ssidbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT;