Fix STM32L15X vector definitions; Fix STM32L-Discovery LED controls. The NSH configuration is now fully functional on the STM32L-Discovery board.

3 files changed, 173 insertions, 173 deletions

diff --git a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h
index 0ec03c071..632bb3373 100644
--- a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h
+++ b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h
@@ -54,58 +54,58 @@
  * definition that provides the number of supported vectors.
  */
 
-#  ifdef CONFIG_ARMV7M_CMNVECTOR
+#ifdef CONFIG_ARMV7M_CMNVECTOR
 
 /* Reserve 61 interrupt table entries for I/O interrupts. */
 
-#    define ARMV7M_PERIPHERAL_INTERRUPTS 45
+# define ARMV7M_PERIPHERAL_INTERRUPTS 45
 
 #else
-#  VECTOR(stm32_wwdg, STM32_IRQ_WWDG)          /* 0:  Window Watchdog interrupt */
-#  VECTOR(stm32_pvd, STM32_IRQ_PVD)            /* 1:  PVD through EXTI Line detection interrupt */
-#  VECTOR(stm32_tamper, STM32_IRQ_TAMPER)      /* 2:  Tamper through EXTI line interrupt */
-#  VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP)  /* 3:  RTC Wakeup through EXTI line interrupt */
-#  VECTOR(stm32_flash, STM32_IRQ_FLASH)        /* 4:  Flash global interrupt */
-#  VECTOR(stm32_rcc, STM32_IRQ_RCC)            /* 5:  RCC global interrupt */
-#  VECTOR(stm32_exti0, STM32_IRQ_EXTI0)        /* 6:  EXTI Line 0 interrupt */
-#  VECTOR(stm32_exti1, STM32_IRQ_EXTI1)        /* 7:  EXTI Line 1 interrupt */
-#  VECTOR(stm32_exti2, STM32_IRQ_EXTI2)        /* 8:  EXTI Line 2 interrupt */
-#  VECTOR(stm32_exti3, STM32_IRQ_EXTI3)        /* 9:  EXTI Line 3 interrupt */
-#  VECTOR(stm32_exti4, STM32_IRQ_EXTI4)        /* 10: EXTI Line 4 interrupt */
-#  VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1)    /* 11: DMA1 channel 1 global interrupt */
-#  VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2)    /* 12: DMA1 channel 2 global interrupt */
-#  VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3)    /* 13: DMA1 channel 3 global interrupt */
-#  VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4)    /* 14: DMA1 channel 4 global interrupt */
-#  VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5)    /* 15: DMA1 channel 5 global interrupt */
-#  VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6)    /* 16: DMA1 channel 6 global interrupt */
-#  VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7)    /* 17: DMA1 channel 7 global interrupt */
-#  VECTOR(stm32_adc1, STM32_IRQ_ADC1)          /* 18: ADC1 global interrupt */
-#  VECTOR(stm32_usbhp, STM32_IRQ_USBHP)        /* 19: USB High Priority interrupts */
-#  VECTOR(stm32_usblp, STM32_IRQ_USBLP)        /* 20: USB Low Priority interrupt */
-#  VECTOR(stm32_dac, STM32_IRQ_DAC)            /* 21: DAC interrupt */
-#  VECTOR(stm32_comp, STM32_IRQ_COMP)          /* 22: Comparator wakeup through EXTI interrupt */
-#  VECTOR(stm32_exti95, STM32_IRQ_EXTI95)      /* 23: EXTI Line[9:5] interrupts */
-#  VECTOR(stm32_ldc, STM32_IRQ_LDC)            /* 24: LCD global interrupt */
-#  VECTOR(stm32_tim9, STM32_IRQ_TIM9)          /* 25: TIM9 global interrupt */
-#  VECTOR(stm32_tim10, STM32_IRQ_TIM10)        /* 26: TIM10 global interrupt */
-#  VECTOR(stm32_tim11, STM32_IRQ_TIM11)        /* 27: TIM11 global interrupt */
-#  VECTOR(stm32_tim2, STM32_IRQ_TIM2)          /* 28: TIM2 global interrupt */
-#  VECTOR(stm32_tim3, STM32_IRQ_TIM3)          /* 29: TIM3 global interrupt */
-#  VECTOR(stm32_tim4, STM32_IRQ_TIM4)          /* 30: TIM4 global interrupt */
-#  VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV)      /* 31: I2C1 event interrupt */
-#  VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER)      /* 32: I2C1 error interrupt */
-#  VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV)      /* 33: I2C2 event interrupt */
-#  VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER)      /* 34: I2C2 error interrupt */
-#  VECTOR(stm32_spi1, STM32_IRQ_SPI1)          /* 35: SPI1 global interrupt */
-#  VECTOR(stm32_spi2, STM32_IRQ_SPI2)          /* 36: SPI2 global interrupt */
-#  VECTOR(stm32_usart1, STM32_IRQ_USART1)      /* 37: USART1 global interrupt */
-#  VECTOR(stm32_usart2, STM32_IRQ_USART2)      /* 38: USART2 global interrupt */
-#  VECTOR(stm32_usart3, STM32_IRQ_USART3)      /* 39: USART3 global interrupt */
-#  VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)  /* 40: EXTI Line[15:10] interrupts */
-#  VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)    /* 41: RTC alarm through EXTI line interrupt */
-#  VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)    /* 42: USB wakeup from suspend through EXTI line interrupt */
-#  VECTOR(stm32_tim6, STM32_IRQ_TIM6)          /* 43: TIM6 global interrupt */
-#  VECTOR(stm32_TIM7, STM32_IRQ_TIM7)          /* 44: TIM7 global interrupt */
+  VECTOR(stm32_wwdg, STM32_IRQ_WWDG)          /* 0:  Window Watchdog interrupt */
+  VECTOR(stm32_pvd, STM32_IRQ_PVD)            /* 1:  PVD through EXTI Line detection interrupt */
+  VECTOR(stm32_tamper, STM32_IRQ_TAMPER)      /* 2:  Tamper through EXTI line interrupt */
+  VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP)  /* 3:  RTC Wakeup through EXTI line interrupt */
+  VECTOR(stm32_flash, STM32_IRQ_FLASH)        /* 4:  Flash global interrupt */
+  VECTOR(stm32_rcc, STM32_IRQ_RCC)            /* 5:  RCC global interrupt */
+  VECTOR(stm32_exti0, STM32_IRQ_EXTI0)        /* 6:  EXTI Line 0 interrupt */
+  VECTOR(stm32_exti1, STM32_IRQ_EXTI1)        /* 7:  EXTI Line 1 interrupt */
+  VECTOR(stm32_exti2, STM32_IRQ_EXTI2)        /* 8:  EXTI Line 2 interrupt */
+  VECTOR(stm32_exti3, STM32_IRQ_EXTI3)        /* 9:  EXTI Line 3 interrupt */
+  VECTOR(stm32_exti4, STM32_IRQ_EXTI4)        /* 10: EXTI Line 4 interrupt */
+  VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1)    /* 11: DMA1 channel 1 global interrupt */
+  VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2)    /* 12: DMA1 channel 2 global interrupt */
+  VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3)    /* 13: DMA1 channel 3 global interrupt */
+  VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4)    /* 14: DMA1 channel 4 global interrupt */
+  VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5)    /* 15: DMA1 channel 5 global interrupt */
+  VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6)    /* 16: DMA1 channel 6 global interrupt */
+  VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7)    /* 17: DMA1 channel 7 global interrupt */
+  VECTOR(stm32_adc1, STM32_IRQ_ADC1)          /* 18: ADC1 global interrupt */
+  VECTOR(stm32_usbhp, STM32_IRQ_USBHP)        /* 19: USB High Priority interrupts */
+  VECTOR(stm32_usblp, STM32_IRQ_USBLP)        /* 20: USB Low Priority interrupt */
+  VECTOR(stm32_dac, STM32_IRQ_DAC)            /* 21: DAC interrupt */
+  VECTOR(stm32_comp, STM32_IRQ_COMP)          /* 22: Comparator wakeup through EXTI interrupt */
+  VECTOR(stm32_exti95, STM32_IRQ_EXTI95)      /* 23: EXTI Line[9:5] interrupts */
+  VECTOR(stm32_ldc, STM32_IRQ_LDC)            /* 24: LCD global interrupt */
+  VECTOR(stm32_tim9, STM32_IRQ_TIM9)          /* 25: TIM9 global interrupt */
+  VECTOR(stm32_tim10, STM32_IRQ_TIM10)        /* 26: TIM10 global interrupt */
+  VECTOR(stm32_tim11, STM32_IRQ_TIM11)        /* 27: TIM11 global interrupt */
+  VECTOR(stm32_tim2, STM32_IRQ_TIM2)          /* 28: TIM2 global interrupt */
+  VECTOR(stm32_tim3, STM32_IRQ_TIM3)          /* 29: TIM3 global interrupt */
+  VECTOR(stm32_tim4, STM32_IRQ_TIM4)          /* 30: TIM4 global interrupt */
+  VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV)      /* 31: I2C1 event interrupt */
+  VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER)      /* 32: I2C1 error interrupt */
+  VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV)      /* 33: I2C2 event interrupt */
+  VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER)      /* 34: I2C2 error interrupt */
+  VECTOR(stm32_spi1, STM32_IRQ_SPI1)          /* 35: SPI1 global interrupt */
+  VECTOR(stm32_spi2, STM32_IRQ_SPI2)          /* 36: SPI2 global interrupt */
+  VECTOR(stm32_usart1, STM32_IRQ_USART1)      /* 37: USART1 global interrupt */
+  VECTOR(stm32_usart2, STM32_IRQ_USART2)      /* 38: USART2 global interrupt */
+  VECTOR(stm32_usart3, STM32_IRQ_USART3)      /* 39: USART3 global interrupt */
+  VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)  /* 40: EXTI Line[15:10] interrupts */
+  VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)    /* 41: RTC alarm through EXTI line interrupt */
+  VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)    /* 42: USB wakeup from suspend through EXTI line interrupt */
+  VECTOR(stm32_tim6, STM32_IRQ_TIM6)          /* 43: TIM6 global interrupt */
+  VECTOR(stm32_TIM7, STM32_IRQ_TIM7)          /* 44: TIM7 global interrupt */
 #endif
 
 /* Vectors for medium+ density devices */
