Skip to content

Commit 4f3b962

Browse files
xoviatxoviat
authored
Merge pull request #14 from xoviat/build
add ll_sys headers
2 parents 1cc6ff5 + 14a3bc6 commit 4f3b962

File tree

5 files changed

+69
-29
lines changed

5 files changed

+69
-29
lines changed

‎stm32-bindings-gen/inc/link_layer.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* Link Layer command interface */
2+
#include "bsp.h"
3+
#include "common_types.h"
4+
#include "dtm.h"
5+
#include "event_manager.h"
6+
#include "evnt_schdlr_gnrc_if.h"
7+
#include "hci.h"
8+
#include "ll_error.h"
9+
#include "ll_intf.h"
10+
#include "ll_intf_cmn.h"
11+
#include "mac_host_intf.h"
12+
#include "mem_intf.h"
13+
#include "os_wrapper.h"
14+
#include "platform.h"
15+
#include "power_table.h"
16+
#include "pta.h"
17+
#include "ral.h"
18+
#include "rfd_dev_config.h"
19+
#include "linklayer_plat.h"
20+
#include "ll_sys_sequencer.h"
21+
#include "ll_sys_startup.h"
22+
#include "ll_sys.h"
23+
#include "ll_version.h"
24+
#include "ll_intf_cmn.h"

‎stm32-bindings-gen/inc/ble-wba.h‎ renamed to ‎stm32-bindings-gen/inc/wba_ble.h‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#define BLE_WBA_BINDINGS_H_
33

44
#ifdef __cplusplus
5-
extern "C" {
5+
extern "C"
6+
{
67
#endif
78

89
#include <stdbool.h>
@@ -12,27 +13,6 @@ extern "C" {
1213

1314
/* Toolchain abstraction utilities */
1415

15-
16-
/* Link Layer command interface */
17-
#include "bsp.h"
18-
#include "common_types.h"
19-
#include "dtm.h"
20-
#include "event_manager.h"
21-
#include "evnt_schdlr_gnrc_if.h"
22-
#include "hci.h"
23-
#include "ll_error.h"
24-
#include "ll_intf.h"
25-
#include "ll_intf_cmn.h"
26-
#include "mac_host_intf.h"
27-
#include "mem_intf.h"
28-
#include "os_wrapper.h"
29-
#include "platform.h"
30-
#include "power_table.h"
31-
#include "pta.h"
32-
#include "ral.h"
33-
#include "rfd_dev_config.h"
34-
35-
3616
/* Core BLE stack */
3717
#include "blestack.h"
3818
#include "ble_bufsize.h"

‎stm32-bindings-gen/inc/wba_wpan_mac.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "st_mac_queue.h"
1414
#include "stm_queue.h"
1515
#include "utilities_common.h"
16+
#include "linklayer_plat.h"
1617

1718
/* Define to prevent recursive inclusion -------------------------------------*/
1819
#ifndef APP_CONF_H

‎stm32-bindings-gen/res/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "stm32-bindings"
3-
version = "0.1.2"
3+
version = "0.1.3"
44
edition = "2024"
55
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/embassy-rs/stm32-data"
@@ -55,6 +55,7 @@ defmt = { version = "0.3.0", optional = true }
5555
[features]
5656
default = ["pac", "wba_wpan_mac", "wba_wpan_ble"]
5757

58+
wba_wpan = []
5859
wba_wpan_mac = []
5960
wba_wpan_ble = []
6061
n6_ai_runtime = []

‎stm32-bindings-gen/src/lib.rs‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,42 @@ struct LibraryArtifact {
3737
}
3838

3939
const BINDING_SPECS: &[BindingSpec] = &[
40+
BindingSpec {
41+
module: "wba_link_layer",
42+
feature: Some("wba_wpan"),
43+
header: "stm32-bindings-gen/inc/link_layer.h",
44+
include_dirs: &[
45+
"Middlewares/ST/STM32_WPAN",
46+
"Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc",
47+
"Middlewares/ST/STM32_WPAN/mac_802_15_4/mac_utilities/inc",
48+
"Middlewares/ST/STM32_WPAN/link_layer/ll_sys/inc",
49+
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc",
50+
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files",
51+
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/ot_inc",
52+
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/config",
53+
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/config/ieee_15_4_basic",
54+
"Drivers/CMSIS/Core/Include",
55+
],
56+
clang_args: &[
57+
"-DSUPPORT_MAC=1",
58+
"-DSUPPORT_BLE=1",
59+
"-DMAC=1",
60+
"-DBLE=1",
61+
"-DBLE_LL=1",
62+
"-DMAC_LAYER=1",
63+
"-DSUPPORT_MAC=1",
64+
"-DSUPPORT_CONFIG_LIB=1",
65+
"-DSUPPORT_OPENTHREAD_1_2=1",
66+
"-DSUPPORT_ANT_DIV=1",
67+
"-DEXT_ADDRESS_LENGTH=8",
68+
],
69+
allowlist: &[],
70+
aliases: &[],
71+
library_artifacts: &[LibraryArtifact {
72+
source: "Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/lib",
73+
destination: "src/lib/link_layer",
74+
}],
75+
},
4076
BindingSpec {
4177
module: "wba_wpan_mac",
4278
feature: Some("wba_wpan_mac"),
@@ -45,6 +81,7 @@ const BINDING_SPECS: &[BindingSpec] = &[
4581
"Middlewares/ST/STM32_WPAN",
4682
"Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc",
4783
"Middlewares/ST/STM32_WPAN/mac_802_15_4/mac_utilities/inc",
84+
"Middlewares/ST/STM32_WPAN/link_layer/ll_sys/inc",
4885
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc",
4986
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files",
5087
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/ot_inc",
@@ -64,20 +101,17 @@ const BINDING_SPECS: &[BindingSpec] = &[
64101
source: "Middlewares/ST/STM32_WPAN/mac_802_15_4/lib/wba_mac_lib.a",
65102
destination: "src/lib/wba_mac_lib.a",
66103
},
67-
LibraryArtifact {
68-
source: "Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/lib",
69-
destination: "src/lib/link_layer",
70-
},
71104
],
72105
},
73106
BindingSpec {
74-
module: "ble_stack",
107+
module: "wba_ble_stack",
75108
feature: Some("wba_wpan_ble"),
76-
header: "stm32-bindings-gen/inc/ble-wba.h",
109+
header: "stm32-bindings-gen/inc/wba_ble.h",
77110
include_dirs: &[
78111
"Middlewares/ST/STM32_WPAN",
79112
"Middlewares/ST/STM32_WPAN/ble/stack/include",
80113
"Middlewares/ST/STM32_WPAN/ble/stack/include/auto",
114+
"Middlewares/ST/STM32_WPAN/link_layer/ll_sys/inc",
81115
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc",
82116
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files",
83117
"Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/ot_inc",

0 commit comments

Comments
 (0)