Skip to content

Commit cbb4756

Browse files
Ken SarkiesKen Sarkies
authored andcommitted
As requested (6 Feb 2013) change DMA interrupt flag names
in STM32/common, for dma_common_f24, to match those used in dma_common_f13. Examples compile OK
1 parent 113e5c2 commit cbb4756

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

include/libopencm3/stm32/common/dma_common_f24.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,20 +250,20 @@ being at the same relative location */
250250
251251
@{*/
252252
/** Transfer Complete Interrupt Flag */
253-
#define DMA_ISR_TCIF (1 << 5)
253+
#define DMA_TCIF (1 << 5)
254254
/** Half Transfer Interrupt Flag */
255-
#define DMA_ISR_HTIF (1 << 4)
255+
#define DMA_HTIF (1 << 4)
256256
/** Transfer Error Interrupt Flag */
257-
#define DMA_ISR_TEIF (1 << 3)
257+
#define DMA_TEIF (1 << 3)
258258
/** Direct Mode Error Interrupt Flag */
259-
#define DMA_ISR_DMEIF (1 << 2)
259+
#define DMA_DMEIF (1 << 2)
260260
/** FIFO Error Interrupt Flag */
261-
#define DMA_ISR_FEIF (1 << 0)
261+
#define DMA_FEIF (1 << 0)
262262
/**@}*/
263263

264264
/* Offset within interrupt status register to start of stream interrupt flag field */
265265
#define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*((stream & 0x02) >> 1))
266-
#define DMA_ISR_FLAGS (DMA_ISR_TCIF | DMA_ISR_HTIF | DMA_ISR_TEIF | DMA_ISR_DMEIF | DMA_ISR_FEIF)
266+
#define DMA_ISR_FLAGS (DMA_TCIF | DMA_HTIF | DMA_TEIF | DMA_DMEIF | DMA_FEIF)
267267
#define DMA_ISR_MASK(stream) DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream)
268268

269269
/* --- DMA_LISR values ----------------------------------------------------- */

lib/stm32/common/dma_common_f24.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ void dma_set_dma_flow_control(u32 dma, u8 stream)
490490

491491
void dma_enable_transfer_error_interrupt(u32 dma, u8 stream)
492492
{
493-
dma_clear_interrupt_flags(dma, stream, DMA_ISR_TEIF);
493+
dma_clear_interrupt_flags(dma, stream, DMA_TEIF);
494494
DMA_SCR(dma, stream) |= DMA_SxCR_TEIE;
495495
}
496496

@@ -515,7 +515,7 @@ void dma_disable_transfer_error_interrupt(u32 dma, u8 stream)
515515

516516
void dma_enable_half_transfer_interrupt(u32 dma, u8 stream)
517517
{
518-
dma_clear_interrupt_flags(dma, stream, DMA_ISR_HTIF);
518+
dma_clear_interrupt_flags(dma, stream, DMA_HTIF);
519519
DMA_SCR(dma, stream) |= DMA_SxCR_HTIE;
520520
}
521521

@@ -540,7 +540,7 @@ void dma_disable_half_transfer_interrupt(u32 dma, u8 stream)
540540

541541
void dma_enable_transfer_complete_interrupt(u32 dma, u8 stream)
542542
{
543-
dma_clear_interrupt_flags(dma, stream, DMA_ISR_TCIF);
543+
dma_clear_interrupt_flags(dma, stream, DMA_TCIF);
544544
DMA_SCR(dma, stream) |= DMA_SxCR_TCIE;
545545
}
546546

@@ -565,7 +565,7 @@ void dma_disable_transfer_complete_interrupt(u32 dma, u8 stream)
565565

566566
void dma_enable_direct_mode_error_interrupt(u32 dma, u8 stream)
567567
{
568-
dma_clear_interrupt_flags(dma, stream, DMA_ISR_DMEIF);
568+
dma_clear_interrupt_flags(dma, stream, DMA_DMEIF);
569569
DMA_SCR(dma, stream) |= DMA_SxCR_DMEIE;
570570
}
571571

@@ -590,7 +590,7 @@ void dma_disable_direct_mode_error_interrupt(u32 dma, u8 stream)
590590

591591
void dma_enable_fifo_error_interrupt(u32 dma, u8 stream)
592592
{
593-
dma_clear_interrupt_flags(dma, stream, DMA_ISR_FEIF);
593+
dma_clear_interrupt_flags(dma, stream, DMA_FEIF);
594594
DMA_SFCR(dma, stream) |= DMA_SxFCR_FEIE;
595595
}
596596

0 commit comments

Comments
 (0)