Skip to content

Commit 933ac29

Browse files
hathachhathach
authored
Merge pull request hathach#2836 from hathach/more-tusb_init()
change tusb_init() to use init struct
2 parents a4fb835 + e83e083 commit 933ac29

File tree

93 files changed

+527
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+527
-244
lines changed

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
#ceedling test:all
3030
3131
- name: Run pre-commit
32-
uses: pre-commit/[email protected].0
32+
uses: pre-commit/[email protected].1
3333

3434
- name: Build Fuzzer
3535
run: |

‎.idea/cmake.xml‎

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.pre-commit-config.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,18 @@ repos:
4242
pass_filenames: false
4343
types_or: [c, header]
4444
language: system
45+
46+
# - id: build-fuzzer
47+
# name: build-fuzzer
48+
# files: ^(src/|test/fuzz/)
49+
# language: system
50+
# types_or: [c, header]
51+
# entry: |
52+
# bash -c 'export CC=clang
53+
# export CXX=clang++
54+
# fuzz_harness=$(ls -d test/fuzz/device/*/)
55+
# for h in $fuzz_harness
56+
# do
57+
# make -C $h get-deps
58+
# make -C $h all
59+
# done'

‎examples/device/audio_4_channel_mic/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ int main(void)
8686
board_init();
8787

8888
// init device stack on configured roothub port
89-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
89+
tusb_rhport_init_t dev_init = {
90+
.role = TUSB_ROLE_DEVICE,
91+
.speed = TUSB_SPEED_AUTO
92+
};
93+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
9094

9195
if (board_init_after_tusb) {
9296
board_init_after_tusb();

‎examples/device/audio_4_channel_mic_freertos/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@ void usb_device_task(void* param)
209209
// init device stack on configured roothub port
210210
// This should be called after scheduler/kernel is started.
211211
// Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
212-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
212+
tusb_rhport_init_t dev_init = {
213+
.role = TUSB_ROLE_DEVICE,
214+
.speed = TUSB_SPEED_AUTO
215+
};
216+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
213217

214218
if (board_init_after_tusb) {
215219
board_init_after_tusb();

‎examples/device/audio_test/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ int main(void)
7979
board_init();
8080

8181
// init device stack on configured roothub port
82-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
82+
tusb_rhport_init_t dev_init = {
83+
.role = TUSB_ROLE_DEVICE,
84+
.speed = TUSB_SPEED_AUTO
85+
};
86+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
8387

8488
if (board_init_after_tusb) {
8589
board_init_after_tusb();

‎examples/device/audio_test_freertos/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@ void usb_device_task(void* param)
156156
// init device stack on configured roothub port
157157
// This should be called after scheduler/kernel is started.
158158
// Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
159-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
159+
tusb_rhport_init_t dev_init = {
160+
.role = TUSB_ROLE_DEVICE,
161+
.speed = TUSB_SPEED_AUTO
162+
};
163+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
160164

161165
if (board_init_after_tusb) {
162166
board_init_after_tusb();

‎examples/device/audio_test_multi_rate/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,11 @@ int main(void)
9797
board_init();
9898

9999
// init device stack on configured roothub port
100-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
100+
tusb_rhport_init_t dev_init = {
101+
.role = TUSB_ROLE_DEVICE,
102+
.speed = TUSB_SPEED_AUTO
103+
};
104+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
101105

102106
if (board_init_after_tusb) {
103107
board_init_after_tusb();

‎examples/device/cdc_dual_ports/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ int main(void) {
5252
board_init();
5353

5454
// init device stack on configured roothub port
55-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
55+
tusb_rhport_init_t dev_init = {
56+
.role = TUSB_ROLE_DEVICE,
57+
.speed = TUSB_SPEED_AUTO
58+
};
59+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
5660

5761
if (board_init_after_tusb) {
5862
board_init_after_tusb();

‎examples/device/cdc_msc/src/main.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ int main(void) {
5151
board_init();
5252

5353
// init device stack on configured roothub port
54-
tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
54+
tusb_rhport_init_t dev_init = {
55+
.role = TUSB_ROLE_DEVICE,
56+
.speed = TUSB_SPEED_AUTO
57+
};
58+
tusb_init(BOARD_TUD_RHPORT, &dev_init);
5559

5660
if (board_init_after_tusb) {
5761
board_init_after_tusb();

0 commit comments

Comments
 (0)