Skip to content

Commit d26d15c

Browse files
Add missing add_subdirectory()
1 parent 691d764 commit d26d15c

File tree

4 files changed

+24
-28
lines changed

4 files changed

+24
-28
lines changed

drivers/usb/source/USBDevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ void USBDevice::_run_later(void (USBDevice::*function)())
17741774

17751775
void USBDevice::_clear_endpoints()
17761776
{
1777-
for (auto & info : _endpoint_info) {
1777+
for (auto &info : _endpoint_info) {
17781778
info = endpoint_info_t{};
17791779
}
17801780
}

rtos/tests/TESTS/mbed_rtos/signals/main.cpp

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using utest::v1::Case;
3535
template <int32_t signals, uint32_t timeout, uint32_t test_val>
3636
void run_signal_wait(void)
3737
{
38-
uint32_t ret = ThisThread::flags_wait_all_for(signals, timeout);
38+
uint32_t ret = ThisThread::flags_wait_all_for(signals, std::chrono::milliseconds(timeout));
3939
TEST_ASSERT_EQUAL(test_val, ret);
4040
}
4141

@@ -64,7 +64,7 @@ void test_clear_no_signals_with_ticker(void)
6464
{
6565
Ticker t;
6666
osThreadFlagsSet(ThisThread::get_id(), ALL_SIGNALS);
67-
t.attach_us([&] { run_multiple_wait_clear(NO_SIGNALS, NO_SIGNALS, ALL_SIGNALS, ALL_SIGNALS); }, 3000);
67+
t.attach([&] { run_multiple_wait_clear(NO_SIGNALS, NO_SIGNALS, ALL_SIGNALS, ALL_SIGNALS); }, 3ms);
6868
}
6969

7070
/** Validate all flags_clr clears the signal in one shot
@@ -77,7 +77,7 @@ void test_clear_all_with_ticker(void)
7777
{
7878
Ticker t;
7979
osThreadFlagsSet(ThisThread::get_id(), ALL_SIGNALS);
80-
t.attach_us([&] { run_multiple_wait_clear(ALL_SIGNALS, NO_SIGNALS, ALL_SIGNALS, NO_SIGNALS); }, 3000);
80+
t.attach([&] { run_multiple_wait_clear(ALL_SIGNALS, NO_SIGNALS, ALL_SIGNALS, NO_SIGNALS); }, 3ms);
8181
}
8282

8383
/** Validate if any signals are set on ticker callback
@@ -89,7 +89,7 @@ void test_clear_all_with_ticker(void)
8989
void test_init_state_with_ticker(void)
9090
{
9191
Ticker t;
92-
t.attach_us(callback(run_clear<NO_SIGNALS, NO_SIGNALS>), 3000);
92+
t.attach(callback(run_clear<NO_SIGNALS, NO_SIGNALS>), 3ms);
9393
}
9494

9595
/** Validate signal_wait return status if timeout specified
@@ -102,7 +102,7 @@ template <int32_t signals, uint32_t timeout, uint32_t status>
102102
void test_wait_timeout_with_ticker(void)
103103
{
104104
Ticker t;
105-
t.attach_us(callback(run_signal_wait<signals, timeout, status>), 3000);
105+
t.attach(callback(run_signal_wait<signals, timeout, status>), 3ms);
106106
}
107107

108108
void run_release_wait_signal_wait_callback()
@@ -121,21 +121,20 @@ void run_release_wait_signal_wait_callback()
121121
void test_wait_all_already_set_with_ticker(void)
122122
{
123123
Ticker t;
124-
t.attach_us([&] { run_release_wait_signal_wait_callback(); }, 3000);
125-
uint32_t ret = ThisThread::flags_wait_all_for(ALL_SIGNALS, osWaitForever);
124+
t.attach([&] { run_release_wait_signal_wait_callback(); }, 3ms);
125+
uint32_t ret = ThisThread::flags_wait_all_for(ALL_SIGNALS, Kernel::wait_for_u32_forever);
126126
TEST_ASSERT_EQUAL(ALL_SIGNALS, ret);
127127
}
128128

129129
void run_release_wait_signal_set_callback(int32_t signal, osThreadId_t id)
130130
{
131-
int32_t ret;
132131
if (signal == 0) {
133132
for (int i = 0; i < 16; i++) {
134133
int32_t signal = 1 << i;
135-
ret = osThreadFlagsSet(id, signal);
134+
osThreadFlagsSet(id, signal);
136135
}
137136
} else {
138-
ret = osThreadFlagsSet(id, signal);
137+
osThreadFlagsSet(id, signal);
139138
}
140139
}
141140

@@ -153,8 +152,8 @@ void test_wait_all_loop_with_ticker(void)
153152
Semaphore sem(0, 1);
154153
Ticker t;
155154
osThreadId_t id = ThisThread::get_id();
156-
t.attach_us([&] { run_release_wait_signal_set_callback(0, id); }, 4000);
157-
ret = ThisThread::flags_wait_all_for((ALL_SIGNALS & 0xFFFF), osWaitForever, true);
155+
t.attach([&] { run_release_wait_signal_set_callback(0, id); }, 4ms);
156+
ret = ThisThread::flags_wait_all_for((ALL_SIGNALS & 0xFFFF), Kernel::wait_for_u32_forever, true);
158157
TEST_ASSERT_EQUAL((ALL_SIGNALS & 0xFFFF), ret);
159158
}
160159

@@ -172,10 +171,10 @@ void test_set_double_with_ticker(void)
172171
int32_t ret;
173172
Ticker t1, t2;
174173
osThreadId_t id = ThisThread::get_id();
175-
t1.attach_us([&] { run_release_wait_signal_set_callback(SIGNAL2, id); }, 3000);
176-
t2.attach_us([&] { run_release_wait_signal_set_callback(SIGNAL1 | SIGNAL2 | SIGNAL3, id); }, 4000);
174+
t1.attach([&] { run_release_wait_signal_set_callback(SIGNAL2, id); }, 3ms);
175+
t2.attach([&] { run_release_wait_signal_set_callback(SIGNAL1 | SIGNAL2 | SIGNAL3, id); }, 4ms);
177176

178-
ret = ThisThread::flags_wait_all_for((SIGNAL1 | SIGNAL2 | SIGNAL3), osWaitForever, true);
177+
ret = ThisThread::flags_wait_all_for((SIGNAL1 | SIGNAL2 | SIGNAL3), Kernel::wait_for_u32_forever, true);
179178
TEST_ASSERT_EQUAL(SIGNAL1 | SIGNAL2 | SIGNAL3, ret);
180179
}
181180

@@ -197,7 +196,7 @@ template <int32_t signals, uint32_t timeout, uint32_t test_val>
197196
void run_release_signal_wait(Semaphore *sem)
198197
{
199198
sem->release();
200-
uint32_t ret = ThisThread::flags_wait_all_for(signals, timeout);
199+
uint32_t ret = ThisThread::flags_wait_all_for(signals, std::chrono::milliseconds(timeout));
201200
TEST_ASSERT_EQUAL(test_val, ret);
202201
}
203202

@@ -206,7 +205,7 @@ void run_release_wait_signal_wait(Sync *sync)
206205
{
207206
sync->sem_parent.release();
208207
sync->sem_child.acquire();
209-
uint32_t ret = ThisThread::flags_wait_all_for(signals, timeout);
208+
uint32_t ret = ThisThread::flags_wait_all_for(signals, std::chrono::milliseconds(timeout));
210209
TEST_ASSERT_EQUAL(test_val, ret);
211210
}
212211

@@ -314,7 +313,6 @@ void test_set_all(void)
314313
*/
315314
void test_set_prohibited(void)
316315
{
317-
int32_t ret;
318316
Semaphore sem_parent(0, 1);
319317
Semaphore sem_child(0, 1);
320318
Sync sync(sem_parent, sem_child);
@@ -326,7 +324,7 @@ void test_set_prohibited(void)
326324
t.flags_set(ALL_SIGNALS);
327325

328326
#if !MBED_TRAP_ERRORS_ENABLED
329-
ret = t.flags_set(PROHIBITED_SIGNAL);
327+
int32_t ret = t.flags_set(PROHIBITED_SIGNAL);
330328
TEST_ASSERT_EQUAL(osErrorParameter, ret);
331329
#endif
332330

targets/TARGET_GigaDevice/TARGET_GD32F30X/TARGET_GD32F307VG/PinNames.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,12 @@ typedef enum {
177177
ARDUINO_UNO_D15 = PORTB_8,
178178
#endif
179179

180-
LED1 = PORTE_0,
181-
LED2 = PORTE_1,
182-
LED3 = PORTE_6,
180+
#define LED1 PORTE_0
181+
#define LED2 PORTE_1
182+
#define LED3 PORTE_6
183183

184-
KEY1 = PORTE_2,
185-
KEY2 = PORTE_7,
186-
187-
BUTTON1 = KEY1,
188-
BUTTON2 = KEY2,
184+
#define BUTTON1 PORTE_2
185+
#define BUTTON2 PORTE_2
189186

190187
SERIAL_TX = PORTC_10,
191188
SERIAL_RX = PORTC_11,

targets/TARGET_Maxim/TARGET_MAX32670/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
add_subdirectory(TARGET_MAX32670EVKIT EXCLUDE_FROM_ALL)
5+
add_subdirectory(TARGET_XDOT_MAX32670 EXCLUDE_FROM_ALL)
56

67
if(${MBED_TOOLCHAIN} STREQUAL "ARM")
78
set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MAX32670.sct)

0 commit comments

Comments
 (0)