@@ -116,67 +116,67 @@
  * definition that provides the number of supported vectors.
  */
 
-#  ifdef CONFIG_ARMV7M_CMNVECTOR
+#ifdef CONFIG_ARMV7M_CMNVECTOR
 
 /* Reserve 61 interrupt table entries for I/O interrupts. */
 
-#    define ARMV7M_PERIPHERAL_INTERRUPTS 54
+# define ARMV7M_PERIPHERAL_INTERRUPTS 54
 
 #else
-#  VECTOR(stm32_wwdg, STM32_IRQ_WWDG)          /* 0:  Window Watchdog interrupt */
-#  VECTOR(stm32_pvd, STM32_IRQ_PVD)            /* 1:  PVD through EXTI Line detection interrupt */
-#  VECTOR(stm32_tamper, STM32_IRQ_TAMPER)      /* 2:  Tamper through EXTI line interrupt */
-#  VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP)  /* 3:  RTC Wakeup through EXTI line interrupt */
-#  VECTOR(stm32_flash, STM32_IRQ_FLASH)        /* 4:  Flash global interrupt */
-#  VECTOR(stm32_rcc, STM32_IRQ_RCC)            /* 5:  RCC global interrupt */
-#  VECTOR(stm32_exti0, STM32_IRQ_EXTI0)        /* 6:  EXTI Line 0 interrupt */
-#  VECTOR(stm32_exti1, STM32_IRQ_EXTI1)        /* 7:  EXTI Line 1 interrupt */
-#  VECTOR(stm32_exti2, STM32_IRQ_EXTI2)        /* 8:  EXTI Line 2 interrupt */
-#  VECTOR(stm32_exti3, STM32_IRQ_EXTI3)        /* 9:  EXTI Line 3 interrupt */
-#  VECTOR(stm32_exti4, STM32_IRQ_EXTI4)        /* 10: EXTI Line 4 interrupt */
-#  VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1)    /* 11: DMA1 channel 1 global interrupt */
-#  VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2)    /* 12: DMA1 channel 2 global interrupt */
-#  VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3)    /* 13: DMA1 channel 3 global interrupt */
-#  VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4)    /* 14: DMA1 channel 4 global interrupt */
-#  VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5)    /* 15: DMA1 channel 5 global interrupt */
-#  VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6)    /* 16: DMA1 channel 6 global interrupt */
-#  VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7)    /* 17: DMA1 channel 7 global interrupt */
-#  VECTOR(stm32_adc1, STM32_IRQ_ADC1)          /* 18: ADC1 global interrupt */
-#  VECTOR(stm32_usbhp, STM32_IRQ_USBHP)        /* 19: USB High Priority interrupts */
-#  VECTOR(stm32_usblp, STM32_IRQ_USBLP)        /* 20: USB Low Priority interrupt */
-#  VECTOR(stm32_dac, STM32_IRQ_DAC)            /* 21: DAC interrupt */
-#  VECTOR(stm32_comp, STM32_IRQ_COMP)          /* 22: Comparator wakeup through EXTI interrupt */
-#  VECTOR(stm32_exti95, STM32_IRQ_EXTI95)      /* 23: EXTI Line[9:5] interrupts */
-#  VECTOR(stm32_ldc, STM32_IRQ_LDC)            /* 24: LCD global interrupt */
-#  VECTOR(stm32_tim9, STM32_IRQ_TIM9)          /* 25: TIM9 global interrupt */
-#  VECTOR(stm32_tim10, STM32_IRQ_TIM10)        /* 26: TIM10 global interrupt */
-#  VECTOR(stm32_tim11, STM32_IRQ_TIM11)        /* 27: TIM11 global interrupt */
-#  VECTOR(stm32_tim2, STM32_IRQ_TIM2)          /* 28: TIM2 global interrupt */
-#  VECTOR(stm32_tim3, STM32_IRQ_TIM3)          /* 29: TIM3 global interrupt */
-#  VECTOR(stm32_tim4, STM32_IRQ_TIM4)          /* 30: TIM4 global interrupt */
-#  VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV)      /* 31: I2C1 event interrupt */
-#  VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER)      /* 32: I2C1 error interrupt */
-#  VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV)      /* 33: I2C2 event interrupt */
-#  VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER)      /* 34: I2C2 error interrupt */
-#  VECTOR(stm32_spi1, STM32_IRQ_SPI1)          /* 35: SPI1 global interrupt */
-#  VECTOR(stm32_spi2, STM32_IRQ_SPI2)          /* 36: SPI2 global interrupt */
-#  VECTOR(stm32_usart1, STM32_IRQ_USART1)      /* 37: USART1 global interrupt */
-#  VECTOR(stm32_usart2, STM32_IRQ_USART2)      /* 38: USART2 global interrupt */
-#  VECTOR(stm32_usart3, STM32_IRQ_USART3)      /* 39: USART3 global interrupt */
-#  VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)  /* 40: EXTI Line[15:10] interrupts */
-#  VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)    /* 41: RTC alarm through EXTI line interrupt */
-#  VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)    /* 42: USB wakeup from suspend through EXTI line interrupt */
-#  VECTOR(stm32_tim6, STM32_IRQ_TIM6)          /* 43: TIM6 global interrupt */
-#  VECTOR(stm32_tim7, STM32_IRQ_TIM7)          /* 44: TIM7 global interrupt */
-#  VECTOR(stm32_tim5, STM32_IRQ_TIM5)          /* 45: TIM5 global interrupt */
-#  VECTOR(stm32_spi3, STM32_IRQ_SPI3)          /* 46: SPI3 global interrupt */
-#  VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1)    /* 47: DMA2 channel 1 global interrupt */
-#  VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2)    /* 48: DMA2 channel 2 global interrupt */
-#  VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3)    /* 49: DMA2 channel 3 global interrupt */
-#  VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4)    /* 50: DMA2 channel 4 global interrupt */
-#  VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5)    /* 51: DMA2 channel 5 global interrupt */
-#  VECTOR(stm32_aes, STM32_IRQ_AES)            /* 52: AES global interrupt */
-#  VECTOR(stm32_compacq, STM32_IRQ_COMPACQ)    /* 53: Comparator Channel Acquisition Interrupt */
+  VECTOR(stm32_wwdg, STM32_IRQ_WWDG)          /* 0:  Window Watchdog interrupt */
+  VECTOR(stm32_pvd, STM32_IRQ_PVD)            /* 1:  PVD through EXTI Line detection interrupt */
+  VECTOR(stm32_tamper, STM32_IRQ_TAMPER)      /* 2:  Tamper through EXTI line interrupt */
+  VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP)  /* 3:  RTC Wakeup through EXTI line interrupt */
+  VECTOR(stm32_flash, STM32_IRQ_FLASH)        /* 4:  Flash global interrupt */
+  VECTOR(stm32_rcc, STM32_IRQ_RCC)            /* 5:  RCC global interrupt */
+  VECTOR(stm32_exti0, STM32_IRQ_EXTI0)        /* 6:  EXTI Line 0 interrupt */
+  VECTOR(stm32_exti1, STM32_IRQ_EXTI1)        /* 7:  EXTI Line 1 interrupt */
+  VECTOR(stm32_exti2, STM32_IRQ_EXTI2)        /* 8:  EXTI Line 2 interrupt */
+  VECTOR(stm32_exti3, STM32_IRQ_EXTI3)        /* 9:  EXTI Line 3 interrupt */
+  VECTOR(stm32_exti4, STM32_IRQ_EXTI4)        /* 10: EXTI Line 4 interrupt */
+  VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1)    /* 11: DMA1 channel 1 global interrupt */
+  VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2)    /* 12: DMA1 channel 2 global interrupt */
+  VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3)    /* 13: DMA1 channel 3 global interrupt */
+  VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4)    /* 14: DMA1 channel 4 global interrupt */
+  VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5)    /* 15: DMA1 channel 5 global interrupt */
+  VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6)    /* 16: DMA1 channel 6 global interrupt */
+  VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7)    /* 17: DMA1 channel 7 global interrupt */
+  VECTOR(stm32_adc1, STM32_IRQ_ADC1)          /* 18: ADC1 global interrupt */
+  VECTOR(stm32_usbhp, STM32_IRQ_USBHP)        /* 19: USB High Priority interrupts */
+  VECTOR(stm32_usblp, STM32_IRQ_USBLP)        /* 20: USB Low Priority interrupt */
+  VECTOR(stm32_dac, STM32_IRQ_DAC)            /* 21: DAC interrupt */
+  VECTOR(stm32_comp, STM32_IRQ_COMP)          /* 22: Comparator wakeup through EXTI interrupt */
+  VECTOR(stm32_exti95, STM32_IRQ_EXTI95)      /* 23: EXTI Line[9:5] interrupts */
+  VECTOR(stm32_ldc, STM32_IRQ_LDC)            /* 24: LCD global interrupt */
+  VECTOR(stm32_tim9, STM32_IRQ_TIM9)          /* 25: TIM9 global interrupt */
+  VECTOR(stm32_tim10, STM32_IRQ_TIM10)        /* 26: TIM10 global interrupt */
+  VECTOR(stm32_tim11, STM32_IRQ_TIM11)        /* 27: TIM11 global interrupt */
+  VECTOR(stm32_tim2, STM32_IRQ_TIM2)          /* 28: TIM2 global interrupt */
+  VECTOR(stm32_tim3, STM32_IRQ_TIM3)          /* 29: TIM3 global interrupt */
+  VECTOR(stm32_tim4, STM32_IRQ_TIM4)          /* 30: TIM4 global interrupt */
+  VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV)      /* 31: I2C1 event interrupt */
+  VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER)      /* 32: I2C1 error interrupt */
+  VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV)      /* 33: I2C2 event interrupt */
+  VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER)      /* 34: I2C2 error interrupt */
+  VECTOR(stm32_spi1, STM32_IRQ_SPI1)          /* 35: SPI1 global interrupt */
+  VECTOR(stm32_spi2, STM32_IRQ_SPI2)          /* 36: SPI2 global interrupt */
+  VECTOR(stm32_usart1, STM32_IRQ_USART1)      /* 37: USART1 global interrupt */
+  VECTOR(stm32_usart2, STM32_IRQ_USART2)      /* 38: USART2 global interrupt */
+  VECTOR(stm32_usart3, STM32_IRQ_USART3)      /* 39: USART3 global interrupt */
+  VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)  /* 40: EXTI Line[15:10] interrupts */
+  VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)    /* 41: RTC alarm through EXTI line interrupt */
+  VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)    /* 42: USB wakeup from suspend through EXTI line interrupt */
+  VECTOR(stm32_tim6, STM32_IRQ_TIM6)          /* 43: TIM6 global interrupt */
+  VECTOR(stm32_tim7, STM32_IRQ_TIM7)          /* 44: TIM7 global interrupt */
+  VECTOR(stm32_tim5, STM32_IRQ_TIM5)          /* 45: TIM5 global interrupt */
+  VECTOR(stm32_spi3, STM32_IRQ_SPI3)          /* 46: SPI3 global interrupt */
+  VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1)    /* 47: DMA2 channel 1 global interrupt */
+  VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2)    /* 48: DMA2 channel 2 global interrupt */
+  VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3)    /* 49: DMA2 channel 3 global interrupt */
+  VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4)    /* 50: DMA2 channel 4 global interrupt */
+  VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5)    /* 51: DMA2 channel 5 global interrupt */
+  VECTOR(stm32_aes, STM32_IRQ_AES)            /* 52: AES global interrupt */
+  VECTOR(stm32_compacq, STM32_IRQ_COMPACQ)    /* 53: Comparator Channel Acquisition Interrupt */
 #endif
 
 /* Vectors for high density devices */
