aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-10-31 13:37:19 -0700
committerPiotr Esden-Tempski2012-10-31 13:37:19 -0700
commit60aa32e2b91a28d522b6660c84ac8c50bf8e6a05 (patch)
tree098100236649e03f992f57685e7048fa92083215 /lib
parent68e68187616c535622ccd5180806935dee0e0d38 (diff)
parent0fd7cc3559eb3c180de97898edbfd77f827a83b1 (diff)
Merge pull request #53 CAN fixes
Merge remote-tracking branch 'tdaede/master'
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32/can.c (renamed from lib/stm32/f1/can.c)13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/stm32/f1/can.c b/lib/stm32/can.c
index fc7e0e7..73036f4 100644
--- a/lib/stm32/f1/can.c
+++ b/lib/stm32/can.c
@@ -18,7 +18,16 @@
*/
#include <libopencm3/stm32/can.h>
-#include <libopencm3/stm32/f1/rcc.h>
+
+#if defined(STM32F1)
+# include <libopencm3/stm32/f1/rcc.h>
+#elif defined(STM32F2)
+# include <libopencm3/stm32/f2/rcc.h>
+#elif defined(STM32F4)
+# include <libopencm3/stm32/f4/rcc.h>
+#else
+# error "stm32 family not defined."
+#endif
void can_reset(u32 canport)
{
@@ -299,5 +308,5 @@ void can_receive(u32 canport, u8 fifo, bool release, u32 *id, bool *ext,
/* Release the FIFO. */
if (release)
- can_fifo_release(CAN1, 0);
+ can_fifo_release(canport, fifo);
}