summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-10-03 15:19:57 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-10-03 15:19:57 +0000
commitad07b3a95eff6c444e072271cd9c9cb2adf6971f (patch)
treefab399cd40b9b79b485e3acb0cb8b925db366eac /nuttx
parent1336cc4609cc2b4b5d9f6e77d2f89c8c239aba8f (diff)
downloadpx4-nuttx-ad07b3a95eff6c444e072271cd9c9cb2adf6971f.tar.gz
px4-nuttx-ad07b3a95eff6c444e072271cd9c9cb2adf6971f.tar.bz2
px4-nuttx-ad07b3a95eff6c444e072271cd9c9cb2adf6971f.zip
Update comments, dates, ... housekeeping
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4012 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_internal.h2
-rw-r--r--nuttx/arch/arm/src/sam3u/Make.defs2
-rw-r--r--nuttx/arch/arm/src/sam3u/sam3u_spi.c2
-rw-r--r--nuttx/arch/arm/src/sam3u/sam3u_spi.h2
-rw-r--r--nuttx/configs/sam3u-ek/src/sam3uek_internal.h2
-rw-r--r--nuttx/configs/sam3u-ek/src/up_boot.c2
-rw-r--r--nuttx/configs/sam3u-ek/src/up_spi.c2
-rw-r--r--nuttx/include/nuttx/spi.h6
8 files changed, 11 insertions, 9 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h b/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h
index 06bf3a9f4..aa2ddc489 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h
@@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/lpc17xx/lpc17_internal.h
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/arch/arm/src/sam3u/Make.defs b/nuttx/arch/arm/src/sam3u/Make.defs
index 4aac19b40..b3bdac72b 100644
--- a/nuttx/arch/arm/src/sam3u/Make.defs
+++ b/nuttx/arch/arm/src/sam3u/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/sam3u/Make.defs
#
-# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+# Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_spi.c b/nuttx/arch/arm/src/sam3u/sam3u_spi.c
index 3646134d1..e3ba0a1bf 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_spi.c
+++ b/nuttx/arch/arm/src/sam3u/sam3u_spi.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/sam3u/sam3u_spi.c
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_spi.h b/nuttx/arch/arm/src/sam3u/sam3u_spi.h
index 6fa0b6959..f0d3af496 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_spi.h
+++ b/nuttx/arch/arm/src/sam3u/sam3u_spi.h
@@ -1,7 +1,7 @@
/****************************************************************************************
* arch/arm/src/sam3u/sam3u_spi.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/sam3u-ek/src/sam3uek_internal.h b/nuttx/configs/sam3u-ek/src/sam3uek_internal.h
index 2bc6d397d..c7f9d4278 100644
--- a/nuttx/configs/sam3u-ek/src/sam3uek_internal.h
+++ b/nuttx/configs/sam3u-ek/src/sam3uek_internal.h
@@ -2,7 +2,7 @@
* configs/sam3uek_eval/src/sam3uek_internal.h
* arch/arm/src/board/sam3uek_internal.n
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/sam3u-ek/src/up_boot.c b/nuttx/configs/sam3u-ek/src/up_boot.c
index a6dde5e1f..87e91f039 100644
--- a/nuttx/configs/sam3u-ek/src/up_boot.c
+++ b/nuttx/configs/sam3u-ek/src/up_boot.c
@@ -2,7 +2,7 @@
* configs/sam3u-ek/src/up_boot.c
* arch/arm/src/board/up_boot.c
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/sam3u-ek/src/up_spi.c b/nuttx/configs/sam3u-ek/src/up_spi.c
index 99739983e..3b5089238 100644
--- a/nuttx/configs/sam3u-ek/src/up_spi.c
+++ b/nuttx/configs/sam3u-ek/src/up_spi.c
@@ -2,7 +2,7 @@
* configs/sam3u-ek/src/up_spi.c
* arch/arm/src/board/up_spi.c
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/include/nuttx/spi.h b/nuttx/include/nuttx/spi.h
index c5a9d0ff3..bd55ec5e2 100644
--- a/nuttx/include/nuttx/spi.h
+++ b/nuttx/include/nuttx/spi.h
@@ -49,14 +49,16 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-
/* Configuration ************************************************************/
-
/* CONFIG_SPI_OWNBUS - Set if there is only one active device on the SPI bus.
* No locking or SPI configuration will be performed. It is not necessary
* for clients to lock, re-configure, etc..
* CONFIG_SPI_EXCHANGE - Driver supports a single exchange method
* (vs a recvblock() and sndblock ()methods).
+ * CONFIG_SPI_CMDDATA - Devices on the SPI bus require out-of-band support
+ * to distinguish command transfers from data transfers. Such devices
+ * will often support either 9-bit SPI (yech) or 8-bit SPI and a GPIO
+ * output that selects between command and data.
*/
/* Access macros ************************************************************/