@@ -187,70 +187,70 @@
  * definition that provides the number of supported vectors.
  */
 
-#  ifdef CONFIG_ARMV7M_CMNVECTOR
+#ifdef CONFIG_ARMV7M_CMNVECTOR
 
 /* Reserve 61 interrupt table entries for I/O interrupts. */
 
-#    define ARMV7M_PERIPHERAL_INTERRUPTS 57
+# define ARMV7M_PERIPHERAL_INTERRUPTS 57
 
 #else
-#  VECTOR(stm32_wwdg, STM32_IRQ_WWDG)          /* 0:  Window Watchdog interrupt */
-#  VECTOR(stm32_pvd, STM32_IRQ_PVD)            /* 1:  PVD through EXTI Line detection interrupt */
-#  VECTOR(stm32_tamper, STM32_IRQ_TAMPER)      /* 2:  Tamper through EXTI line interrupt */
-#  VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP)  /* 3:  RTC Wakeup through EXTI line interrupt */
-#  VECTOR(stm32_flash, STM32_IRQ_FLASH)        /* 4:  Flash global interrupt */
-#  VECTOR(stm32_rcc, STM32_IRQ_RCC)            /* 5:  RCC global interrupt */
-#  VECTOR(stm32_exti0, STM32_IRQ_EXTI0)        /* 6:  EXTI Line 0 interrupt */
-#  VECTOR(stm32_exti1, STM32_IRQ_EXTI1)        /* 7:  EXTI Line 1 interrupt */
-#  VECTOR(stm32_exti2, STM32_IRQ_EXTI2)        /* 8:  EXTI Line 2 interrupt */
-#  VECTOR(stm32_exti3, STM32_IRQ_EXTI3)        /* 9:  EXTI Line 3 interrupt */
-#  VECTOR(stm32_exti4, STM32_IRQ_EXTI4)        /* 10: EXTI Line 4 interrupt */
-#  VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1)    /* 11: DMA1 channel 1 global interrupt */
-#  VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2)    /* 12: DMA1 channel 2 global interrupt */
-#  VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3)    /* 13: DMA1 channel 3 global interrupt */
-#  VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4)    /* 14: DMA1 channel 4 global interrupt */
-#  VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5)    /* 15: DMA1 channel 5 global interrupt */
-#  VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6)    /* 16: DMA1 channel 6 global interrupt */
-#  VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7)    /* 17: DMA1 channel 7 global interrupt */
-#  VECTOR(stm32_adc1, STM32_IRQ_ADC1)          /* 18: ADC1 global interrupt */
-#  VECTOR(stm32_usbhp, STM32_IRQ_USBHP)        /* 19: USB High Priority interrupts */
-#  VECTOR(stm32_usblp, STM32_IRQ_USBLP)        /* 20: USB Low Priority interrupt */
-#  VECTOR(stm32_dac, STM32_IRQ_DAC)            /* 21: DAC interrupt */
-#  VECTOR(stm32_comp, STM32_IRQ_COMP)          /* 22: Comparator wakeup through EXTI interrupt */
-#  VECTOR(stm32_exti95, STM32_IRQ_EXTI95)      /* 23: EXTI Line[9:5] interrupts */
-#  VECTOR(stm32_ldc, STM32_IRQ_LDC)            /* 24: LCD global interrupt */
-#  VECTOR(stm32_tim9, STM32_IRQ_TIM9)          /* 25: TIM9 global interrupt */
-#  VECTOR(stm32_tim10, STM32_IRQ_TIM10)        /* 26: TIM10 global interrupt */
-#  VECTOR(stm32_tim11, STM32_IRQ_TIM11)        /* 27: TIM11 global interrupt */
-#  VECTOR(stm32_tim2, STM32_IRQ_TIM2)          /* 28: TIM2 global interrupt */
-#  VECTOR(stm32_tim3, STM32_IRQ_TIM3)          /* 29: TIM3 global interrupt */
-#  VECTOR(stm32_tim4, STM32_IRQ_TIM4)          /* 30: TIM4 global interrupt */
-#  VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV)      /* 31: I2C1 event interrupt */
-#  VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER)      /* 32: I2C1 error interrupt */
-#  VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV)      /* 33: I2C2 event interrupt */
-#  VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER)      /* 34: I2C2 error interrupt */
-#  VECTOR(stm32_spi1, STM32_IRQ_SPI1)          /* 35: SPI1 global interrupt */
-#  VECTOR(stm32_spi2, STM32_IRQ_SPI2)          /* 36: SPI2 global interrupt */
-#  VECTOR(stm32_usart1, STM32_IRQ_USART1)      /* 37: USART1 global interrupt */
-#  VECTOR(stm32_usart2, STM32_IRQ_USART2)      /* 38: USART2 global interrupt */
-#  VECTOR(stm32_usart3, STM32_IRQ_USART3)      /* 39: USART3 global interrupt */
-#  VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)  /* 40: EXTI Line[15:10] interrupts */
-#  VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)    /* 41: RTC alarm through EXTI line interrupt */
-#  VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)    /* 42: USB wakeup from suspend through EXTI line interrupt */
-#  VECTOR(stm32_tim6, STM32_IRQ_TIM6)          /* 43: TIM6 global interrupt */
-#  VECTOR(stm32_tim7, STM32_IRQ_TIM7)          /* 44: TIM7 global interrupt */
-#  VECTOR(stm32_sdio, STM32_IRQ_SDIO)          /* 45: SDIO Global interrupt */
-#  VECTOR(stm32_tim5, STM32_IRQ_TIM5)          /* 46: TIM5 global interrupt */
-#  VECTOR(stm32_spi3, STM32_IRQ_SPI3)          /* 47: SPI3 global interrupt */
-#  VECTOR(stm32_usart4, STM32_IRQ_USART4)      /* 48: USART4 global interrupt */
-#  VECTOR(stm32_usart5, STM32_IRQ_USART5)      /* 49: USART5 global interrupt */
-#  VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1)    /* 50: DMA2 channel 1 global interrupt */
-#  VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2)    /* 51: DMA2 channel 2 global interrupt */
-#  VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3)    /* 52: DMA2 channel 3 global interrupt */
-#  VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4)    /* 53: DMA2 channel 4 global interrupt */
-#  VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5)    /* 54: DMA2 channel 5 global interrupt */
-#  VECTOR(stm32_aes, STM32_IRQ_AES)            /* 55: AES global interrupt */
-#  VECTOR(stm32_compacq, STM32_IRQ_COMPACQ)    /* 56: Comparator Channel Acquisition Interrupt */
+  VECTOR(stm32_wwdg, STM32_IRQ_WWDG)          /* 0:  Window Watchdog interrupt */
+  VECTOR(stm32_pvd, STM32_IRQ_PVD)            /* 1:  PVD through EXTI Line detection interrupt */
+  VECTOR(stm32_tamper, STM32_IRQ_TAMPER)      /* 2:  Tamper through EXTI line interrupt */
+  VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP)  /* 3:  RTC Wakeup through EXTI line interrupt */
+  VECTOR(stm32_flash, STM32_IRQ_FLASH)        /* 4:  Flash global interrupt */
+  VECTOR(stm32_rcc, STM32_IRQ_RCC)            /* 5:  RCC global interrupt */
+  VECTOR(stm32_exti0, STM32_IRQ_EXTI0)        /* 6:  EXTI Line 0 interrupt */
+  VECTOR(stm32_exti1, STM32_IRQ_EXTI1)        /* 7:  EXTI Line 1 interrupt */
+  VECTOR(stm32_exti2, STM32_IRQ_EXTI2)        /* 8:  EXTI Line 2 interrupt */
+  VECTOR(stm32_exti3, STM32_IRQ_EXTI3)        /* 9:  EXTI Line 3 interrupt */
+  VECTOR(stm32_exti4, STM32_IRQ_EXTI4)        /* 10: EXTI Line 4 interrupt */
+  VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1)    /* 11: DMA1 channel 1 global interrupt */
+  VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2)    /* 12: DMA1 channel 2 global interrupt */
+  VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3)    /* 13: DMA1 channel 3 global interrupt */
+  VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4)    /* 14: DMA1 channel 4 global interrupt */
+  VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5)    /* 15: DMA1 channel 5 global interrupt */
+  VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6)    /* 16: DMA1 channel 6 global interrupt */
+  VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7)    /* 17: DMA1 channel 7 global interrupt */
+  VECTOR(stm32_adc1, STM32_IRQ_ADC1)          /* 18: ADC1 global interrupt */
+  VECTOR(stm32_usbhp, STM32_IRQ_USBHP)        /* 19: USB High Priority interrupts */
+  VECTOR(stm32_usblp, STM32_IRQ_USBLP)        /* 20: USB Low Priority interrupt */
+  VECTOR(stm32_dac, STM32_IRQ_DAC)            /* 21: DAC interrupt */
+  VECTOR(stm32_comp, STM32_IRQ_COMP)          /* 22: Comparator wakeup through EXTI interrupt */
+  VECTOR(stm32_exti95, STM32_IRQ_EXTI95)      /* 23: EXTI Line[9:5] interrupts */
+  VECTOR(stm32_ldc, STM32_IRQ_LDC)            /* 24: LCD global interrupt */
+  VECTOR(stm32_tim9, STM32_IRQ_TIM9)          /* 25: TIM9 global interrupt */
+  VECTOR(stm32_tim10, STM32_IRQ_TIM10)        /* 26: TIM10 global interrupt */
+  VECTOR(stm32_tim11, STM32_IRQ_TIM11)        /* 27: TIM11 global interrupt */
+  VECTOR(stm32_tim2, STM32_IRQ_TIM2)          /* 28: TIM2 global interrupt */
+  VECTOR(stm32_tim3, STM32_IRQ_TIM3)          /* 29: TIM3 global interrupt */
+  VECTOR(stm32_tim4, STM32_IRQ_TIM4)          /* 30: TIM4 global interrupt */
+  VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV)      /* 31: I2C1 event interrupt */
+  VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER)      /* 32: I2C1 error interrupt */
+  VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV)      /* 33: I2C2 event interrupt */
+  VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER)      /* 34: I2C2 error interrupt */
+  VECTOR(stm32_spi1, STM32_IRQ_SPI1)          /* 35: SPI1 global interrupt */
+  VECTOR(stm32_spi2, STM32_IRQ_SPI2)          /* 36: SPI2 global interrupt */
+  VECTOR(stm32_usart1, STM32_IRQ_USART1)      /* 37: USART1 global interrupt */
+  VECTOR(stm32_usart2, STM32_IRQ_USART2)      /* 38: USART2 global interrupt */
+  VECTOR(stm32_usart3, STM32_IRQ_USART3)      /* 39: USART3 global interrupt */
+  VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)  /* 40: EXTI Line[15:10] interrupts */
+  VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)    /* 41: RTC alarm through EXTI line interrupt */
+  VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)    /* 42: USB wakeup from suspend through EXTI line interrupt */
+  VECTOR(stm32_tim6, STM32_IRQ_TIM6)          /* 43: TIM6 global interrupt */
+  VECTOR(stm32_tim7, STM32_IRQ_TIM7)          /* 44: TIM7 global interrupt */
+  VECTOR(stm32_sdio, STM32_IRQ_SDIO)          /* 45: SDIO Global interrupt */
+  VECTOR(stm32_tim5, STM32_IRQ_TIM5)          /* 46: TIM5 global interrupt */
+  VECTOR(stm32_spi3, STM32_IRQ_SPI3)          /* 47: SPI3 global interrupt */
+  VECTOR(stm32_usart4, STM32_IRQ_USART4)      /* 48: USART4 global interrupt */
+  VECTOR(stm32_usart5, STM32_IRQ_USART5)      /* 49: USART5 global interrupt */
+  VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1)    /* 50: DMA2 channel 1 global interrupt */
+  VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2)    /* 51: DMA2 channel 2 global interrupt */
+  VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3)    /* 52: DMA2 channel 3 global interrupt */
+  VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4)    /* 53: DMA2 channel 4 global interrupt */
+  VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5)    /* 54: DMA2 channel 5 global interrupt */
+  VECTOR(stm32_aes, STM32_IRQ_AES)            /* 55: AES global interrupt */
+  VECTOR(stm32_compacq, STM32_IRQ_COMPACQ)    /* 56: Comparator Channel Acquisition Interrupt */
 #endif
 
 #else
