GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-02-04 06:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

can: rename can_data_t hcan -> channel

Browse Source 
No functional change.
This commit is contained in:
Marc Kleine-Budde 2022-11-20 20:15:26 +01:00 committed by Marc Kleine-Budde
parent fd1c0c8471
commit 84ec4d5501
6 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/can.h
View File

@ -45,25 +45,25 @@ typedef struct {
uint8_t sjw; uint8_t sjw;
} can_data_t; } can_data_t;
void can_init(can_data_t *hcan, CAN_TypeDef *instance); void can_init(can_data_t *channel, CAN_TypeDef *instance);
bool can_set_bittiming(can_data_t *hcan, uint16_t brp, uint8_t phase_seg1, uint8_t phase_seg2, uint8_t sjw); bool can_set_bittiming(can_data_t *channel, uint16_t brp, uint8_t phase_seg1, uint8_t phase_seg2, uint8_t sjw);
void can_enable(can_data_t *hcan, bool loop_back, bool listen_only, bool one_shot); void can_enable(can_data_t *channel, bool loop_back, bool listen_only, bool one_shot);
void can_disable(can_data_t *hcan); void can_disable(can_data_t *channel);
bool can_is_enabled(can_data_t *hcan); bool can_is_enabled(can_data_t *channel);
bool can_receive(can_data_t *hcan, struct gs_host_frame *rx_frame); bool can_receive(can_data_t *channel, struct gs_host_frame *rx_frame);
bool can_is_rx_pending(can_data_t *hcan); bool can_is_rx_pending(can_data_t *channel);
bool can_send(can_data_t *hcan, struct gs_host_frame *frame); bool can_send(can_data_t *channel, struct gs_host_frame *frame);
/** return CAN->ESR register which contains tx/rx error counters and /** return CAN->ESR register which contains tx/rx error counters and
* LEC (last error code). * LEC (last error code).
*/ */
uint32_t can_get_error_status(can_data_t *hcan); uint32_t can_get_error_status(can_data_t *channel);
/** parse status value returned by can_get_error_status(). /** parse status value returned by can_get_error_status().
* @param frame : will hold the generated error frame * @param frame : will hold the generated error frame
* @param err : holds the contents of the ESR register * @param err : holds the contents of the ESR register
* @return 1 when status changes (if any) need a new error frame sent * @return 1 when status changes (if any) need a new error frame sent
*/ */
bool can_parse_error_status(can_data_t *hcan, struct gs_host_frame *frame, uint32_t err); bool can_parse_error_status(can_data_t *channel, struct gs_host_frame *frame, uint32_t err);

2
include/device.h
View File

@ -29,6 +29,6 @@ THE SOFTWARE.
#include "can.h" #include "can.h"
#include "hal_include.h" #include "hal_include.h"
void device_can_init(can_data_t *hcan, CAN_TypeDef *instance); void device_can_init(can_data_t *channel, CAN_TypeDef *instance);
void device_sysclock_config(void); void device_sysclock_config(void);

62
src/can.c
View File

