diff options
| author | Andrea Zoppi <texzk@email.it> | 2015-06-27 18:32:58 +0200 |
|---|---|---|
| committer | Andrea Zoppi <texzk@email.it> | 2015-06-27 18:32:58 +0200 |
| commit | ee1353a305ea6620a36e59469881566105827a03 (patch) | |
| tree | 85df9f2c4a7dde699311c2ed637e2ef0035ca147 /os/hal/ports/STM32 | |
| parent | 542d79ef90862518ffcfb500679e293e5a89c864 (diff) | |
| download | ChibiOS-Contrib-ee1353a305ea6620a36e59469881566105827a03.tar.gz ChibiOS-Contrib-ee1353a305ea6620a36e59469881566105827a03.tar.bz2 ChibiOS-Contrib-ee1353a305ea6620a36e59469881566105827a03.zip | |
Old definitions removed
Diffstat (limited to 'os/hal/ports/STM32')
| -rw-r--r-- | os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c | 2 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.h | 26 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.h | 34 |
3 files changed, 1 insertions, 61 deletions
diff --git a/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c b/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c index 9bef3d2..d964008 100644 --- a/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c +++ b/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c @@ -86,7 +86,7 @@ static const uint8_t dma2d_bpp[DMA2D_MAX_PIXFMT_ID + 1] = { *
* @isr
*/
-OSAL_IRQ_HANDLER(DMA2D_IRQHandler) {
+OSAL_IRQ_HANDLER(STM32_DMA2D_HANDLER) {
DMA2DDriver *const dma2dp = &DMA2DD1;
bool job_done = false;
diff --git a/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.h b/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.h index c118be2..c5aa159 100644 --- a/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.h +++ b/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.h @@ -171,28 +171,6 @@ /* Driver pre-compile time settings. */
/*===========================================================================*/
-/*
- * These definitions should already be defined by stm32_isr.h
- */
-#if !defined(STM32_DMA2D_NUMBER) && !defined(__DOXYGEN__)
-#define STM32_DMA2D_NUMBER (DMA2D_IRQn)
-#endif
-
-/*
- * These definitions should already be defined by hal_lld.h
- */
-#if !defined(DMA2D_IRQHandler) && !defined(__DOXYGEN__)
-#define DMA2D_IRQHandler Vector1A8
-#endif
-
-#if !defined(STM32_HAS_DMA2D) && !defined(__DOXYGEN__)
-#ifdef STM32F429_439xx
-#define STM32_HAS_DMA2D (TRUE)
-#else
-#define STM32_HAS_DMA2D (FALSE)
-#endif
-#endif
-
/**
* @name DMA2D configuration options
* @{
@@ -244,10 +222,6 @@ /* Derived constants and error checks. */
/*===========================================================================*/
-#ifndef STM32F429_439xx
-#error "Currently only STM32F429xx and STM32F439xx are supported"
-#endif
-
#if (TRUE != STM32_HAS_DMA2D)
#error "DMA2D must be present when using the DMA2D subsystem"
#endif
diff --git a/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.h b/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.h index a221c79..00af038 100644 --- a/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.h +++ b/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.h @@ -203,36 +203,6 @@ /* Driver pre-compile time settings. */
/*===========================================================================*/
-/*
- * These definitions should already be defined by stm32_isr.h
- */
-#if !defined(STM32_LTDC_EV_NUMBER) && !defined(__DOXYGEN__)
-#define STM32_LTDC_EV_NUMBER LTDC_IRQn
-#endif
-
-#if !defined(STM32_LTDC_ER_NUMBER) && !defined(__DOXYGEN__)
-#define STM32_LTDC_ER_NUMBER LTDC_ER_IRQn
-#endif
-
-/*
- * These definitions should already be defined by hal_lld.h
- */
-#if !defined(STM32_LTDC_EV_HANDLER) && !defined(__DOXYGEN__)
-#define STM32_LTDC_EV_HANDLER Vector1A0
-#endif
-
-#if !defined(STM32_LTDC_ER_HANDLER) && !defined(__DOXYGEN__)
-#define STM32_LTDC_ER_HANDLER Vector1A4
-#endif
-
-#if !defined(STM32_HAS_LTDC) && !defined(__DOXYGEN__)
-#ifdef STM32F429_439xx
-#define STM32_HAS_LTDC TRUE
-#else
-#define STM32_HAS_LTDC FALSE
-#endif
-#endif
-
/**
* @name LTDC configuration options
* @{
@@ -291,10 +261,6 @@ /* Derived constants and error checks. */
/*===========================================================================*/
-#ifndef STM32F429_439xx
-#error "Currently only STM32F429xx and STM32F439xx are supported"
-#endif
-
#if (TRUE != STM32_HAS_LTDC)
#error "LTDC must be present when using the LTDC subsystem"
#endif
|