Skip to content

Commit 636af4d

Browse files
mark9064JF002
authored andcommitted
Simplify ISR task wake checks
The macro checks the variable, so we don't need to check it ourselves
1 parent 70f6604 commit 636af4d

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

src/displayapp/DisplayApp.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,7 @@ void DisplayApp::PushMessage(Messages msg) {
561561
if (in_isr()) {
562562
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
563563
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
564-
if (xHigherPriorityTaskWoken == pdTRUE) {
565-
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
566-
}
564+
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
567565
} else {
568566
TickType_t timeout = portMAX_DELAY;
569567
// Make xQueueSend() non-blocking if the message is a Notification message. We do this to avoid

src/displayapp/DisplayAppRecovery.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,9 @@ void DisplayApp::DisplayOtaProgress(uint8_t percent, uint16_t color) {
110110
}
111111

112112
void DisplayApp::PushMessage(Display::Messages msg) {
113-
BaseType_t xHigherPriorityTaskWoken;
114-
xHigherPriorityTaskWoken = pdFALSE;
113+
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
115114
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
116-
if (xHigherPriorityTaskWoken) {
117-
/* Actual macro used here is port specific. */
118-
// TODO : should I do something here?
119-
}
115+
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
120116
}
121117

122118
void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) {

src/heartratetask/HeartRateTask.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ void HeartRateTask::Work() {
103103
void HeartRateTask::PushMessage(HeartRateTask::Messages msg) {
104104
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
105105
xQueueSendFromISR(messageQueue, &msg, &xHigherPriorityTaskWoken);
106-
if (xHigherPriorityTaskWoken) {
107-
/* Actual macro used here is port specific. */
108-
// TODO : should I do something here?
109-
}
106+
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
110107
}
111108

112109
void HeartRateTask::StartMeasurement() {

src/systemtask/SystemTask.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,7 @@ void SystemTask::PushMessage(System::Messages msg) {
512512
if (in_isr()) {
513513
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
514514
xQueueSendFromISR(systemTasksMsgQueue, &msg, &xHigherPriorityTaskWoken);
515-
if (xHigherPriorityTaskWoken == pdTRUE) {
516-
/* Actual macro used here is port specific. */
517-
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
518-
}
515+
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
519516
} else {
520517
xQueueSend(systemTasksMsgQueue, &msg, portMAX_DELAY);
521518
}

0 commit comments

Comments
 (0)