Skip to content

Commit 5495aad

Browse files
committed
Return interface ptr from CAN interface creation functions
1 parent 4295509 commit 5495aad

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

src/platform/stm32h7/stm32h7_can.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const struct {
5454

5555

5656

57-
void
57+
can_netif_t *
5858
stm32h7_can_init(int instance, gpio_t can_tx, gpio_t can_rx,
5959
unsigned int nominal_bitrate,
6060
unsigned int data_bitrate,
@@ -122,7 +122,7 @@ stm32h7_can_init(int instance, gpio_t can_tx, gpio_t can_rx,
122122
output_filter);
123123
if(err) {
124124
printf("%s: Failed to initialize\n", name);
125-
return;
125+
return NULL;
126126
}
127127

128128
irq_enable_fn_arg(stm32h7_can_interfaces[instance].irq0,
@@ -133,4 +133,5 @@ stm32h7_can_init(int instance, gpio_t can_tx, gpio_t can_rx,
133133

134134
printf("%s: Initialized. Nominal bitrate:%d Data bitrate:%d\n",
135135
name, nominal_bitrate, data_bitrate);
136+
return &fc->cni;
136137
}

src/platform/stm32h7/stm32h7_can.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
#include <mios/io.h>
44

55
struct dsig_filter;
6+
struct can_netif;
67

78
#define STM32H7_CAN_TIM3_TIMESTAMPING 0x1
89

9-
void stm32h7_can_init(int instance, gpio_t can_tx, gpio_t can_rx,
10-
unsigned int nominal_bitrate,
11-
unsigned int data_bitrate,
12-
const struct dsig_filter *input_filter,
13-
const struct dsig_filter *output_filter,
14-
uint32_t flags, const char *name);
10+
struct can_netif *stm32h7_can_init(int instance, gpio_t can_tx, gpio_t can_rx,
11+
unsigned int nominal_bitrate,
12+
unsigned int data_bitrate,
13+
const struct dsig_filter *input_filter,
14+
const struct dsig_filter *output_filter,
15+
uint32_t flags, const char *name);
1516

src/platform/tegra234-spe/tegra234-spe_can.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "platform/stm32/stm32_fdcan.c"
3939

4040

41-
void
41+
can_netif_t *
4242
tegra243_spe_can_init(unsigned int nominal_bitrate,
4343
unsigned int data_bitrate,
4444
const struct dsig_filter *input_filter,
@@ -94,12 +94,13 @@ tegra243_spe_can_init(unsigned int nominal_bitrate,
9494
output_filter);
9595
if(err) {
9696
printf("%s: Failed to initialize\n", name);
97-
return;
97+
return NULL;
9898
}
9999

100100
irq_enable_fn_arg(IRQ_CAN1_0, IRQ_LEVEL_NET, stm32_fdcan_irq0, fc);
101101
irq_enable_fn_arg(IRQ_CAN1_1, IRQ_LEVEL_HIGH, stm32_fdcan_irq1, fc);
102102

103103
printf("%s: Initialized. Nominal bitrate:%d Data bitrate:%d\n",
104104
name, nominal_bitrate, data_bitrate);
105+
return &fc->cni;
105106
}

src/platform/tegra234-spe/tegra234-spe_can.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
#include <stdint.h>
44

55
struct dsig_filter;
6+
struct can_netif;
67

7-
void tegra243_spe_can_init(unsigned int nominal_bitrate,
8-
unsigned int data_bitrate,
9-
const struct dsig_filter *input_filter,
10-
const struct dsig_filter *output_filter,
11-
uint32_t flags, const char *name);
8+
struct can_netif *tegra243_spe_can_init(unsigned int nominal_bitrate,
9+
unsigned int data_bitrate,
10+
const struct dsig_filter *input_filter,
11+
const struct dsig_filter *output_filter,
12+
uint32_t flags, const char *name);

0 commit comments

Comments
 (0)