Skip to content

Commit 152d25e

Browse files
hathachhathach
authored
Merge pull request #3256 from hathach/weak_cb
Migrate weak function override to new syntax, update delay api usage
2 parents 1f9c415 + 0655f98 commit 152d25e

File tree

77 files changed

+562
-464
lines changed

Some content is hidden

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

77 files changed

+562
-464
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ int main(void) {
8585
.speed = TUSB_SPEED_AUTO};
8686
tusb_init(BOARD_TUD_RHPORT, &dev_init);
8787

88-
if (board_init_after_tusb) {
89-
board_init_after_tusb();
90-
}
88+
board_init_after_tusb();
9189

9290
// Init values
9391
sampFreq = AUDIO_SAMPLE_RATE;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,7 @@ void usb_device_task(void *param) {
184184
.speed = TUSB_SPEED_AUTO};
185185
tusb_init(BOARD_TUD_RHPORT, &dev_init);
186186

187-
if (board_init_after_tusb) {
188-
board_init_after_tusb();
189-
}
187+
board_init_after_tusb();
190188

191189
// RTOS forever loop
192190
while (1) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ int main(void) {
8383
.speed = TUSB_SPEED_AUTO};
8484
tusb_init(BOARD_TUD_RHPORT, &dev_init);
8585

86-
if (board_init_after_tusb) {
87-
board_init_after_tusb();
88-
}
86+
board_init_after_tusb();
8987

9088
// Init values
9189
sampFreq = CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ void usb_device_task(void *param) {
167167
.speed = TUSB_SPEED_AUTO};
168168
tusb_init(BOARD_TUD_RHPORT, &dev_init);
169169

170-
if (board_init_after_tusb) {
171-
board_init_after_tusb();
172-
}
170+
board_init_after_tusb();
173171

174172
// RTOS forever loop
175173
while (1) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,7 @@ int main(void) {
100100
.speed = TUSB_SPEED_AUTO};
101101
tusb_init(BOARD_TUD_RHPORT, &dev_init);
102102

103-
if (board_init_after_tusb) {
104-
board_init_after_tusb();
105-
}
103+
board_init_after_tusb();
106104

107105
// Init values
108106
sampFreq = sampleRatesList[0];

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ int main(void) {
5858
};
5959
tusb_init(BOARD_TUD_RHPORT, &dev_init);
6060

61-
if (board_init_after_tusb) {
62-
board_init_after_tusb();
63-
}
61+
board_init_after_tusb();
6462

6563
while (1) {
6664
tud_task(); // tinyusb device task
@@ -141,9 +139,7 @@ void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
141139
cdc_line_coding_t coding;
142140
tud_cdc_get_line_coding(&coding);
143141
if (coding.bit_rate == 1200) {
144-
if (board_reset_to_bootloader) {
145-
board_reset_to_bootloader();
146-
}
142+
board_reset_to_bootloader();
147143
}
148144
}
149145
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ int main(void) {
5757
};
5858
tusb_init(BOARD_TUD_RHPORT, &dev_init);
5959

60-
if (board_init_after_tusb) {
61-
board_init_after_tusb();
62-
}
60+
board_init_after_tusb();
6361

6462
while (1) {
6563
tud_task(); // tinyusb device task

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ static void usb_device_task(void *param) {
119119
};
120120
tusb_init(BOARD_TUD_RHPORT, &dev_init);
121121

122-
if (board_init_after_tusb) {
123-
board_init_after_tusb();
124-
}
122+
board_init_after_tusb();
125123

126124
msc_disk_init();
127125
// RTOS forever loop

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ int main(void)
8181
};
8282
tusb_init(BOARD_TUD_RHPORT, &dev_init);
8383

84-
if (board_init_after_tusb) {
85-
board_init_after_tusb();
86-
}
84+
board_init_after_tusb();
8785

8886
while (1)
8987
{

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ int main(void)
7676
};
7777
tusb_init(BOARD_TUD_RHPORT, &dev_init);
7878

79-
if (board_init_after_tusb) {
80-
board_init_after_tusb();
81-
}
79+
board_init_after_tusb();
8280

8381
while (1)
8482
{

0 commit comments

Comments
 (0)