[rtems commit] bsps/arm: Add LPC_DMA_CHANNEL_COUNT

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    afd1967155b3f2da67c3aade9bc92a4555640e8b
Changeset: http://git.rtems.org/rtems/commit/?id=afd1967155b3f2da67c3aade9bc92a4555640e8b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Sep 24 12:51:47 2012 +0200

bsps/arm: Add LPC_DMA_CHANNEL_COUNT

---

 c/src/lib/libbsp/arm/lpc24xx/configure.ac         |    4 ++++
 c/src/lib/libbsp/arm/lpc32xx/configure.ac         |    3 +++
 c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h |    5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/c/src/lib/libbsp/arm/lpc24xx/configure.ac b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
index ebebe25..973787e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
@@ -113,6 +113,10 @@ RTEMS_BSPOPTS_SET([LPC24XX_STOP_USB],[lpc23*],[])
 RTEMS_BSPOPTS_SET([LPC24XX_STOP_USB],[*],[1])
 RTEMS_BSPOPTS_HELP([LPC24XX_STOP_USB],[stop USB controller at start-up to avoid DMA interference])
 
+RTEMS_BSPOPTS_SET([LPC_DMA_CHANNEL_COUNT],[lpc17*],[8])
+RTEMS_BSPOPTS_SET([LPC_DMA_CHANNEL_COUNT],[*],[2])
+RTEMS_BSPOPTS_HELP([LPC_DMA_CHANNEL_COUNT],[DMA channel count])
+
 RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[lpc24xx_ncs_rom_ext],[0x80000040])
 RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP start])
 
diff --git a/c/src/lib/libbsp/arm/lpc32xx/configure.ac b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
index 0e4840b..c7fe790 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
@@ -85,6 +85,9 @@ RTEMS_BSPOPTS_HELP([LPC32XX_STOP_USB],[stop USB controller at start-up to avoid
 RTEMS_BSPOPTS_SET([LPC32XX_ENABLE_WATCHDOG_RESET],[*],[1])
 RTEMS_BSPOPTS_HELP([LPC32XX_ENABLE_WATCHDOG_RESET],[bsp_reset() will use the watchdog to reset the chip])
 
+RTEMS_BSPOPTS_SET([LPC_DMA_CHANNEL_COUNT],[*],[8])
+RTEMS_BSPOPTS_HELP([LPC_DMA_CHANNEL_COUNT],[DMA channel count])
+
 RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[*],[])
 RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP start])
 
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h b/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h
index b186899..7ac9e19 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h
+++ b/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2010-2011 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2010-2012 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Obere Lagerstr. 30
@@ -23,6 +23,7 @@
 #ifndef LIBBSP_ARM_SHARED_LPC_DMA_H
 #define LIBBSP_ARM_SHARED_LPC_DMA_H
 
+#include <bspopts.h>
 #include <bsp/utility.h>
 
 #ifdef __cplusplus
@@ -78,7 +79,7 @@ typedef struct {
   uint32_t cfg;
   uint32_t sync;
   uint32_t reserved [50];
-  lpc_dma_channel channels [];
+  lpc_dma_channel channels [LPC_DMA_CHANNEL_COUNT];
 } lpc_dma;
 
 /**