Skip to content

Commit

Permalink
can: rename can_data_t hcan -> channel
Browse files Browse the repository at this point in the history 
No functional change.
  • Loading branch information
@marckleinebudde
marckleinebudde committed Nov 20, 2022
1 parent 8a89660 commit 203cfac
Showing 1 changed file with 37 additions and 37 deletions.
74 changes: 37 additions & 37 deletions src/can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static void rcc_reset(CAN_TypeDef *instance)
#endif
}

void can_init(can_data_t *hcan, CAN_TypeDef *instance)
void can_init(can_data_t *channel, CAN_TypeDef *instance)
{
__HAL_RCC_CAN1_CLK_ENABLE();

Expand All @@ -75,48 +75,48 @@ void can_init(can_data_t *hcan, CAN_TypeDef *instance)
HAL_GPIO_Init(GPIOD, &itd);
#endif

hcan->instance = instance;
hcan->brp = 6;
hcan->sjw = 1;
channel->instance = instance;
channel->brp = 6;
channel->sjw = 1;
#if defined(STM32F0)
hcan->phase_seg1 = 13;
hcan->phase_seg2 = 2;
channel->phase_seg1 = 13;
channel->phase_seg2 = 2;
#elif defined(STM32F4)
hcan->phase_seg1 = 12;
hcan->phase_seg2 = 1;
channel->phase_seg1 = 12;
channel->phase_seg2 = 1;
#endif
}

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)
&& (phase_seg1>0) && (phase_seg1<=16)
&& (phase_seg2>0) && (phase_seg2<=8)
&& (sjw>0) && (sjw<=4)
) {
hcan->brp = brp & 0x3FF;
hcan->phase_seg1 = phase_seg1;
hcan->phase_seg2 = phase_seg2;
hcan->sjw = sjw;
channel->brp = brp & 0x3FF;
channel->phase_seg1 = phase_seg1;
channel->phase_seg2 = phase_seg2;
channel->sjw = sjw;
return true;
} else {
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
| CAN_MCR_ABOM
| CAN_MCR_TXFP
| (one_shot ? CAN_MCR_NART : 0);

uint32_t btr = ((uint32_t)(hcan->sjw-1)) << 24
| ((uint32_t)(hcan->phase_seg1-1)) << 16
| ((uint32_t)(hcan->phase_seg2-1)) << 20
| (hcan->brp - 1)
uint32_t btr = ((uint32_t)(channel->sjw-1)) << 24
| ((uint32_t)(channel->phase_seg1-1)) << 16
| ((uint32_t)(channel->phase_seg2-1)) << 20
| (channel->brp - 1)
| (loop_back ? CAN_MODE_LOOPBACK : 0)
| (listen_only ? CAN_MODE_SILENT : 0);

Expand Down Expand Up @@ -155,32 +155,32 @@ void can_enable(can_data_t *hcan, bool loop_back, bool listen_only, bool one_sho
#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
HAL_GPIO_WritePin(nCANSTBY_Port, nCANSTBY_Pin, GPIO_INIT_STATE(nCANSTBY_Active_High));
#endif
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;
}

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);
}

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];

if (fifo->RIR & CAN_RI0R_IDE) {
Expand Down Expand Up @@ -212,9 +212,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;
if ( tsr & CAN_TSR_TME0 ) {
Expand All @@ -228,9 +228,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) {

/* first, clear transmission request */
Expand Down Expand Up @@ -270,9 +270,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;

Expand All @@ -287,15 +287,15 @@ static bool status_is_active(uint32_t err)
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
* whether there's anything worth sending. This variable tracks that final
* result. */
bool should_send = false;

hcan->reg_esr_old = err;
channel->reg_esr_old = err;

frame->echo_id = 0xFFFFFFFF;
frame->can_id = CAN_ERR_FLAG;
Expand Down

0 comments on commit 203cfac

Please sign in to comment.