Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into irqattach

Browse Source
This commit is contained in:
Gregory Nutt
2017-02-27 09:13:41 -06:00
parent 8b06dc7ee9 8ff7e5106d
commit e5be4f7fe2
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kconfig
+4 -4
View File
@@ -859,21 +859,21 @@ config DEBUG_IRQ
if DEBUG_IRQ if DEBUG_IRQ
config DEBUG_IRQ_ERROR config DEBUG_IRQ_ERROR
bool "DMA Error Output" bool "Interrupt Controller Error Output"
default n default n
depends on DEBUG_ERROR depends on DEBUG_ERROR
---help--- ---help---
Enable interrupt controller error output to SYSLOG. Enable interrupt controller error output to SYSLOG.
config DEBUG_IRQ_WARN config DEBUG_IRQ_WARN
bool "DMA Warnings Output" bool "Interrupt Controller Warnings Output"
default n default n
depends on DEBUG_WARN depends on DEBUG_WARN
---help--- ---help---
Enable interrupt controller warning output to SYSLOG. Enable interrupt controller warning output to SYSLOG.
config DEBUG_IRQ_INFO config DEBUG_IRQ_INFO
bool "DMA Informational Output" bool "Interrupt Controller Informational Output"
default n default n
depends on DEBUG_INFO depends on DEBUG_INFO
---help--- ---help---
@@ -1277,7 +1277,7 @@ endif # DEBUG_RTC
config DEBUG_MEMCARD config DEBUG_MEMCARD
bool "Memory Card Driver Debug Features" bool "Memory Card Driver Debug Features"
default n default n
depends on MMCSD_SDIO depends on MMCSD
---help--- ---help---
Enable MMC/SD memory card Driver debug features. Enable MMC/SD memory card Driver debug features.
arch/arm/src/stm32/stm32_gpio.c
+1
View File
@@ -788,5 +788,6 @@ bool stm32_gpioread(uint32_t pinset)
pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
return ((getreg32(base + STM32_GPIO_IDR_OFFSET) & (1 << pin)) != 0); return ((getreg32(base + STM32_GPIO_IDR_OFFSET) & (1 << pin)) != 0);
} }
return 0; return 0;
} }
arch/arm/src/stm32/stm32_pwm.c
+4
View File
@@ -1139,6 +1139,8 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET)); pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET));
} }
/* REVISIT: CNT and ARR may be 32-bits wide */
pwminfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", pwminfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n",
pwm_getreg(priv, STM32_GTIM_CCER_OFFSET), pwm_getreg(priv, STM32_GTIM_CCER_OFFSET),
pwm_getreg(priv, STM32_GTIM_CNT_OFFSET), pwm_getreg(priv, STM32_GTIM_CNT_OFFSET),
@@ -1152,6 +1154,8 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET)); pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET));
} }
/* REVISIT: CCR1-CCR4 may be 32-bits wide */
if (priv->timid == 16 || priv->timid == 17) if (priv->timid == 16 || priv->timid == 17)
{ {
pwminfo(" CCR1: %04x\n", pwminfo(" CCR1: %04x\n",
configs/teensy-3.x/src/k20_usbdev.c
-1
View File
@@ -59,7 +59,6 @@
#define khci_getreg(addr) getreg8(addr) #define khci_getreg(addr) getreg8(addr)
#define khci_putreg(val,addr) putreg8(val,addr) #define khci_putreg(val,addr) putreg8(val,addr)
#define SIM_CLKDIV2_USBDIV(n) (uint32_t)(((n) & 0x07) << 1)
/************************************************************************************ /************************************************************************************
* Public Functions * Public Functions