diff --git a/nuttx/arch/arm/src/stm32/stm32_vectors.S b/nuttx/arch/arm/src/stm32/stm32_vectors.S
index 85d110be2..37c53e8d5 100644
--- a/nuttx/arch/arm/src/stm32/stm32_vectors.S
+++ b/nuttx/arch/arm/src/stm32/stm32_vectors.S
@@ -139,15 +139,15 @@ stm32_vectors:
 #define UNUSED(i) .word stm32_reserved
 
 #if defined(CONFIG_STM32_STM32L15XX)
-#  include "chip/chip/stm32l15xxx_vectors.h"
+#  include "chip/stm32l15xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F10XX)
-#  include "chip/chip/stm32f10xxx_vectors.h"
+#  include "chip/stm32f10xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F20XX)
-#  include "chip/chip/stm32f20xxx_vectors.h"
+#  include "chip/stm32f20xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F30XX)
-#  include "chip/chip/stm32f30xxx_vectors.h"
+#  include "chip/stm32f30xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F40XX)
-#  include "chip/chip/stm32f40xxx_vectors.h"
+#  include "chip/stm32f40xxx_vectors.h"
 #else
 #  error "No vectors for STM32 chip"
 #endif
@@ -179,15 +179,15 @@ handlers:
 #define UNUSED(i)
 
 #if defined(CONFIG_STM32_STM32L15XX)
