diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-04 16:40:18 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-04 16:40:18 +0000 |
| commit | 2f746addc82e9cf39a103922b6329b061a621a4d (patch) | |
| tree | 3cfaa7a878cfc042ff34bbe6bcee924fc94d8395 /nuttx/arch/arm/src | |
| parent | d2f783aa7ce0243c516770e6fc25f8dc53d62fd2 (diff) | |
| download | px4-nuttx-2f746addc82e9cf39a103922b6329b061a621a4d.tar.gz px4-nuttx-2f746addc82e9cf39a103922b6329b061a621a4d.tar.bz2 px4-nuttx-2f746addc82e9cf39a103922b6329b061a621a4d.zip | |
lpc313x update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2574 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src')
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c | 2 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/sam3u/sam3u_dmac.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c index 639b7b914..4347180e1 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -1,7 +1,7 @@ /******************************************************************************* * arch/arm/src/lpc214x/lpc214x_usbdev.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/arch/arm/src/sam3u/sam3u_dmac.c b/nuttx/arch/arm/src/sam3u/sam3u_dmac.c index 489d81bc1..510ac7e8a 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_dmac.c +++ b/nuttx/arch/arm/src/sam3u/sam3u_dmac.c @@ -69,6 +69,12 @@ #ifdef CONFIG_SAM3U_DMA +/* If AT90SAM3U support is enabled, then OS DMA support should also be enabled */ + +#ifndef CONFIG_ARCH_DMA +# warning "ATSAM3U DMA enabled but CONFIG_ARCH_DMA disabled" +#endif + /* Check the number of link list descriptors to allocate */ #ifndef CONFIG_SAM3U_NLLDESC |