Add support for extended (29-bit) CAN IDs

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4319 42af7a65-404d-4744-a932-0658087f49c3

17 files changed, 46 insertions, 3 deletions

diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 27b3954d5..50938a603 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -646,13 +646,15 @@ defconfig -- This is a configuration file similar to the Linux
 
 		CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 		  CONFIG_STM32_CAN2 must also be defined)
+		CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+		  Standard 11-bit IDs.
 		CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 		  Default: 8
 		CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
 		  Default: 4
 		CONFIG_CAN_LOOPBACK - A CAN driver may or may not support a loopback
-		mode for testing. If the driver does support loopback mode, the setting
-		will enable it. (If the driver does not, this setting will have no effect).
+		  mode for testing. If the driver does support loopback mode, the setting
+		  will enable it. (If the driver does not, this setting will have no effect).
 
 	SPI driver
 
diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt
index 6fda883a6..6ed3bc452 100755
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@@ -472,6 +472,8 @@ HY-Mini specific Configuration Options
 
 	CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 	  CONFIG_STM32_CAN2 must also be defined)
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 	  Default: 8
 	CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 76cf35e7a..9df5648dc 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -647,6 +647,8 @@ LPCXpresso Configuration Options
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
 	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
 	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt
index 94d87b275..3366ed320 100755
--- a/nuttx/configs/mbed/README.txt
+++ b/nuttx/configs/mbed/README.txt
@@ -287,6 +287,8 @@ mbed Configuration Options
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
 	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
 	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt
index 35bb31d5c..df4776301 100755
--- a/nuttx/configs/nucleus2g/README.txt
+++ b/nuttx/configs/nucleus2g/README.txt
@@ -399,6 +399,8 @@ Nucleus 2G Configuration Options
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
 	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
 	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index bf2f9a26d..b2a1ad5fa 100755
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -696,6 +696,8 @@ Olimex LPC1766-STK Configuration Options
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
 	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
 	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index fb163ef41..8dc17a0e2 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -631,6 +631,8 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_LPC17_CAN1 or
 #   CONFIG_LPC17_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -641,6 +643,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
 # CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 92c9f4044..c9dab1737 100755
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -562,6 +562,8 @@ STM3210E-EVAL-specific Configuration Options
 
 	CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 	  CONFIG_STM32_CAN2 must also be defined)
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 	  Default: 8
 	CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index 17fa1b0e7..14a3542db 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -246,6 +246,8 @@ CONFIG_STM32_R61580_DISABLE=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -258,6 +260,7 @@ CONFIG_STM32_R61580_DISABLE=y
 # CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 238e2ad23..5421e8593 100755
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -273,7 +273,9 @@ Configuration Options:
 
   CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
     CONFIG_STM32_CAN2 must also be defined)
-  CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
+  CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+    Standard 11-bit IDs.
+ CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
     Default: 8
   CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
     Default: 4
@@ -656,6 +658,7 @@ Where <subdir> is one of the following:
        must be manually enabled by selecting:
 
        CONFIG_CAN=y             : Enable the generic CAN infrastructure
+       CONFIG_CAN_EXID=y or n   : Enable to support extended ID frames
        CONFIG_STM32_CAN1=y      : Enable CAN1
        CONFIG_CAN_LOOPBACK=y    : Enable CAN loopback mode
 
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
index 17fa324d9..97621f7a7 100755
--- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
@@ -261,6 +261,8 @@ CONFIG_SSI_POLLWAIT=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -271,6 +273,7 @@ CONFIG_SSI_POLLWAIT=y
 # CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig
index 216cbee48..fd443c8a3 100755
--- a/nuttx/configs/stm3240g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3240g-eval/nettest/defconfig
@@ -261,6 +261,8 @@ CONFIG_SSI_POLLWAIT=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -271,6 +273,7 @@ CONFIG_SSI_POLLWAIT=y
 # CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index 6135fa3e1..a218f62bc 100755
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -261,6 +261,8 @@ CONFIG_SSI_POLLWAIT=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -273,6 +275,7 @@ CONFIG_SSI_POLLWAIT=y
 # CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig
index 2b18c69a2..8c56c86c3 100755
--- a/nuttx/configs/stm3240g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3240g-eval/ostest/defconfig
@@ -261,6 +261,8 @@ CONFIG_SSI_POLLWAIT=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -273,6 +275,7 @@ CONFIG_SSI_POLLWAIT=y
 # CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 405639c9c..2e05b2c40 100755
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -402,6 +402,8 @@ stm32f4discovery-specific Configuration Options
 
 	CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 	  CONFIG_STM32_CAN2 must also be defined)
+	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+	  Standard 11-bit IDs.
 	CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 	  Default: 8
 	CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig
index 529716409..abf1b8bbc 100755
--- a/nuttx/configs/stm32f4discovery/nsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/nsh/defconfig
@@ -248,6 +248,8 @@ CONFIG_SPI_EXCHANGE=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -258,6 +260,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig
index f3b8e73f0..57cd9129f 100755
--- a/nuttx/configs/stm32f4discovery/ostest/defconfig
+++ b/nuttx/configs/stm32f4discovery/ostest/defconfig
@@ -261,6 +261,8 @@ CONFIG_SSI_POLLWAIT=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -271,6 +273,7 @@ CONFIG_SSI_POLLWAIT=y
 # CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n