diff options
author | Jeff Ciesielski <jeff.ciesielski@convergeddevices.net> | 2012-11-13 23:06:21 +0400 |
---|---|---|
committer | Jeff Ciesielski <jeff.ciesielski@convergeddevices.net> | 2012-11-14 01:13:40 +0400 |
commit | db35fbb7ba97a8a6d7481edf07cb82cae06aa834 (patch) | |
tree | c213211778736d5ce2f06b4cf186a6900f522b20 /include/libopencm3/stm32/can.h | |
parent | 1768df7edae1cd430183c03f3d0ad7f7b4d13c90 (diff) | |
parent | 4691568ca476177dc338e8c62872ceca6b4b4999 (diff) |
Merge branch 'master' of git://github.com/libopencm3/libopencm3 into upstream-merge
Diffstat (limited to 'include/libopencm3/stm32/can.h')
-rw-r--r-- | include/libopencm3/stm32/can.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/libopencm3/stm32/can.h b/include/libopencm3/stm32/can.h index 1919da45..c6c9d486 100644 --- a/include/libopencm3/stm32/can.h +++ b/include/libopencm3/stm32/can.h @@ -461,7 +461,7 @@ /* --- CAN_TIxR values ------------------------------------------------------ */ /* STID[10:0]: Standard identifier */ -#define CAN_TIxR_STID_MASK (0x3FF << 21) +#define CAN_TIxR_STID_MASK (0x7FF << 21) #define CAN_TIxR_STID_SHIFT 21 /* EXID[15:0]: Extended identifier */ |