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

Extend SPI interface for word sizes >8bits

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1740 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-04-26 16:06:29 +00:00
parent 6ee52cc61f
commit 14df1332d6
2 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
configs/mcu123-lpc214x/src/up_spi.c
View File

@ -89,9 +89,9 @@
static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected); static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected);
static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency); static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency);
static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch); static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 ch);
static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, size_t buflen); static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen);
static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t buflen); static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t buflen);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -102,7 +102,7 @@ static const struct spi_ops_s g_spiops =
.select = spi_select, .select = spi_select,
.setfrequency = spi_setfrequency, .setfrequency = spi_setfrequency,
.status = spi_status, .status = spi_status,
.sndbyte = spi_sndbyte, .send = spi_send,
.sndblock = spi_sndblock, .sndblock = spi_sndblock,
.recvblock = spi_recvblock, .recvblock = spi_recvblock,
}; };
@ -232,21 +232,22 @@ static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
} }
/**************************************************************************** /****************************************************************************
* Name: spi_sndbyte * Name: spi_send
* *
* Description: * Description:
* Send one byte on SPI * Exchange one word on SPI
* *
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* ch - The byte to send * wd - The word to send. the size of the data is determined by the
* number of bits selected for the SPI interface.
* *
* Returned Value: * Returned Value:
* response * response
* *
****************************************************************************/ ****************************************************************************/
static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch) static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd)
{ {
/* Wait while the TX FIFO is full */ /* Wait while the TX FIFO is full */
@ -254,7 +255,7 @@ static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch)
/* Write the byte to the TX FIFO */ /* Write the byte to the TX FIFO */
putreg16(ch, LPC214X_SPI1_DR); putreg16((ubyte)wd, LPC214X_SPI1_DR);
/* Wait for the RX FIFO not empty */ /* Wait for the RX FIFO not empty */
@ -262,7 +263,7 @@ static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch)
/* Get the value from the RX FIFO and return it */ /* Get the value from the RX FIFO and return it */
return (ubyte)getreg16(LPC214X_SPI1_DR); return (uint16)getreg16(LPC214X_SPI1_DR);
} }
/************************************************************************* /*************************************************************************
@ -274,15 +275,19 @@ static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch)
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* buffer - A pointer to the buffer of data to be sent * buffer - A pointer to the buffer of data to be sent
* buflen - the length of data to send from the buffer * buflen - the length of data to send from the buffer in number of words.
* The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into ubytes; if nbits >8, the data is packed into uint16's
* *
* Returned Value: * Returned Value:
* None * None
* *
****************************************************************************/ ****************************************************************************/
static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, size_t buflen) static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen)
{ {
FAR const ubyte *ptr = (FAR const ubyte *)buffer;
ubyte sr; ubyte sr;
/* Loop while thre are bytes remaining to be sent */ /* Loop while thre are bytes remaining to be sent */
@ -295,8 +300,8 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, siz
{ {
/* Send the data */ /* Send the data */
putreg16((uint16)*buffer, LPC214X_SPI1_DR); putreg16((uint16)*ptr, LPC214X_SPI1_DR);
buffer++; ptr++;
buflen--; buflen--;
} }
} }
@ -339,20 +344,24 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, siz
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* buffer - A pointer to the buffer in which to recieve data * buffer - A pointer to the buffer in which to recieve data
* buflen - the length of data that can be received in the buffer * buflen - the length of data that can be received in the buffer in number
* of words. The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into ubytes; if nbits >8, the data is packed into uint16's
* *
* Returned Value: * Returned Value:
* None * None
* *
****************************************************************************/ ****************************************************************************/
static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t buflen) static void spi_recvblock(FAR struct spi_dev_s *dev, FAR const *buffer, size_t buflen)
{ {
FAR ubyte *ptr = (FAR ubyte*)buffer;
uint32 fifobytes = 0; uint32 fifobytes = 0;
/* While there is remaining to be sent (and no synchronization error has occurred) */ /* While there is remaining to be sent (and no synchronization error has occurred) */
while (buflen || fifobytes) while (ptr || fifobytes)
{ {
/* Fill the transmit FIFO with 0xff... /* Fill the transmit FIFO with 0xff...
* Write 0xff to the data register while (1) the TX FIFO is * Write 0xff to the data register while (1) the TX FIFO is
@ -372,7 +381,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t b
while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE) while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE)
{ {
*buffer++ = (ubyte)getreg16(LPC214X_SPI1_DR); *ptr++ = (ubyte)getreg16(LPC214X_SPI1_DR);
fifobytes--; fifobytes--;
} }
} }

41
configs/olimex-strp711/src/up_spi.c
View File

@ -266,9 +266,9 @@ static inline void spi_putreg(FAR struct str71x_spidev_s *priv, ubyte offset,
static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected); static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected);
static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency); static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency);
static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch); static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd);
static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, size_t buflen); static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen);
static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t buflen); static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t buflen);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -279,7 +279,7 @@ static const struct spi_ops_s g_spiops =
.select = spi_select, .select = spi_select,
.setfrequency = spi_setfrequency, .setfrequency = spi_setfrequency,
.status = spi_status, .status = spi_status,
.sndbyte = spi_sndbyte, .send = spi_send,
.sndblock = spi_sndblock, .sndblock = spi_sndblock,
.recvblock = spi_recvblock, .recvblock = spi_recvblock,
}; };
@ -518,21 +518,22 @@ static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
} }
/**************************************************************************** /****************************************************************************
* Name: spi_sndbyte * Name: spi_send
* *
* Description: * Description:
* Send one byte on SPI * Exchange one word on SPI
* *
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* ch - The byte to send * wd - The word to send. the size of the data is determined by the
* number of bits selected for the SPI interface.
* *
* Returned Value: * Returned Value:
* response * response
* *
****************************************************************************/ ****************************************************************************/
static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch) static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd)
{ {
FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
@ -550,7 +551,7 @@ static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch)
/* Write the byte to the TX FIFO */ /* Write the byte to the TX FIFO */
spi_putreg(priv, STR71X_BSPI_TXR_OFFSET, (uint16)ch << 8); spi_putreg(priv, STR71X_BSPI_TXR_OFFSET, wd << 8);
/* Wait for the RX FIFO not empty */ /* Wait for the RX FIFO not empty */
@ -570,16 +571,20 @@ static ubyte spi_sndbyte(FAR struct spi_dev_s *dev, ubyte ch)
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* buffer - A pointer to the buffer of data to be sent * buffer - A pointer to the buffer of data to be sent
* buflen - the length of data to send from the buffer * buflen - the length of data to send from the buffer in number of words.
* The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into ubytes; if nbits >8, the data is packed into uint16's
* *
* Returned Value: * Returned Value:
* None * None
* *
****************************************************************************/ ****************************************************************************/
static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, size_t buflen) static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen)
{ {
FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
FAR const ubyte *ptr = (FAR const ubyte *)buffer;
uint16 csr2; uint16 csr2;
DEBUGASSERT(priv && priv->spibase); DEBUGASSERT(priv && priv->spibase);
@ -594,8 +599,8 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, siz
{ {
/* Send the data */ /* Send the data */
spi_putreg(priv, STR71X_BSPI_TXR_OFFSET, ((uint16)*buffer) << 8); spi_putreg(priv, STR71X_BSPI_TXR_OFFSET, ((uint16)*ptr) << 8);
buffer++; ptr++;
buflen--; buflen--;
} }
} }
@ -638,16 +643,20 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const ubyte *buffer, siz
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* buffer - A pointer to the buffer in which to recieve data * buffer - A pointer to the buffer in which to recieve data
* buflen - the length of data that can be received in the buffer * buflen - the length of data that can be received in the buffer in number
* of words. The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into ubytes; if nbits >8, the data is packed into uint16's
* *
* Returned Value: * Returned Value:
* None * None
* *
****************************************************************************/ ****************************************************************************/
static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t buflen) static void spi_recvblock(FAR struct spi_dev_s *dev, FAR const *buffer, size_t buflen)
{ {
FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
FAR ubyte *ptr = (FAR ubyte*)buffer;
uint32 fifobytes = 0; uint32 fifobytes = 0;
DEBUGASSERT(priv && priv->spibase); DEBUGASSERT(priv && priv->spibase);
@ -674,7 +683,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR ubyte *buffer, size_t b
while ((spi_getreg(priv, STR71X_BSPI_CSR2_OFFSET) & STR71X_BSPICSR2_RFNE) != 0) while ((spi_getreg(priv, STR71X_BSPI_CSR2_OFFSET) & STR71X_BSPICSR2_RFNE) != 0)
{ {
*buffer++ = (ubyte)(spi_getreg(priv, STR71X_BSPI_RXR_OFFSET) >> 8); *ptr++ = (ubyte)(spi_getreg(priv, STR71X_BSPI_RXR_OFFSET) >> 8);
fifobytes--; fifobytes--;
} }
} }