Re-architected SAM3/4 SPI interface; Change BUSY bit handling in the ADS7843E driver

1 files changed, 5 insertions, 33 deletions

diff --git a/nuttx/arch/arm/src/sam34/sam_spi.h b/nuttx/arch/arm/src/sam34/sam_spi.h
index 77e6e26f3..dfcfe20b3 100644
--- a/nuttx/arch/arm/src/sam34/sam_spi.h
+++ b/nuttx/arch/arm/src/sam34/sam_spi.h
@@ -79,15 +79,13 @@ extern "C"
  ************************************************************************************/
 
 /****************************************************************************
- * Name:  sam_spicsnumber, sam_spiselect, sam_spistatus, and sam_spicmddata
+ * Name:  sam_spiselect, sam_spistatus, and sam_spicmddata
  *
  * Description:
  *   These external functions must be provided by board-specific logic.  They
  *   include:
  *
- *   o sam_spicsnumber and sam_spiselect which are helper functions to
- *     manage the board-specific aspects of the unique SAM3/4 chip select
- *     architecture.
+ *   o sam_spiselect is a functions tomanage the board-specific chip selects
  *   o sam_spistatus and sam_spicmddata:  Implementations of the status
  *     and cmddata methods of the SPI interface defined by struct spi_ops_
  *     (see include/nuttx/spi.h). All other methods including
@@ -97,10 +95,9 @@ extern "C"
  *
  *   1. Provide logic in sam_boardinitialize() to configure SPI chip select
  *      pins.
- *   2. Provide sam_spicsnumber(), sam_spiselect() and sam_spistatus()
- *      functions in your board-specific logic.  These functions will perform
- *      chip selection and status operations using GPIOs in the way your board
- *      is configured.
+ *   2. Provide sam_spiselect() and sam_spistatus() functions in your board-
+ *      specific logic.  These functions will perform chip selection and
+ *      status operations using GPIOs in the way your board is configured.
  *   2. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
  *      sam_spicmddata() functions in your board-specific logic.  This
  *      function will perform cmd/data selection operations using GPIOs in
@@ -119,31 +116,6 @@ struct spi_dev_s;
 enum spi_dev_e;
 
 /****************************************************************************
- * Name: sam_spicsnumber
- *
- * Description:
- *   The SAM3/4 has 4 CS registers for controlling device features.  This
- *   function must be provided by board-specific code.  Given a logical device
- *   ID, this function returns a number from 0 to 3 that identifies one of
- *   these SAM3/4 CS resources.
- *
- *   If CONFIG_SPI_OWNBUS is not defined and the GPIO is controlled by
- *   sam_spiselect, then the same CS register may be used to control
- *   multiple devices.
- *
- * Input Parameters:
- *   dev - SPI device info
- *   devid - Identifies the (logical) device
- *
- * Returned Values:
- *   On success, a CS number from 0 to 3 is returned; A negated errno may
- *   be returned on a failure.
- *
- ****************************************************************************/
-
-int sam_spicsnumber(enum spi_dev_e devid);
-
-/****************************************************************************
  * Name: sam_spiselect
  *
  * Description: