Skip to content

Use atomic_int for cfp_packet_counter in CAN and packet_id in ETH TX #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johandc merged 1 commit into from
Mar 23, 2026
Merged

Use atomic_int for cfp_packet_counter in CAN and packet_id in ETH TX #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion include/csp/interfaces/csp_if_can.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#pragma once

#include <csp/csp_interface.h>
#include <stdint.h>
#include <stdatomic.h>

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -190,7 +192,7 @@ typedef int (*csp_can_driver_tx_t)(void * driver_data, uint32_t id, const uint8_
* Interface data (state information).
*/
typedef struct {
uint32_t cfp_packet_counter; /**< CFP Identification number - same number on all fragments from same CSP packet. */
atomic_int cfp_packet_counter; /**< CFP Identification number - same number on all fragments from same CSP packet. */
csp_can_driver_tx_t tx_func; /**< Tx function */
csp_packet_t * pbufs; /**< PBUF queue */
} csp_can_interface_data_t;
Expand Down
6 changes: 3 additions & 3 deletions src/interfaces/csp_if_can.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ static int csp_can1_tx(csp_iface_t * iface, uint16_t via, csp_packet_t * packet,

csp_can_interface_data_t * ifdata = iface->interface_data;

/* Get an unique CFP id - this should be locked to prevent access from multiple tasks */
const uint32_t ident = ifdata->cfp_packet_counter++;
/* Get an unique CFP id */
const uint32_t ident = ifdata->cfp_packet_counter++; // Atomic operation as cfp_packet_counter is of type atomic_int

/* Figure out destination node based on routing entry */
const uint8_t dest = (via != CSP_NO_VIA_ADDRESS) ? via : packet->id.dst;
Expand Down Expand Up @@ -370,7 +370,7 @@ static int csp_can2_tx(csp_iface_t * iface, uint16_t via, csp_packet_t * packet,
csp_can_interface_data_t * ifdata = iface->interface_data;

/* Setup counters */
int sender_count = ifdata->cfp_packet_counter++;
int sender_count = ifdata->cfp_packet_counter++; // Atomic operation as cfp_packet_counter is of type atomic_int
int tx_count = 0;

uint32_t can_id = 0;
Expand Down
3 changes: 2 additions & 1 deletion src/interfaces/csp_if_eth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdatomic.h>

#include <csp/csp.h>
#include <csp/csp_id.h>
Expand Down Expand Up @@ -254,7 +255,7 @@ int csp_eth_tx(csp_iface_t * iface, uint16_t via, csp_packet_t * packet, int fro

csp_id_prepend(packet);

static uint16_t packet_id = 0;
static atomic_int packet_id = 0;
packet_id++;
uint16_t offset = 0;

Expand Down
Loading