commit 244a310a799a414c38c7e9f4bb757319f9bb6866
author Jonny Svärd <jonny.svaerd@arm.com> Mon Dec 18 18:26:44 2023 +0100
committer Jonny Svärd <jonny.svaerd@arm.com> Tue Dec 19 16:15:57 2023 +0000
tree 3a2914e0b4c346eccf9ff3549847d9d3c784d6d2
parent 918cd906a3f3d2b130a5a3c551d795cf43150f1c

Add app support for core_driver inference timeout

Update example applications to support new core_driver inference
timeout feature.

Change-Id: Ib7283421aa8db9a3b5f1dd6d1bd44803491f0399
Signed-off-by: Jonny Svärd <jonny.svaerd@arm.com>

applications/freertos/main.cpp

diff --git a/applications/freertos/main.cpp b/applications/freertos/main.cpp
index 6ba369b..2dbc3a8 100644
--- a/applications/freertos/main.cpp
+++ b/applications/freertos/main.cpp
@@ -1,6 +1,5 @@
 /*
  * SPDX-FileCopyrightText: Copyright 2019-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
- *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the License); you may
@@ -174,10 +173,9 @@
     return (void *)sem;
 }
 
-int ethosu_semaphore_take(void *sem) {
+int ethosu_semaphore_take(void *sem, uint64_t timeout) {
     SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem);
-    if (xSemaphoreTake(handle, portMAX_DELAY) != pdTRUE) {
-        printf("Error: Failed to take semaphore.\n");
+    if (xSemaphoreTake(handle, (TickType_t)timeout) != pdTRUE) {
         return -1;
     }
     return 0;

applications/message_handler_openamp/core_driver_mutex.cpp

diff --git a/applications/message_handler_openamp/core_driver_mutex.cpp b/applications/message_handler_openamp/core_driver_mutex.cpp
index d023ad2..7948bd0 100644
--- a/applications/message_handler_openamp/core_driver_mutex.cpp
+++ b/applications/message_handler_openamp/core_driver_mutex.cpp
@@ -1,6 +1,5 @@
 /*
  * SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
- *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the License); you may
@@ -52,10 +51,10 @@
     return xSemaphoreCreateCounting(255, 0);
 }
 
-int ethosu_semaphore_take(void *sem) {
+int ethosu_semaphore_take(void *sem, uint64_t timeout) {
     SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem);
-    if (xSemaphoreTake(handle, portMAX_DELAY) != pdTRUE) {
-        printf("Error: Failed to take semaphore.\n");
+    if (xSemaphoreTake(handle, (TickType_t)timeout) != pdTRUE) {
+        // Semaphore take timed out
         return -1;
     }
     return 0;

applications/threadx_demo/main.cpp

diff --git a/applications/threadx_demo/main.cpp b/applications/threadx_demo/main.cpp
index 1211c78..c77c758 100644
--- a/applications/threadx_demo/main.cpp
+++ b/applications/threadx_demo/main.cpp
@@ -1,6 +1,5 @@
 /*
  * SPDX-FileCopyrightText: Copyright 2019-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
- *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the License); you may
@@ -192,13 +191,15 @@
     return (void *)semaphore;
 }
 
-int ethosu_semaphore_take(void *sem) {
+int ethosu_semaphore_take(void *sem, uint64_t timeout) {
     UINT status;
 
-    status = tx_semaphore_get(reinterpret_cast<TX_SEMAPHORE *>(sem), TX_WAIT_FOREVER);
+    status = tx_semaphore_get(reinterpret_cast<TX_SEMAPHORE *>(sem), (ULONG)timeout);
 
     if (status != TX_SUCCESS) {
-        printf("Semaphore get/take, error - %u\n", status);
+        if (status != TX_NO_INSTANCE) {
+            printf("Semaphore get/take, error - %u\n", status);
+        }
         return -1;
     }