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

Renamed SPIDEV_GSENSOR to SPIDEV_ACCELEROMETER just because it looks better beside SPIDEV_BAROMETER

Browse Source
This commit is contained in:
Gregory Nutt 2015-02-12 12:26:19 -06:00
parent 38aa31dea2
commit 3e1173225e
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/freedom-kl25z/src/kl_spi.c
View File

@ -168,7 +168,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
(int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_ADXL345_SPI
if (devid == SPIDEV_GSENSOR)
if (devid == SPIDEV_ACCELEROMETER)
{
/* Active low */

12
drivers/sensors/adxl345_spi.c
View File

@ -99,7 +99,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
/* Select the ADXL345 */
SPI_SELECT(priv->spi, SPIDEV_GSENSOR, true);
SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, true);
/* Send register to read and get the next byte */
@ -108,7 +108,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
/* Deselect the ADXL345 */
SPI_SELECT(priv->spi, SPIDEV_GSENSOR, false);
SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, false);
/* Unlock bus */
@ -146,7 +146,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr,
/* Select the ADXL345 */
SPI_SELECT(priv->spi, SPIDEV_GSENSOR, true);
SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, true);
/* Send register address and set the value */
@ -155,7 +155,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr,
/* Deselect the ADXL345 */
SPI_SELECT(priv->spi, SPIDEV_GSENSOR, false);
SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, false);
/* Unlock bus */
#ifndef CONFIG_SPI_OWNBUS
@ -184,7 +184,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
/* Select the ADXL345 */
SPI_SELECT(priv->spi, SPIDEV_GSENSOR, true);
SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, true);
/* Send register to read and get the next 2 bytes */
@ -193,7 +193,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
/* Deselect the ADXL345 */
SPI_SELECT(priv->spi, SPIDEV_GSENSOR, false);
SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, false);
/* Unlock bus */

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

@ -344,36 +344,36 @@
typedef void (*spi_mediachange_t)(FAR void *arg);
/* If the board supports multiple SPI devices, this enumeration identifies
* which is selected or de-seleted.
* which is selected or de-selected.
*/
enum spi_dev_e
{
SPIDEV_NONE = 0, /* Not a valid value */
SPIDEV_MMCSD, /* Select SPI MMC/SD device */
SPIDEV_FLASH, /* Select SPI FLASH device */
SPIDEV_ETHERNET, /* Select SPI ethernet device */
SPIDEV_DISPLAY, /* Select SPI LCD/OLED display device */
SPIDEV_CAMERA, /* Select SPI imaging device */
SPIDEV_WIRELESS, /* Select SPI Wireless device */
SPIDEV_TOUCHSCREEN, /* Select SPI touchscreen device */
SPIDEV_EXPANDER, /* Select SPI I/O expander device */
SPIDEV_MUX, /* Select SPI multiplexer device */
SPIDEV_AUDIO_DATA, /* Select SPI audio codec device data port */
SPIDEV_AUDIO_CTRL, /* Select SPI audio codec device control port */
SPIDEV_EEPROM, /* Select SPI EEPROM device */
SPIDEV_GSENSOR, /* Select SPI Accelerometer device */
SPIDEV_BAROMETER /* Select SPI Pressure/Barometer device */
SPIDEV_NONE = 0, /* Not a valid value */
SPIDEV_MMCSD, /* Select SPI MMC/SD device */
SPIDEV_FLASH, /* Select SPI FLASH device */
SPIDEV_ETHERNET, /* Select SPI Ethernet device */
SPIDEV_DISPLAY, /* Select SPI LCD/OLED display device */
SPIDEV_CAMERA, /* Select SPI imaging device */
SPIDEV_WIRELESS, /* Select SPI Wireless device */
SPIDEV_TOUCHSCREEN, /* Select SPI touchscreen device */
SPIDEV_EXPANDER, /* Select SPI I/O expander device */
SPIDEV_MUX, /* Select SPI multiplexer device */
SPIDEV_AUDIO_DATA, /* Select SPI audio codec device data port */
SPIDEV_AUDIO_CTRL, /* Select SPI audio codec device control port */
SPIDEV_EEPROM, /* Select SPI EEPROM device */
SPIDEV_ACCELEROMETER, /* Select SPI Accelerometer device */
SPIDEV_BAROMETER /* Select SPI Pressure/Barometer device */
};
/* Certain SPI devices may required differnt clocking modes */
enum spi_mode_e
{
SPIDEV_MODE0 = 0, /* CPOL=0 CHPHA=0 */
SPIDEV_MODE1, /* CPOL=0 CHPHA=1 */
SPIDEV_MODE2, /* CPOL=1 CHPHA=0 */
SPIDEV_MODE3 /* CPOL=1 CHPHA=1 */
SPIDEV_MODE0 = 0, /* CPOL=0 CHPHA=0 */
SPIDEV_MODE1, /* CPOL=0 CHPHA=1 */
SPIDEV_MODE2, /* CPOL=1 CHPHA=0 */
SPIDEV_MODE3 /* CPOL=1 CHPHA=1 */
};
/* The SPI vtable */