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

spirit: Modify reg needs to toggle CS to get the correct status. Remove some delbug left in last commit. make sprit_unlock an inline function.

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-03 15:15:15 -06:00
parent d2b5078e01
commit 36e7a18181
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/wireless/spirit/drivers/spirit_netdev.c
View File

@ -159,7 +159,7 @@ struct spirit_driver_s
/* Helpers */
static void spirit_lock(FAR struct spirit_driver_s *priv);
#define spirit_unlock(priv) sem_post(&priv->exclsem);
static inline void spirit_unlock(FAR struct spirit_driver_s *priv);
static void spirit_set_ipaddress(FAR struct net_driver_s *dev);
static int spirit_set_readystate(FAR struct spirit_driver_s *priv);
@ -327,6 +327,26 @@ static void spirit_lock(FAR struct spirit_driver_s *priv)
}
}
/****************************************************************************
* Name: spirit_unlock
*
* Description:
* Relinquish exclusive access to the driver instance and to the spirit
* library.
*
* Parameters:
* priv - Reference to a driver state structure instance
*
* Returned Value:
* None
*
****************************************************************************/
static inline void spirit_unlock(FAR struct spirit_driver_s *priv)
{
sem_post(&priv->exclsem);
}
/****************************************************************************
* Name: spirit_set_ipaddress
*
@ -666,7 +686,7 @@ static void spirit_transmit_work(FAR void *arg)
static void spirit_schedule_transmit_work(FAR struct spirit_driver_s *priv)
{
if(priv->txhead != NULL && priv->state == DRIVER_STATE_IDLE)
if (priv->txhead != NULL && priv->state == DRIVER_STATE_IDLE)
{
/* Schedule to perform the TX processing on the worker thread. */
@ -793,7 +813,6 @@ static void spirit_receive_work(FAR void *arg)
/* Get exclusive access as needed at the top of the loop */
spirit_lock(priv);
wlerr("End of loop\n");
}
spirit_unlock(priv);
@ -1006,8 +1025,8 @@ static void spirit_interrupt_work(FAR void *arg)
pktmeta->pm_dest.pa_addr[0] =
spirit_pktcommon_get_nodeaddress(spirit);
/* Add the contained IOB to the tail of the completed RX
* transfers.
/* Add the contained IOB to the tail of the queue of
* completed RX transfers.
*/
pktmeta->pm_flink = priv->rxtail;

5
drivers/wireless/spirit/lib/spirit_spi.c
View File

@ -412,6 +412,11 @@ int spirit_reg_modify(FAR struct spirit_library_s *spirit, uint8_t regaddr,
header[1] = regaddr;
spirit_regdebug("WRITE", header, &regval, 1);
/* Toggle Chip select so that we get the correct status */
SPI_SELECT(spirit->spi, SPIDEV_WIRELESS(0), false);
SPI_SELECT(spirit->spi, SPIDEV_WIRELESS(0), true);
/* Write the header bytes and read the SPIRIT1 status bytes */
SPI_EXCHANGE(spirit->spi, header, status, 2);