Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 19:36:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:nuttx/nuttx

Browse Source
This commit is contained in:
Gregory Nutt
2016-11-02 14:25:17 -06:00
parent 6c51544e56 4daca8b31c
commit 00cc8598c7
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_adc.c
+11 -3
View File
@@ -2203,6 +2203,7 @@ static void adc_shutdown(FAR struct adc_dev_s *dev)
static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
{ {
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv; FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
uint32_t regval;
ainfo("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0); ainfo("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0);
@@ -2212,8 +2213,15 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
* end-of-conversion ADC. * end-of-conversion ADC.
*/ */
adc_modifyreg(priv, STM32_ADC_IER_OFFSET, 0, regval = ADC_IER_ALLINTS;
priv->hasdma ? ADC_IER_AWD | ADC_ISR_OVR : ADC_IER_ALLINTS); #ifdef ADC_HAVE_DMA
if (priv->hasdma)
{
regval &= ~(ADC_IER_EOC | ADC_IER_JEOC);
}
#endif
adc_modifyreg(priv, STM32_ADC_IER_OFFSET, 0, regval);
} }
else else
{ {
@@ -2803,7 +2811,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
/* by MR regval &= ~pending; */ /* by MR regval &= ~pending; */
/* by MR adc_putreg(priv, STM32_ADC_ISR_OFFSET, regval); /* by MR adc_putreg(priv, STM32_ADC_ISR_OFFSET, regval);
adc_putreg(priv, STM32_ADC_ISR_OFFSET, pending); */ adc_putreg(priv, STM32_ADC_ISR_OFFSET, pending); */
return OK; return OK;
} }
drivers/Kconfig
-2
View File
@@ -345,9 +345,7 @@ menuconfig SPI
should be enabled by all platforms that support SPI interfaces. should be enabled by all platforms that support SPI interfaces.
See include/nuttx/spi/spi.h for further SPI driver information. See include/nuttx/spi/spi.h for further SPI driver information.
if SPI
source drivers/spi/Kconfig source drivers/spi/Kconfig
endif
menuconfig I2S menuconfig I2S
bool "I2S Driver Support" bool "I2S Driver Support"
drivers/spi/Kconfig
+12 -12
View File
@@ -3,6 +3,18 @@
# see the file kconfig-language.txt in the NuttX tools repository. # see the file kconfig-language.txt in the NuttX tools repository.
# #
config ARCH_HAVE_SPI_CRCGENERATION
bool
default n
config ARCH_HAVE_SPI_CS_CONTROL
bool
default n
config ARCH_HAVE_SPI_BITORDER
bool
default n
if SPI if SPI
config SPI_SLAVE config SPI_SLAVE
@@ -55,10 +67,6 @@ config SPI_HWFEATURES
basically the OR of any specific hardware feature and eanbles basically the OR of any specific hardware feature and eanbles
the SPI hwfeatures() interface method. the SPI hwfeatures() interface method.
config ARCH_HAVE_SPI_CRCGENERATION
bool
default n
config SPI_CRCGENERATION config SPI_CRCGENERATION
bool bool
default n default n
@@ -69,10 +77,6 @@ config SPI_CRCGENERATION
generation of SPI CRCs. Enables the HWFEAT_CRCGENERATION option generation of SPI CRCs. Enables the HWFEAT_CRCGENERATION option
as well as the hwfeartures() interface method. as well as the hwfeartures() interface method.
config ARCH_HAVE_SPI_CS_CONTROL
bool
default n
config SPI_CS_CONTROL config SPI_CS_CONTROL
bool "SPI CS Behavior Control" bool "SPI CS Behavior Control"
default n default n
@@ -82,10 +86,6 @@ config SPI_CS_CONTROL
Enables possibilities to define the behavior of CS. Enables possibilities to define the behavior of CS.
Also enables the hwfeatures() interface method. Also enables the hwfeatures() interface method.
config ARCH_HAVE_SPI_BITORDER
bool
default n
config SPI_BITORDER config SPI_BITORDER
bool "SPI Bit Order Control" bool "SPI Bit Order Control"
default n default n