diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-04-14 09:01:19 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-04-14 09:01:19 +0000 |
| commit | c02afef7dfff3e1fd2645c9e94947342e0ee35ad (patch) | |
| tree | 852f2905d43f32b877b4cd445d51b0a8ec160c37 /os | |
| parent | e78992cf5b5d56b9a5e263b471ea441d2cc4610c (diff) | |
| download | ChibiOS-c02afef7dfff3e1fd2645c9e94947342e0ee35ad.tar.gz ChibiOS-c02afef7dfff3e1fd2645c9e94947342e0ee35ad.tar.bz2 ChibiOS-c02afef7dfff3e1fd2645c9e94947342e0ee35ad.zip | |
Fixed bug #400.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5589 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/platforms/STM32/I2Cv2/i2c_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F0xx/adc_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F0xx/ext_lld_isr.c | 14 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F0xx/stm32_dma.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/os/hal/platforms/STM32/I2Cv2/i2c_lld.c b/os/hal/platforms/STM32/I2Cv2/i2c_lld.c index 3a6c8f7f8..7ba62a44c 100644 --- a/os/hal/platforms/STM32/I2Cv2/i2c_lld.c +++ b/os/hal/platforms/STM32/I2Cv2/i2c_lld.c @@ -612,7 +612,7 @@ msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr, VirtualTimer vt;
uint32_t addr_cr2 = addr & I2C_CR2_SADD;
- chDbgCheck((rxbytes > 1), "i2c_lld_master_receive_timeout");
+ chDbgCheck((rxbytes > 0), "i2c_lld_master_receive_timeout");
/* Resetting error flags for this transfer.*/
i2cp->errors = I2CD_NO_ERROR;
diff --git a/os/hal/platforms/STM32F0xx/adc_lld.c b/os/hal/platforms/STM32F0xx/adc_lld.c index 2fad88cda..5fa419679 100644 --- a/os/hal/platforms/STM32F0xx/adc_lld.c +++ b/os/hal/platforms/STM32F0xx/adc_lld.c @@ -102,7 +102,7 @@ static void adc_lld_serve_rx_interrupt(ADCDriver *adcp, uint32_t flags) { *
* @isr
*/
-CH_IRQ_HANDLER(ADC1_COMP_IRQHandler) {
+CH_IRQ_HANDLER(Vector70) {
uint32_t isr;
CH_IRQ_PROLOGUE();
diff --git a/os/hal/platforms/STM32F0xx/ext_lld_isr.c b/os/hal/platforms/STM32F0xx/ext_lld_isr.c index d4fd06155..afccfdd8c 100644 --- a/os/hal/platforms/STM32F0xx/ext_lld_isr.c +++ b/os/hal/platforms/STM32F0xx/ext_lld_isr.c @@ -50,11 +50,11 @@ /*===========================================================================*/
/**
- * @brief EXTI[0] interrupt handler.
+ * @brief EXTI[0]...EXTI[1] interrupt handler.
*
* @isr
*/
-CH_IRQ_HANDLER(EXTI0_1_IRQHandler) {
+CH_IRQ_HANDLER(Vector54) {
uint32_t pr;
CH_IRQ_PROLOGUE();
@@ -70,11 +70,11 @@ CH_IRQ_HANDLER(EXTI0_1_IRQHandler) { }
/**
- * @brief EXTI[1] interrupt handler.
+ * @brief EXTI[2]...EXTI[3] interrupt handler.
*
* @isr
*/
-CH_IRQ_HANDLER(EXTI2_3_IRQHandler) {
+CH_IRQ_HANDLER(Vector58) {
uint32_t pr;
CH_IRQ_PROLOGUE();
@@ -94,7 +94,7 @@ CH_IRQ_HANDLER(EXTI2_3_IRQHandler) { *
* @isr
*/
-CH_IRQ_HANDLER(EXTI4_15_IRQHandler) {
+CH_IRQ_HANDLER(Vector5C) {
uint32_t pr;
CH_IRQ_PROLOGUE();
@@ -136,7 +136,7 @@ CH_IRQ_HANDLER(EXTI4_15_IRQHandler) { *
* @isr
*/
-CH_IRQ_HANDLER(PVD_IRQHandler) {
+CH_IRQ_HANDLER(Vector44) {
CH_IRQ_PROLOGUE();
@@ -151,7 +151,7 @@ CH_IRQ_HANDLER(PVD_IRQHandler) { *
* @isr
*/
-CH_IRQ_HANDLER(RTC_IRQHandler) {
+CH_IRQ_HANDLER(Vector48) {
CH_IRQ_PROLOGUE();
diff --git a/os/hal/platforms/STM32F0xx/stm32_dma.c b/os/hal/platforms/STM32F0xx/stm32_dma.c index 44f10cbf6..2305d952d 100644 --- a/os/hal/platforms/STM32F0xx/stm32_dma.c +++ b/os/hal/platforms/STM32F0xx/stm32_dma.c @@ -109,7 +109,7 @@ static dma_isr_redir_t dma_isr_redir[STM32_DMA_STREAMS]; *
* @isr
*/
-CH_IRQ_HANDLER(DMA1_Ch1_IRQHandler) {
+CH_IRQ_HANDLER(Vector64) {
uint32_t flags;
CH_IRQ_PROLOGUE();
@@ -127,7 +127,7 @@ CH_IRQ_HANDLER(DMA1_Ch1_IRQHandler) { *
* @isr
*/
-CH_IRQ_HANDLER(DMA1_Ch2_3_IRQHandler) {
+CH_IRQ_HANDLER(Vector68) {
uint32_t flags;
CH_IRQ_PROLOGUE();
@@ -156,7 +156,7 @@ CH_IRQ_HANDLER(DMA1_Ch2_3_IRQHandler) { *
* @isr
*/
-CH_IRQ_HANDLER(DMA1_Ch4_5_IRQHandler) {
+CH_IRQ_HANDLER(Vector6C) {
uint32_t flags;
CH_IRQ_PROLOGUE();
|