Skip to content

Commit 05a37aa

Browse files
committed
Simplify ISR task wake checks
The macro checks the variable, so we don't need to check it ourselves
1 parent fa1af55 commit 05a37aa

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
@@ -560,9 +560,7 @@ void DisplayApp::PushMessage(Messages msg) {
560560
if (in_isr()) {
561561
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
562562
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
563-
if (xHigherPriorityTaskWoken == pdTRUE) {
564-
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
565-
}
563+
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
566564
} else {
567565
TickType_t timeout = portMAX_DELAY;
568566
// 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
@@ -504,10 +504,7 @@ void SystemTask::PushMessage(System::Messages msg) {
504504
if (in_isr()) {
505505
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
506506
xQueueSendFromISR(systemTasksMsgQueue, &msg, &xHigherPriorityTaskWoken);
507-
if (xHigherPriorityTaskWoken == pdTRUE) {
508-
/* Actual macro used here is port specific. */
509-
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
510-
}
507+
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
511508
} else {
512509
xQueueSend(systemTasksMsgQueue, &msg, portMAX_DELAY);
513510
}

0 commit comments

Comments
 (0)