diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-10 19:07:13 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-10 19:07:13 +0000 |
| commit | 610648a0b4a6115a3d73a40ae108fb18a75c1965 (patch) | |
| tree | b60022b91db5775403fb1e1fca1b5ccd4f69e01e /nuttx/arch/arm/src/stm32/chip/stm32_can.h | |
| parent | 8a161fa847642f5c652ec4541502c6a8de8a9696 (diff) | |
| download | px4-nuttx-610648a0b4a6115a3d73a40ae108fb18a75c1965.tar.gz px4-nuttx-610648a0b4a6115a3d73a40ae108fb18a75c1965.tar.bz2 px4-nuttx-610648a0b4a6115a3d73a40ae108fb18a75c1965.zip | |
Many STM32 header files updated for F3 support
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5635 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/chip/stm32_can.h')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/chip/stm32_can.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_can.h b/nuttx/arch/arm/src/stm32/chip/stm32_can.h index 253bf68fc..ba3042309 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_can.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_can.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/stm32/chip/stm32_can.h * - * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -61,7 +61,8 @@ /* Number of filters depends on silicon */ -#if defined(CONFIG_STM32_CONNECTIVITYLINE) || defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) +#if defined(CONFIG_STM32_CONNECTIVITYLINE) || defined(CONFIG_STM32_STM32F20XX) || \ + defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F40XX) # define CAN_NFILTERS 28 #else # define CAN_NFILTERS 14 @@ -271,7 +272,7 @@ #define CAN_MSR_SLAKI (1 << 4) /* Bit 4: Sleep acknowledge interrupt */ #define CAN_MSR_TXM (1 << 8) /* Bit 8: Transmit Mode */ #define CAN_MSR_RXM (1 << 9) /* Bit 9: Receive Mode */ -#define CAN_MSR_SAMP (1 << 20) /* Bit 10: Last Sample Point */ +#define CAN_MSR_SAMP (1 << 10) /* Bit 10: Last Sample Point */ #define CAN_MSR_RX (1 << 11) /* Bit 11: CAN Rx Signal */ /* CAN transmit status register */ |