andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More consistency changes. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14348 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-05-07 09:52:47 +00:00
parent 126e5c9344
commit 3be977634b
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/common/abstractions/cmsis_os/cmsis_os.c
View File

@ -208,8 +208,8 @@ osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
case CH_STATE_SNDMSGQ: case CH_STATE_SNDMSGQ:
#endif #endif
/* Re-enqueues tp with its new priority on the queue.*/ /* Re-enqueues tp with its new priority on the queue.*/
ch_sch_prio_insert(ch_queue_dequeue(&tp->hdr.queue), ch_sch_prio_insert((ch_queue_t *)tp->u.wtobjp,
(ch_queue_t *)tp->u.wtobjp); ch_queue_dequeue(&tp->hdr.queue));
break; break;
#endif #endif
case CH_STATE_READY: case CH_STATE_READY:

4
os/common/abstractions/nasa_cfe/osal/src/osapi.c
View File

@ -2022,8 +2022,8 @@ int32 OS_TaskSetPriority(uint32 task_id, uint32 new_priority) {
case CH_STATE_SNDMSGQ: case CH_STATE_SNDMSGQ:
#endif #endif
/* Re-enqueues tp with its new priority on the queue.*/ /* Re-enqueues tp with its new priority on the queue.*/
ch_sch_prio_insert(ch_queue_dequeue(&tp->hdr.queue), ch_sch_prio_insert((ch_queue_t *)tp->u.wtobjp,
(ch_queue_t *)tp->u.wtobjp); ch_queue_dequeue(&tp->hdr.queue));
break; break;
case CH_STATE_READY: case CH_STATE_READY:
#if CH_DBG_ENABLE_ASSERTS #if CH_DBG_ENABLE_ASSERTS

2
os/rt/include/chmsg.h
View File

@ -51,7 +51,7 @@
/*===========================================================================*/ /*===========================================================================*/
#if CH_CFG_USE_MESSAGES_PRIORITY == TRUE #if CH_CFG_USE_MESSAGES_PRIORITY == TRUE
#define __ch_msg_insert(qp, tp) ch_sch_prio_insert(&tp->hdr.queue, qp) #define __ch_msg_insert(qp, tp) ch_sch_prio_insert(qp, &tp->hdr.queue)
#else #else
#define __ch_msg_insert(qp, tp) ch_queue_insert(qp, &tp->hdr.queue) #define __ch_msg_insert(qp, tp) ch_queue_insert(qp, &tp->hdr.queue)
#endif #endif

4
os/rt/include/chschd.h
View File

@ -159,7 +159,7 @@ extern "C" {
void chSchDoYieldS(void); void chSchDoYieldS(void);
thread_t *chSchSelectFirstI(void); thread_t *chSchSelectFirstI(void);
#if CH_CFG_OPTIMIZE_SPEED == FALSE #if CH_CFG_OPTIMIZE_SPEED == FALSE
void ch_sch_prio_insert(ch_queue_t *tp, ch_queue_t *qp); void ch_sch_prio_insert(ch_queue_t *qp, ch_queue_t *tp);
#endif /* CH_CFG_OPTIMIZE_SPEED == FALSE */ #endif /* CH_CFG_OPTIMIZE_SPEED == FALSE */
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -172,7 +172,7 @@ extern "C" {
/* If the performance code path has been chosen then all the following /* If the performance code path has been chosen then all the following
functions are inlined into the various kernel modules.*/ functions are inlined into the various kernel modules.*/
#if CH_CFG_OPTIMIZE_SPEED == TRUE #if CH_CFG_OPTIMIZE_SPEED == TRUE
static inline void ch_sch_prio_insert(ch_queue_t *tp, ch_queue_t *qp) { static inline void ch_sch_prio_insert(ch_queue_t *qp, ch_queue_t *tp) {
ch_queue_t *cp = qp; ch_queue_t *cp = qp;
do { do {

4
os/rt/src/chcond.c
View File

@ -217,7 +217,7 @@ msg_t chCondWaitS(condition_variable_t *cp) {
/* Start waiting on the condition variable, on exit the mutex is taken /* Start waiting on the condition variable, on exit the mutex is taken
again.*/ again.*/
currtp->u.wtobjp = cp; currtp->u.wtobjp = cp;
ch_sch_prio_insert(&currtp->hdr.queue, &cp->queue); ch_sch_prio_insert(&cp->queue, &currtp->hdr.queue);
chSchGoSleepS(CH_STATE_WTCOND); chSchGoSleepS(CH_STATE_WTCOND);
msg = currtp->u.rdymsg; msg = currtp->u.rdymsg;
chMtxLockS(mp); chMtxLockS(mp);
@ -307,7 +307,7 @@ msg_t chCondWaitTimeoutS(condition_variable_t *cp, sysinterval_t timeout) {
/* Start waiting on the condition variable, on exit the mutex is taken /* Start waiting on the condition variable, on exit the mutex is taken
again.*/ again.*/
currtp->u.wtobjp = cp; currtp->u.wtobjp = cp;
ch_sch_prio_insert(&currtp->hdr.queue, &cp->queue); ch_sch_prio_insert(&cp->queue, &currtp->hdr.queue);
msg = chSchGoSleepTimeoutS(CH_STATE_WTCOND, timeout); msg = chSchGoSleepTimeoutS(CH_STATE_WTCOND, timeout);
if (msg != MSG_TIMEOUT) { if (msg != MSG_TIMEOUT) {
chMtxLockS(mp); chMtxLockS(mp);

10
os/rt/src/chmtx.c
View File

@ -170,8 +170,8 @@ void chMtxLockS(mutex_t *mp) {
switch (tp->state) { switch (tp->state) {
case CH_STATE_WTMTX: case CH_STATE_WTMTX:
/* Re-enqueues the mutex owner with its new priority.*/ /* Re-enqueues the mutex owner with its new priority.*/
ch_sch_prio_insert(ch_queue_dequeue(&tp->hdr.queue), ch_sch_prio_insert(&tp->u.wtmtxp->queue,
&tp->u.wtmtxp->queue); ch_queue_dequeue(&tp->hdr.queue));
tp = tp->u.wtmtxp->owner; tp = tp->u.wtmtxp->owner;
/*lint -e{9042} [16.1] Continues the while.*/ /*lint -e{9042} [16.1] Continues the while.*/
continue; continue;
@ -191,8 +191,8 @@ void chMtxLockS(mutex_t *mp) {
case CH_STATE_SNDMSGQ: case CH_STATE_SNDMSGQ:
#endif #endif
/* Re-enqueues tp with its new priority on the queue.*/ /* Re-enqueues tp with its new priority on the queue.*/
ch_sch_prio_insert(ch_queue_dequeue(&tp->hdr.queue), ch_sch_prio_insert(&tp->u.wtmtxp->queue,
&tp->u.wtmtxp->queue); ch_queue_dequeue(&tp->hdr.queue));
break; break;
#endif #endif
case CH_STATE_READY: case CH_STATE_READY:
@ -211,7 +211,7 @@ void chMtxLockS(mutex_t *mp) {
} }
/* Sleep on the mutex.*/ /* Sleep on the mutex.*/
ch_sch_prio_insert(&currtp->hdr.queue, &mp->queue); ch_sch_prio_insert(&mp->queue, &currtp->hdr.queue);
currtp->u.wtmtxp = mp; currtp->u.wtmtxp = mp;
chSchGoSleepS(CH_STATE_WTMTX); chSchGoSleepS(CH_STATE_WTMTX);

4
os/rt/src/chschd.c
View File

@ -234,12 +234,12 @@ static void __sch_wakeup(void *p) {
* @note The insertion is done by scanning the list from the highest * @note The insertion is done by scanning the list from the highest
* priority toward the lowest. * priority toward the lowest.
* *
* @param[in] tp the pointer to the thread to be inserted in the list
* @param[in] qp the pointer to the threads list header * @param[in] qp the pointer to the threads list header
* @param[in] tp the pointer to the thread to be inserted in the list
* *
* @notapi * @notapi
*/ */
void ch_sch_prio_insert(ch_queue_t *tp, ch_queue_t *qp) { void ch_sch_prio_insert(ch_queue_t *qp, ch_queue_t *tp) {
ch_queue_t *cp = qp; ch_queue_t *cp = qp;
do { do {

2
os/sb/host/sbhost.c
View File

@ -171,7 +171,7 @@ msg_t sbSendMessageTimeout(sb_class_t *sbcp,
/* Sending the message.*/ /* Sending the message.*/
ctp->u.sentmsg = msg; ctp->u.sentmsg = msg;
__ch_msg_insert(ctp, &sbcp->tp->msgqueue); __ch_msg_insert(&sbcp->tp->msgqueue, ctp);
if (sbcp->tp->state == CH_STATE_WTMSG) { if (sbcp->tp->state == CH_STATE_WTMSG) {
(void) chSchReadyI(sbcp->tp); (void) chSchReadyI(sbcp->tp);
} }