Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f1314fa

Browse files
kjbraceykjbracey
committedDec 19, 2019
Thread: remove methods deprecated in 5.10
1 parent 1d5bd75 commit f1314fa

File tree

2 files changed

+0
-195
lines changed

2 files changed

+0
-195
lines changed
 

‎rtos/Thread.h

-119
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,6 @@ class Thread : private mbed::NonCopyable<Thread> {
318318
*/
319319
uint32_t flags_set(uint32_t flags);
320320

321-
/** Set the specified Thread Flags for the thread.
322-
@param signals specifies the signal flags of the thread that should be set.
323-
@return signal flags after setting or osFlagsError in case of incorrect parameters.
324-
325-
@note You may call this function from ISR context.
326-
@deprecated Other signal_xxx methods have been deprecated in favour of ThisThread::flags functions.
327-
To match this naming scheme, derived from CMSIS-RTOS2, Thread::flags_set is now provided.
328-
*/
329-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
330-
"Other signal_xxx methods have been deprecated in favour of ThisThread::flags functions. "
331-
"To match this naming scheme, derived from CMSIS-RTOS2, Thread::flags_set is now provided.")
332-
int32_t signal_set(int32_t signals);
333-
334321
/** State of the Thread */
335322
enum State {
336323
Inactive, /**< NOT USED */
@@ -403,112 +390,6 @@ class Thread : private mbed::NonCopyable<Thread> {
403390
*/
404391
osThreadId_t get_id() const;
405392

406-
/** Clears the specified Thread Flags of the currently running thread.
407-
@param signals specifies the signal flags of the thread that should be cleared.
408-
@return signal flags before clearing or osFlagsError in case of incorrect parameters.
409-
410-
@note You cannot call this function from ISR context.
411-
@deprecated Static methods only affecting current thread cause confusion. Replaced by ThisThread::flags_clear.
412-
*/
413-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
414-
"Static methods only affecting current thread cause confusion. "
415-
"Replaced by ThisThread::flags_clear.")
416-
static int32_t signal_clr(int32_t signals);
417-
418-
/** Wait for one or more Thread Flags to become signaled for the current RUNNING thread.
419-
@param signals wait until all specified signal flags are set or 0 for any single signal flag.
420-
@param millisec timeout value. (default: osWaitForever).
421-
@return event flag information or error code. @note if @a millisec is set to 0 and flag is no set the event carries osOK value.
422-
423-
@note You cannot call this function from ISR context.
424-
@deprecated Static methods only affecting current thread cause confusion.
425-
Replaced by ThisThread::flags_wait_all, ThisThread::flags_wait_all_for, ThisThread::flags_wait_any and ThisThread:wait_any_for.
426-
*/
427-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
428-
"Static methods only affecting current thread cause confusion. "
429-
"Replaced by ThisThread::flags_wait_all, ThisThread::flags_wait_all_for, ThisThread::flags_wait_any and ThisThread:wait_any_for.")
430-
static osEvent signal_wait(int32_t signals, uint32_t millisec = osWaitForever);
431-
432-
/** Wait for a specified time period in milliseconds
433-
Being tick-based, the delay will be up to the specified time - eg for
434-
a value of 1 the system waits until the next millisecond tick occurs,
435-
leading to a delay of 0-1 milliseconds.
436-
@param millisec time delay value
437-
@return status code that indicates the execution status of the function.
438-
439-
@note You cannot call this function from ISR context.
440-
@deprecated Static methods only affecting current thread cause confusion. Replaced by ThisThread::sleep_for.
441-
*/
442-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
443-
"Static methods only affecting current thread cause confusion. "
444-
"Replaced by ThisThread::sleep_for.")
445-
static osStatus wait(uint32_t millisec);
446-
447-
/** Wait until a specified time in millisec
448-
The specified time is according to Kernel::get_ms_count().
449-
@param millisec absolute time in millisec
450-
@return status code that indicates the execution status of the function.
451-
@note not callable from interrupt
452-
@note if millisec is equal to or lower than the current tick count, this
453-
returns immediately, either with an error or "osOK".
454-
@note the underlying RTOS may have a limit to the maximum wait time
455-
due to internal 32-bit computations, but this is guaranteed to work if the
456-
delay is <= 0x7fffffff milliseconds (~24 days). If the limit is exceeded,
457-
it may return with an immediate error, or wait for the maximum delay.
458-
459-
@note You cannot call this function from ISR context.
460-
@deprecated Static methods only affecting current thread cause confusion. Replaced by ThisThread::sleep_until.
461-
*/
462-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
463-
"Static methods only affecting current thread cause confusion. "
464-
"Replaced by ThisThread::sleep_until.")
465-
static osStatus wait_until(uint64_t millisec);
466-
467-
/** Pass control to next thread that is in state READY.
468-
@return status code that indicates the execution status of the function.
469-
470-
@note You cannot call this function from ISR context.
471-
@deprecated Static methods only affecting current thread cause confusion. Replaced by ThisThread::sleep_until.
472-
*/
473-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
474-
"Static methods only affecting current thread cause confusion. "
475-
"Replaced by ThisThread::yield.")
476-
static osStatus yield();
477-
478-
/** Get the thread id of the current running thread.
479-
@return thread ID for reference by other functions or nullptr in case of error.
480-
481-
@note You may call this function from ISR context.
482-
@deprecated Static methods only affecting current thread cause confusion. Replaced by ThisThread::get_id.
483-
Use Thread::get_id for the ID of a specific Thread.
484-
*/
485-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
486-
"Static methods only affecting current thread cause confusion. "
487-
"Replaced by ThisThread::get_id. Use Thread::get_id for the ID of a specific Thread.")
488-
static osThreadId gettid();
489-
490-
/** Attach a function to be called by the RTOS idle task
491-
@param fptr pointer to the function to be called
492-
493-
@note You may call this function from ISR context.
494-
@deprecated Static methods affecting system cause confusion. Replaced by Kernel::attach_idle_hook.
495-
*/
496-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
497-
"Static methods affecting system cause confusion. "
498-
"Replaced by Kernel::attach_idle_hook.")
499-
static void attach_idle_hook(void (*fptr)(void));
500-
501-
/** Attach a function to be called when a task is killed
502-
@param fptr pointer to the function to be called
503-
504-
@note You may call this function from ISR context.
505-
@deprecated Static methods affecting system cause confusion. Replaced by Kernel::attach_thread_terminate_hook.
506-
*/
507-
MBED_DEPRECATED_SINCE("mbed-os-5.10",
508-
"Static methods affecting system cause confusion. "
509-
"Replaced by Kernel::attach_thread_terminate_hook.")
510-
static void attach_terminate_hook(void (*fptr)(osThreadId id));
511-
512393
/** Thread destructor
513394
*
514395
* @note You cannot call this function from ISR context.

‎rtos/source/Thread.cpp

-76
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ uint32_t Thread::flags_set(uint32_t flags)
194194
return flags;
195195
}
196196

197-
int32_t Thread::signal_set(int32_t flags)
198-
{
199-
return osThreadFlagsSet(_tid, flags);
200-
}
201-
202197
Thread::State Thread::get_state() const
203198
{
204199
uint8_t state = osThreadTerminated;
@@ -342,77 +337,6 @@ osThreadId_t Thread::get_id() const
342337
return _tid;
343338
}
344339

345-
int32_t Thread::signal_clr(int32_t flags)
346-
{
347-
return osThreadFlagsClear(flags);
348-
}
349-
350-
osEvent Thread::signal_wait(int32_t signals, uint32_t millisec)
351-
{
352-
uint32_t res;
353-
osEvent evt;
354-
uint32_t options = osFlagsWaitAll;
355-
if (signals == 0) {
356-
options = osFlagsWaitAny;
357-
signals = 0x7FFFFFFF;
358-
}
359-
res = osThreadFlagsWait(signals, options, millisec);
360-
if (res & osFlagsError) {
361-
switch (res) {
362-
case osFlagsErrorISR:
363-
evt.status = osErrorISR;
364-
break;
365-
case osFlagsErrorResource:
366-
evt.status = osOK;
367-
break;
368-
case osFlagsErrorTimeout:
369-
evt.status = (osStatus)osEventTimeout;
370-
break;
371-
case osFlagsErrorParameter:
372-
default:
373-
evt.status = (osStatus)osErrorValue;
374-
break;
375-
}
376-
} else {
377-
evt.status = (osStatus)osEventSignal;
378-
evt.value.signals = res;
379-
}
380-
381-
return evt;
382-
}
383-
384-
osStatus Thread::wait(uint32_t millisec)
385-
{
386-
ThisThread::sleep_for(millisec);
387-
return osOK;
388-
}
389-
390-
osStatus Thread::wait_until(uint64_t millisec)
391-
{
392-
ThisThread::sleep_until(millisec);
393-
return osOK;
394-
}
395-
396-
osStatus Thread::yield()
397-
{
398-
return osThreadYield();
399-
}
400-
401-
osThreadId Thread::gettid()
402-
{
403-
return osThreadGetId();
404-
}
405-
406-
void Thread::attach_idle_hook(void (*fptr)(void))
407-
{
408-
rtos_attach_idle_hook(fptr);
409-
}
410-
411-
void Thread::attach_terminate_hook(void (*fptr)(osThreadId_t id))
412-
{
413-
rtos_attach_thread_terminate_hook(fptr);
414-
}
415-
416340
Thread::~Thread()
417341
{
418342
// terminate is thread safe

0 commit comments

Comments
 (0)
Please sign in to comment.