@ -55,41 +55,41 @@ static void rcc_reset(CAN_TypeDef *instance)
#endif #endif
} }
void can_init(can_data_t *hcan, CAN_TypeDef *instance) void can_init(can_data_t *channel, CAN_TypeDef *instance)
{ {
device_can_init(hcan, instance); device_can_init(channel, instance);
} }
bool can_set_bittiming(can_data_t *hcan, uint16_t brp, uint8_t phase_seg1, uint8_t phase_seg2, uint8_t sjw) bool can_set_bittiming(can_data_t *channel, uint16_t brp, uint8_t phase_seg1, uint8_t phase_seg2, uint8_t sjw)
{ {
if ( (brp>0) && (brp<=1024) if ( (brp>0) && (brp<=1024)
&& (phase_seg1>0) && (phase_seg1<=16) && (phase_seg1>0) && (phase_seg1<=16)
&& (phase_seg2>0) && (phase_seg2<=8) && (phase_seg2>0) && (phase_seg2<=8)
&& (sjw>0) && (sjw<=4) && (sjw>0) && (sjw<=4)
) { ) {
hcan->brp = brp & 0x3FF; channel->brp = brp & 0x3FF;
hcan->phase_seg1 = phase_seg1; channel->phase_seg1 = phase_seg1;
hcan->phase_seg2 = phase_seg2; channel->phase_seg2 = phase_seg2;
hcan->sjw = sjw; channel->sjw = sjw;
return true; return true;
} else { } else {
return false; return false;
} }
} }
void can_enable(can_data_t *hcan, bool loop_back, bool listen_only, bool one_shot) void can_enable(can_data_t *channel, bool loop_back, bool listen_only, bool one_shot)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
uint32_t mcr = CAN_MCR_INRQ uint32_t mcr = CAN_MCR_INRQ
| CAN_MCR_ABOM | CAN_MCR_ABOM
| CAN_MCR_TXFP | CAN_MCR_TXFP
| (one_shot ? CAN_MCR_NART : 0); | (one_shot ? CAN_MCR_NART : 0);
uint32_t btr = ((uint32_t)(hcan->sjw-1)) << 24 uint32_t btr = ((uint32_t)(channel->sjw-1)) << 24
| ((uint32_t)(hcan->phase_seg1-1)) << 16 | ((uint32_t)(channel->phase_seg1-1)) << 16
| ((uint32_t)(hcan->phase_seg2-1)) << 20 | ((uint32_t)(channel->phase_seg2-1)) << 20
| (hcan->brp - 1) | (channel->brp - 1)
| (loop_back ? CAN_MODE_LOOPBACK : 0) | (loop_back ? CAN_MODE_LOOPBACK : 0)
| (listen_only ? CAN_MODE_SILENT : 0); | (listen_only ? CAN_MODE_SILENT : 0);
@ -128,32 +128,32 @@ void can_enable(can_data_t *hcan, bool loop_back, bool listen_only, bool one_sho
#endif #endif
} }
void can_disable(can_data_t *hcan) void can_disable(can_data_t *channel)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
#ifdef nCANSTBY_Pin #ifdef nCANSTBY_Pin
HAL_GPIO_WritePin(nCANSTBY_Port, nCANSTBY_Pin, GPIO_INIT_STATE(nCANSTBY_Active_High)); HAL_GPIO_WritePin(nCANSTBY_Port, nCANSTBY_Pin, GPIO_INIT_STATE(nCANSTBY_Active_High));
#endif #endif
can->MCR |= CAN_MCR_INRQ; // send can controller into initialization mode can->MCR |= CAN_MCR_INRQ; // send can controller into initialization mode
} }
bool can_is_enabled(can_data_t *hcan) bool can_is_enabled(can_data_t *channel)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
return (can->MCR & CAN_MCR_INRQ) == 0; return (can->MCR & CAN_MCR_INRQ) == 0;
} }
bool can_is_rx_pending(can_data_t *hcan) bool can_is_rx_pending(can_data_t *channel)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
return ((can->RF0R & CAN_RF0R_FMP0) != 0); return ((can->RF0R & CAN_RF0R_FMP0) != 0);
} }
bool can_receive(can_data_t *hcan, struct gs_host_frame *rx_frame) bool can_receive(can_data_t *channel, struct gs_host_frame *rx_frame)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
if (can_is_rx_pending(hcan)) { if (can_is_rx_pending(channel)) {
CAN_FIFOMailBox_TypeDef *fifo = &can->sFIFOMailBox[0]; CAN_FIFOMailBox_TypeDef *fifo = &can->sFIFOMailBox[0];
if (fifo->RIR & CAN_RI0R_IDE) { if (fifo->RIR & CAN_RI0R_IDE) {
@ -185,9 +185,9 @@ bool can_receive(can_data_t *hcan, struct gs_host_frame *rx_frame)
} }
} }
static CAN_TxMailBox_TypeDef *can_find_free_mailbox(can_data_t *hcan) static CAN_TxMailBox_TypeDef *can_find_free_mailbox(can_data_t *channel)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
uint32_t tsr = can->TSR; uint32_t tsr = can->TSR;
if ( tsr & CAN_TSR_TME0 ) { if ( tsr & CAN_TSR_TME0 ) {
@ -201,9 +201,9 @@ static CAN_TxMailBox_TypeDef *can_find_free_mailbox(can_data_t *hcan)
} }
} }
bool can_send(can_data_t *hcan, struct gs_host_frame *frame) bool can_send(can_data_t *channel, struct gs_host_frame *frame)
{ {
CAN_TxMailBox_TypeDef *mb = can_find_free_mailbox(hcan); CAN_TxMailBox_TypeDef *mb = can_find_free_mailbox(channel);
if (mb != 0) { if (mb != 0) {
/* first, clear transmission request */ /* first, clear transmission request */
@ -243,9 +243,9 @@ bool can_send(can_data_t *hcan, struct gs_host_frame *frame)
} }
} }
uint32_t can_get_error_status(can_data_t *hcan) uint32_t can_get_error_status(can_data_t *channel)
{ {
CAN_TypeDef *can = hcan->instance; CAN_TypeDef *can = channel->instance;
uint32_t err = can->ESR; uint32_t err = can->ESR;
@ -260,15 +260,15 @@ static bool status_is_active(uint32_t err)
return !(err & (CAN_ESR_BOFF | CAN_ESR_EPVF)); return !(err & (CAN_ESR_BOFF | CAN_ESR_EPVF));
} }
bool can_parse_error_status(can_data_t *hcan, struct gs_host_frame *frame, uint32_t err) bool can_parse_error_status(can_data_t *channel, struct gs_host_frame *frame, uint32_t err)
{ {
uint32_t last_err = hcan->reg_esr_old; uint32_t last_err = channel->reg_esr_old;
/* We build up the detailed error information at the same time as we decide /* We build up the detailed error information at the same time as we decide
* whether there's anything worth sending. This variable tracks that final * whether there's anything worth sending. This variable tracks that final
* result. */ * result. */
bool should_send = false; bool should_send = false;
hcan->reg_esr_old = err; channel->reg_esr_old = err;
frame->echo_id = 0xFFFFFFFF; frame->echo_id = 0xFFFFFFFF;
frame->can_id = CAN_ERR_FLAG; frame->can_id = CAN_ERR_FLAG;

12
src/device/device_f0.c
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "device.h" #include "device.h"
#include "hal_include.h" #include "hal_include.h"
void device_can_init(can_data_t *hcan, CAN_TypeDef *instance) { void device_can_init(can_data_t *channel, CAN_TypeDef *instance) {
__HAL_RCC_CAN1_CLK_ENABLE(); __HAL_RCC_CAN1_CLK_ENABLE();
GPIO_InitTypeDef itd; GPIO_InitTypeDef itd;
@ -43,11 +43,11 @@ void device_can_init(can_data_t *hcan, CAN_TypeDef *instance) {
itd.Alternate = GPIO_AF4_CAN; itd.Alternate = GPIO_AF4_CAN;
HAL_GPIO_Init(GPIOB, &itd); HAL_GPIO_Init(GPIOB, &itd);
hcan->instance = instance; channel->instance = instance;
hcan->brp = 6; channel->brp = 6;
hcan->sjw = 1; channel->sjw = 1;
hcan->phase_seg1 = 13; channel->phase_seg1 = 13;
hcan->phase_seg2 = 2; channel->phase_seg2 = 2;
return; return;
} }

12
src/device/device_f4.c
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "device.h" #include "device.h"
#include "hal_include.h" #include "hal_include.h"
void device_can_init(can_data_t *hcan, CAN_TypeDef *instance) { void device_can_init(can_data_t *channel, CAN_TypeDef *instance) {
__HAL_RCC_CAN1_CLK_ENABLE(); __HAL_RCC_CAN1_CLK_ENABLE();
GPIO_InitTypeDef itd; GPIO_InitTypeDef itd;
@ -41,11 +41,11 @@ void device_can_init(can_data_t *hcan, CAN_TypeDef *instance) {
itd.Alternate = GPIO_AF9_CAN1; itd.Alternate = GPIO_AF9_CAN1;
HAL_GPIO_Init(GPIOD, &itd); HAL_GPIO_Init(GPIOD, &itd);
hcan->instance = instance; channel->instance = instance;
hcan->brp = 6; channel->brp = 6;
hcan->sjw = 1; channel->sjw = 1;
hcan->phase_seg1 = 12; channel->phase_seg1 = 12;
hcan->phase_seg2 = 1; channel->phase_seg2 = 1;
return; return;
} }

2
src/device/device_g0.c
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "device.h" #include "device.h"
#include "hal_include.h" #include "hal_include.h"
void device_can_init(can_data_t *hcan, CAN_TypeDef *instance) { void device_can_init(can_data_t *channel, CAN_TypeDef *instance) {
// XXX TODO // XXX TODO
while (1); while (1);
return; return;