-#  include "chip/chip/stm32l15xxx_vectors.h"
+#  include "chip/stm32l15xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F10XX)
-#  include "chip/chip/stm32f10xxx_vectors.h"
+#  include "chip/stm32f10xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F20XX)
-#  include "chip/chip/stm32f20xxx_vectors.h"
+#  include "chip/stm32f20xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F30XX)
-#  include "chip/chip/stm32f30xxx_vectors.h"
+#  include "chip/stm32f30xxx_vectors.h"
 #elif defined(CONFIG_STM32_STM32F40XX)
-#  include "chip/chip/stm32f40xxx_vectors.h"
+#  include "chip/stm32f40xxx_vectors.h"
 #else
 #  error "No handlers for STM32 chip"
 #endif
diff --git a/nuttx/arch/arm/src/stm32/stm32l15xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32l15xxx_rcc.c
index 1063c27c1..c41280bf4 100644
--- a/nuttx/arch/arm/src/stm32/stm32l15xxx_rcc.c
+++ b/nuttx/arch/arm/src/stm32/stm32l15xxx_rcc.c
@@ -500,7 +500,7 @@ static void stm32_stdclockconfig(void)
    * the PLL VCO frequency can be up to 96MHz.  USB and SDIO can be supported.
    *
    * Range 1: PLLVCO up to 96MHz in range 1 (1.8V)
-   * Range 2: PLLVCO up to 48MHz in range 2 (1.5V)
+   * Range 2: PLLVCO up to 48MHz in range 2 (1.5V) (default)
    * Range 3: PLLVCO up to 24MHz in range 3 (1.2V)
    */