jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32: can: update to modern includes and apis

Browse Source 
No functional change.  But allows automatic functionality on platforms
that support CAN with only makefile changes now.
This commit is contained in:
Karl Palsson 2017-05-08 22:48:38 +00:00
parent 5af89ae596
commit d9615a2eb7
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/stm32/can.c
View File

@ -36,18 +36,7 @@ LGPL License Terms @ref lgpl_license
*/ */
#include <libopencm3/stm32/can.h> #include <libopencm3/stm32/can.h>
#include <libopencm3/stm32/rcc.h>
#if defined(STM32F1)
# include <libopencm3/stm32/f1/rcc.h>
#elif defined(STM32F2)
# include <libopencm3/stm32/f2/rcc.h>
#elif defined(STM32F3)
# include <libopencm3/stm32/f3/rcc.h>
#elif defined(STM32F4)
# include <libopencm3/stm32/f4/rcc.h>
#else
# error "stm32 family not defined."
#endif
/* Timeout for CAN INIT acknowledge /* Timeout for CAN INIT acknowledge
* this value is difficult to define. * this value is difficult to define.
@ -74,12 +63,10 @@ can_reg_base.
void can_reset(uint32_t canport) void can_reset(uint32_t canport)
{ {
if (canport == CAN1) { if (canport == CAN1) {
rcc_peripheral_reset(&RCC_APB1RSTR, RCC_APB1RSTR_CAN1RST); rcc_periph_reset_pulse(RCC_CAN1);
rcc_peripheral_clear_reset(&RCC_APB1RSTR, RCC_APB1RSTR_CAN1RST);
} else { } else {
#if defined(BX_CAN2_BASE) #if defined(BX_CAN2_BASE)
rcc_peripheral_reset(&RCC_APB1RSTR, RCC_APB1RSTR_CAN2RST); rcc_periph_reset_pulse(RCC_CAN2);
rcc_peripheral_clear_reset(&RCC_APB1RSTR, RCC_APB1RSTR_CAN2RST);
#endif #endif
} }
} }