diff options
-rw-r--r-- | nuttx/configs/arduino-due/src/sam_mmcsd.c | 18 | ||||
-rwxr-xr-x | nuttx/drivers/spi/spi_bitbang.c | 1 | ||||
-rwxr-xr-x | nuttx/include/nuttx/spi/spi_bitbang.c | 154 | ||||
-rwxr-xr-x | nuttx/include/nuttx/spi/spi_bitbang.h | 2 |
4 files changed, 109 insertions, 66 deletions
diff --git a/nuttx/configs/arduino-due/src/sam_mmcsd.c b/nuttx/configs/arduino-due/src/sam_mmcsd.c index 24790ba36..765523fed 100644 --- a/nuttx/configs/arduino-due/src/sam_mmcsd.c +++ b/nuttx/configs/arduino-due/src/sam_mmcsd.c @@ -88,22 +88,16 @@ #undef SPI_BITBANG_VARWIDTH +/* Calibration value for timing loop */ + +#define SPI_BITBAND_LOOPSPERMSEC CONFIG_BOARD_LOOPSPERMSEC + /* SPI_PERBIT_NSEC is the minimum time to transfer one bit. This determines * the maximum frequency and is also used to calculate delays to achieve * other SPI frequencies. - * - * This value came from selecting 400KHz and increasing SPI_PERBIT_NSEC - * until a frequency close to 400KHz was achieved. This is what was - * reported by the software: frequency=400000 holdtime=1 actual=298507. - * I measured a frequency of approximately 305KHz. - * - * NOTE that there are really only two frequencies possible: hold time=1 - * (305KHz) and hold time = 0 (probably around 781KHz). I believe that - * the code is capable of rates up to around 10MHz, but I think that the - * mere presence of the rate controlling logic slows it down. */ -#define SPI_PERBIT_NSEC 1350 /* Calibrated at 400KHz */ +#define SPI_PERBIT_NSEC 100 /* Misc definitions */ @@ -166,7 +160,7 @@ static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid) { - if (devid = SPIDEV_MMCSD) + if (devid == SPIDEV_MMCSD) { return SPI_STATUS_PRESENT; } diff --git a/nuttx/drivers/spi/spi_bitbang.c b/nuttx/drivers/spi/spi_bitbang.c index 76046a56a..42d1fc530 100755 --- a/nuttx/drivers/spi/spi_bitbang.c +++ b/nuttx/drivers/spi/spi_bitbang.c @@ -266,6 +266,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) actual = priv->low->setfrequency(priv, frequency); spivdbg("frequency=%d holdtime=%d actual=%d\n", frequency, priv->holdtime, actual); + return actual; } /**************************************************************************** diff --git a/nuttx/include/nuttx/spi/spi_bitbang.c b/nuttx/include/nuttx/spi/spi_bitbang.c index 3aacc415c..02038de47 100755 --- a/nuttx/include/nuttx/spi/spi_bitbang.c +++ b/nuttx/include/nuttx/spi/spi_bitbang.c @@ -53,6 +53,7 @@ * - Defines SPI_PERBIT_NSEC which is the minimum time to transfer one bit. * This determines the maximum frequency. * - Other configuration options: + * SPI_BITBAND_LOOPSPERMSEC - Delay loop calibration * SPI_BITBANG_DISABLEMODE0 - Define to disable Mode 0 support * SPI_BITBANG_DISABLEMODE1 - Define to disable Mode 1 support * SPI_BITBANG_DISABLEMODE2 - Define to disable Mode 2 support @@ -93,20 +94,25 @@ * Private Function Prototypes ****************************************************************************/ +static void spi_delay(uint32_t holdtime); static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, bool selected); static uint32_t spi_setfrequency(FAR struct spi_bitbang_s *priv, uint32_t frequency); static void spi_setmode(FAR struct spi_bitbang_s *priv, enum spi_mode_e mode); -static uint16_t spi_bitexchange0(FAR struct spi_bitbang_s *priv, - uint16_t dataout); -static uint16_t spi_bitexchange1(FAR struct spi_bitbang_s *priv, - uint16_t dataout); -static uint16_t spi_bitexchange2(FAR struct spi_bitbang_s *priv, - uint16_t dataout); -static uint16_t spi_bitexchange3(FAR struct spi_bitbang_s *priv, - uint16_t dataout); +#ifndef SPI_BITBANG_DISABLEMODE0 +static uint16_t spi_bitexchange0(uint16_t dataout, uint32_t holdtime); +#endif +#ifndef SPI_BITBANG_DISABLEMODE1 +static uint16_t spi_bitexchange1(uint16_t dataout, uint32_t holdtime); +#endif +#ifndef SPI_BITBANG_DISABLEMODE2 +static uint16_t spi_bitexchange2(uint16_t dataout, uint32_t holdtime); +#endif +#ifndef SPI_BITBANG_DISABLEMODE3 +static uint16_t spi_bitexchange3(uint16_t dataout, uint32_t holdtime); +#endif static uint16_t spi_exchange(FAR struct spi_bitbang_s *priv, uint16_t dataout); static uint8_t spi_status(FAR struct spi_bitbang_s *priv, @@ -135,7 +141,28 @@ static const struct spi_bitbang_ops_s g_spiops = /**************************************************************************** * Private Functions ****************************************************************************/ - /**************************************************************************** +/**************************************************************************** + * Name: spi_delay + * + * Description: + * Delay for a specified number of loops + * + * Input Parameters: + * count - The number of loops + * + * Returned Value: + * Returns the actual frequency selected + * + ****************************************************************************/ + +static void spi_delay(uint32_t holdtime) +{ + volatile int i; + + for (i = 0; i < holdtime; i++); +} + +/**************************************************************************** * Name: spi_setfrequency * * Description: @@ -167,11 +194,9 @@ static uint32_t spi_setfrequency(FAR struct spi_bitbang_s *priv, uint32_t freque * * As examples: * 1) frequency = 400KHz; SPI_PERBIT_NSEC = 100 - * pnsec = 2500 - 100 = 2400 - * holdtime = ((2401) >> 1) + 500) / 1000 = 1 + * pnsec = (2500 - 100) / 2 = 1200 * 2) frequency = 20MHz; SPI_PERBIT_NSEC = 100 - * pnsec = 50 - 100 -> 0 - * holdtime = ((0) >> 1) + 500) / 1000 = 0 + * pnsec = (50 - 100( / 2 -> 0 */ pnsec = (1000000000ul + (frequency >> 1)) / frequency; @@ -187,22 +212,45 @@ static uint32_t spi_setfrequency(FAR struct spi_bitbang_s *priv, uint32_t freque pnsec = 0; } - /* The hold time in microseconds is half of this (in microseconds) */ + /* The hold time in nanoseconds is then half this */ + + pnsec = (pnsec + 1) >> 1; + + /* But what we really want is the hold time in loop counts. We know that + * SPI_BITBAND_LOOPSPERMSEC is the number of times through a delay loop + * to get 1 millisecond. + * + * SPI_BITBAND_LOOPSPERMSEC / 1000000 is then the the number of counts + * to get 1 nanosecond. In reality, this is a number less than zero. But + * then we can use this to calculate: + * + * holdtime loops/hold = pnsec nsec/hold * (SPI_BITBAND_LOOPSPERMSEC / 1000000) loops/nsec + * + * As examples: + * 1) frequency = 400KHz; SPI_PERBIT_NSEC = 100; pnsec = 1200; + * SPI_BITBAND_LOOPSPERMSEC = 5000 + * holdtime = (1200 * 5000 + 500000) / 1000000 = 6 + * 2) frequency = 20MHz; SPI_PERBIT_NSEC = 100; pnsec = 0; + * SPI_BITBAND_LOOPSPERMSEC = 5000 + * holdtime = (0 * 5000 + 500000) / 1000000 = 0 + */ - priv->holdtime = (((pnsec + 1) >> 1) + 500) / 1000; + priv->holdtime = (pnsec * SPI_BITBAND_LOOPSPERMSEC + 500000) / 1000000; /* Let's do our best to calculate the actual frequency * * As examples: - * 1) frequency = 400KHz; SPI_PERBIT_NSEC = 100; holdtime = 1 - * pnsec = 2000 * 1 + 100 = 2100 - * frequency = 476KHz + * 1) frequency = 400KHz; SPI_PERBIT_NSEC = 100; + * SPI_BITBAND_LOOPSPERMSEC = 5000; holdtime = 6 + * pnsec = 2 * 1000000 * 6 / 5000 + 100 = 2500 nsec + * frequency = 400KHz * 2) frequency = 20MHz; SPI_PERBIT_NSEC = 100; holdtime = 0 - * pnsec = 2000 * 0 + 100 = 100 + * SPI_BITBAND_LOOPSPERMSEC = 5000; holdtime = 0 + * pnsec = 2 * 0 * 6 / 5000 + 100 = 100 nsec * frequency = 10MHz */ - pnsec = 2000 * priv->holdtime + SPI_PERBIT_NSEC; + pnsec = 2 * 1000000 * priv->holdtime / SPI_BITBAND_LOOPSPERMSEC + SPI_PERBIT_NSEC; frequency = 1000000000ul / pnsec; return frequency; } @@ -301,8 +349,7 @@ static void spi_setmode(FAR struct spi_bitbang_s *priv, ****************************************************************************/ #ifndef SPI_BITBANG_DISABLEMODE0 -static uint16_t spi_bitexchange0(FAR struct spi_bitbang_s *priv, - uint16_t dataout) +static uint16_t spi_bitexchange0(uint16_t dataout, uint32_t holdtime) { uint16_t datain; /* No clock transition before setting MOSI */ @@ -317,15 +364,15 @@ static uint16_t spi_bitexchange0(FAR struct spi_bitbang_s *priv, SPI_SETSCK; /* Clock transition before getting MISO */ datain = (uint16_t)SPI_GETMISO; /* Get bit 0 = MOSI value */ - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } SPI_CLRSCK; /* Return clock to the resting state after getting MISO */ - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } return datain; @@ -361,8 +408,7 @@ static uint16_t spi_bitexchange0(FAR struct spi_bitbang_s *priv, ****************************************************************************/ #ifndef SPI_BITBANG_DISABLEMODE1 -static uint16_t spi_bitexchange1(FAR struct spi_bitbang_s *priv, - uint16_t dataout) +static uint16_t spi_bitexchange1(uint16_t dataout, uint32_t holdtime) { uint16_t datain; @@ -376,17 +422,17 @@ static uint16_t spi_bitexchange1(FAR struct spi_bitbang_s *priv, SPI_CLRMOSI; /* Clear MISO if the bit is not set */ } - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } SPI_CLRSCK; /* Clock transition before getting MISO */ datain = (uint16_t)SPI_GETMISO; /* Get bit 0 = MOSI value */ /* Clock is in resting state after getting MISO */ - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } return datain; @@ -422,8 +468,7 @@ static uint16_t spi_bitexchange1(FAR struct spi_bitbang_s *priv, ****************************************************************************/ #ifndef SPI_BITBANG_DISABLEMODE2 -static uint16_t spi_bitexchange2(FAR struct spi_bitbang_s *priv, - uint16_t dataout) +static uint16_t spi_bitexchange2(uint16_t dataout, uint32_t holdtime) { uint16_t datain; /* No clock transition before setting MOSI */ @@ -438,15 +483,15 @@ static uint16_t spi_bitexchange2(FAR struct spi_bitbang_s *priv, SPI_CLRSCK; /* Clock transition before getting MISO */ datain = (uint16_t)SPI_GETMISO; /* Get bit 0 = MOSI value */ - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } SPI_SETSCK; /* Return clock to the resting state after getting MISO */ - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } return datain; @@ -482,8 +527,7 @@ static uint16_t spi_bitexchange2(FAR struct spi_bitbang_s *priv, ****************************************************************************/ #ifndef SPI_BITBANG_DISABLEMODE3 -static uint16_t spi_bitexchange3(FAR struct spi_bitbang_s *priv, - uint16_t dataout) +static uint16_t spi_bitexchange3(uint16_t dataout, uint32_t holdtime) { uint16_t datain; @@ -497,17 +541,17 @@ static uint16_t spi_bitexchange3(FAR struct spi_bitbang_s *priv, SPI_CLRMOSI; /* Clear MISO if the bit is not set */ } - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } SPI_SETSCK; /* Clock transition before getting MISO */ datain = (uint16_t)SPI_GETMISO; /* Get bit 0 = MOSI value */ /* Clock is in resting state after getting MISO */ - if (priv->holdtime) + if (holdtime > 0) { - up_udelay(priv->holdtime); + spi_delay(holdtime); } return datain; @@ -532,6 +576,8 @@ static uint16_t spi_bitexchange3(FAR struct spi_bitbang_s *priv, #ifdef CONFIG_SPI_BITBANG_VARWIDTH static uint16_t spi_exchange(FAR struct spi_bitbang_s *priv, uint16_t dataout) { + bitexchange_t exchange = priv->exchange; + uint32_t holdtime = priv->holdtime; uint16_t datain; uint16_t bit; int shift; @@ -550,7 +596,7 @@ static uint16_t spi_exchange(FAR struct spi_bitbang_s *priv, uint16_t dataout) */ datain <<= 1; - datain |= priv->exchange(priv, dataout & bit); + datain |= exchange(dataout & bit, holdtime); } return datain; @@ -559,6 +605,8 @@ static uint16_t spi_exchange(FAR struct spi_bitbang_s *priv, uint16_t dataout) #else static uint16_t spi_exchange(FAR struct spi_bitbang_s *priv, uint16_t dataout) { + bitexchange_t exchange = priv->exchange; + uint32_t holdtime = priv->holdtime; uint8_t datain; /* Transfer each bit. This is better done with straight-line logic @@ -568,42 +616,42 @@ static uint16_t spi_exchange(FAR struct spi_bitbang_s *priv, uint16_t dataout) /* Exchange bit 7 with the slave */ - datain = priv->exchange(priv, dataout & (1 << 7)); + datain = priv->exchange(dataout & (1 << 7), holdtime); /* Exchange bit 6 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 6)); + datain |= priv->exchange(dataout & (1 << 6), holdtime); /* Exchange bit 5 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 5)); + datain |= priv->exchange(dataout & (1 << 5), holdtime); /* Exchange bit 4 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 4)); + datain |= priv->exchange(dataout & (1 << 4), holdtime); /* Exchange bit 3 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 3)); + datain |= priv->exchange(dataout & (1 << 3), holdtime); /* Exchange bit 2 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 2)); + datain |= priv->exchange(dataout & (1 << 2), holdtime); /* Exchange bit 1 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 1)); + datain |= priv->exchange(dataout & (1 << 1), holdtime); /* Exchange bit 0 with the slave */ datain <<= 1; - datain |= priv->exchange(priv, dataout & (1 << 0)); + datain |= priv->exchange(dataout & (1 << 0), holdtime); return datain; } diff --git a/nuttx/include/nuttx/spi/spi_bitbang.h b/nuttx/include/nuttx/spi/spi_bitbang.h index dee4463d1..b54a3b3d1 100755 --- a/nuttx/include/nuttx/spi/spi_bitbang.h +++ b/nuttx/include/nuttx/spi/spi_bitbang.h @@ -117,7 +117,7 @@ struct spi_bitbang_ops_s /* This is the type of the function that can exchange one bit */ -typedef uint8_t (*bitexchange_t)(FAR struct spi_bitbang_s *priv, uint8_t dataout); +typedef uint8_t (*bitexchange_t)(uint8_t dataout, uint32_t holdtime); /* This structure provides the state of the SPI bit-bang driver */ |