Interface: Add mutex APIs in the os_wrapper
This patch adds mutex APIs in the os_wrapper and the implementation
for CMSIS-RTOS V2.
Change-Id: Idd61046ed21495a0ccda21687491281d87b3b0c2
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/app/os_wrapper_cmsis_rtos_v2.c b/app/os_wrapper_cmsis_rtos_v2.c
index a91ddd3..2a7c7e4 100644
--- a/app/os_wrapper_cmsis_rtos_v2.c
+++ b/app/os_wrapper_cmsis_rtos_v2.c
@@ -62,7 +62,7 @@
return OS_WRAPPER_ERROR;
}
- return 0;
+ return OS_WRAPPER_SUCCESS;
}
uint32_t os_wrapper_semaphore_release(uint32_t sema)
@@ -74,7 +74,7 @@
return OS_WRAPPER_ERROR;
}
- return 0;
+ return OS_WRAPPER_SUCCESS;
}
uint32_t os_wrapper_semaphore_delete(uint32_t sema)
@@ -86,7 +86,80 @@
return OS_WRAPPER_ERROR;
}
- return 0;
+ return OS_WRAPPER_SUCCESS;
+}
+
+uint32_t os_wrapper_mutex_create(void)
+{
+ osMutexId_t id;
+ const osMutexAttr_t attr = {
+ .name = NULL,
+ .attr_bits = osMutexPrioInherit, /* Priority inheritance is recommended
+ * to enable if it is supported.
+ * For recursive mutex and the ability
+ * of auto release when owner being
+ * terminated is not required.
+ */
+ .cb_mem = NULL,
+ .cb_size = 0U
+ };
+
+ id = osMutexNew(&attr);
+ if (!id) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ return (uint32_t)id;
+}
+
+uint32_t os_wrapper_mutex_acquire(uint32_t mutex_id, uint32_t timeout)
+{
+ osStatus_t status = osOK;
+
+ if (!mutex_id) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ status = osMutexAcquire((osMutexId_t)mutex_id,
+ (timeout == OS_WRAPPER_WAIT_FOREVER) ?
+ osWaitForever : timeout);
+ if (status != osOK) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ return OS_WRAPPER_SUCCESS;
+}
+
+uint32_t os_wrapper_mutex_release(uint32_t mutex_id)
+{
+ osStatus_t status = osOK;
+
+ if (!mutex_id) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ status = osMutexRelease((osMutexId_t)mutex_id);
+ if (status != osOK) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ return OS_WRAPPER_SUCCESS;
+}
+
+uint32_t os_wrapper_mutex_delete(uint32_t mutex_id)
+{
+ osStatus_t status = osOK;
+
+ if (!mutex_id) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ status = osMutexDelete((osMutexId_t)mutex_id);
+ if (status != osOK) {
+ return OS_WRAPPER_ERROR;
+ }
+
+ return OS_WRAPPER_SUCCESS;
}
uint32_t os_wrapper_thread_get_id(void)
diff --git a/interface/include/os_wrapper.h b/interface/include/os_wrapper.h
index eab121e..90d2cd5 100644
--- a/interface/include/os_wrapper.h
+++ b/interface/include/os_wrapper.h
@@ -14,6 +14,7 @@
#include <stdint.h>
+#define OS_WRAPPER_SUCCESS (0x0)
#define OS_WRAPPER_ERROR (0xFFFFFFFFU)
#define OS_WRAPPER_WAIT_FOREVER (0xFFFFFFFFU)
#define OS_WRAPPER_DEFAULT_STACK_SIZE (-1)
@@ -28,8 +29,8 @@
* \param[in] initial_count Starting count of the semaphore
* \param[in] name Name of the semaphore
*
- * \return Returns ID of the semaphore created, or OS_WRAPPER_ERROR in case of
- * error
+ * \return Returns ID of the semaphore created, or \ref OS_WRAPPER_ERROR in case
+ * of error
*/
uint32_t os_wrapper_semaphore_create(uint32_t max_count, uint32_t initial_count,
const char *name);
@@ -40,8 +41,8 @@
* \param[in] semaphore_id Semaphore ID
* \param[in] timeout Timeout value
*
- * \return 0 in case of successful acquision, or OS_WRAPPER_ERROR in case of
- * error
+ * \return \ref OS_WRAPPER_SUCCESS in case of successful acquision, or
+ * \ref OS_WRAPPER_ERROR in case of error
*/
uint32_t os_wrapper_semaphore_acquire(uint32_t semaphore_id, uint32_t timeout);
@@ -50,7 +51,8 @@
*
* \param[in] semaphore_id Semaphore ID
*
- * \return 0 in case of successful release, or OS_WRAPPER_ERROR in case of error
+ * \return \ref OS_WRAPPER_SUCCESS in case of successful release, or
+ * \ref OS_WRAPPER_ERROR in case of error
*/
uint32_t os_wrapper_semaphore_release(uint32_t semaphore_id);
@@ -59,22 +61,64 @@
*
* \param[in] semaphore_id Semaphore ID
*
- * \return 0 in case of successful release, or OS_WRAPPER_ERROR in case of error
+ * \return \ref OS_WRAPPER_SUCCESS in case of successful release, or
+ * \ref OS_WRAPPER_ERROR in case of error
*/
uint32_t os_wrapper_semaphore_delete(uint32_t semaphore_id);
/**
+ * \brief Creates a mutex for mutual exclusion of resources
+ *
+ * \return The ID of the created mutex on success or \ref OS_WRAPPER_ERROR on
+ * error
+ */
+uint32_t os_wrapper_mutex_create(void);
+
+/**
+ * \brief Acquires a mutex that is created by \ref os_wrapper_mutex_create()
+ *
+ * \param[in] mutex_id The ID of the mutex to acquire. Should be one of the IDs
+ * returned by \ref os_wrapper_mutex_create()
+ * \param[in] timeout The maximum amount of time(in tick periods) for the
+ * thread to wait for the mutex to be available.
+ * If timeout is zero, the function will return immediately.
+ * Setting timeout to \ref OS_WRAPPER_WAIT_FOREVER will
+ * cause the thread to wait indefinitely
+ *
+ * \return \ref OS_WRAPPER_SUCCESS on success or \ref OS_WRAPPER_ERROR on error
+ */
+uint32_t os_wrapper_mutex_acquire(uint32_t mutex_id, uint32_t timeout);
+
+/**
+ * \brief Releases the mutex acquired previously
+ *
+ * \param[in] mutex_id The ID of the mutex that has been acquired
+ *
+ * \return \ref OS_WRAPPER_SUCCESS on success or \ref OS_WRAPPER_ERROR on error
+ */
+uint32_t os_wrapper_mutex_release(uint32_t mutex_id);
+
+/**
+ * \brief Deletes a mutex that is created by \ref os_wrapper_mutex_create()
+ *
+ * \param[in] mutex_id The ID of the mutex to be deleted
+ *
+ * \return \ref OS_WRAPPER_SUCCESS on success or \ref OS_WRAPPER_ERROR on error
+ */
+uint32_t os_wrapper_mutex_delete(uint32_t mutex_id);
+
+/**
* \brief Creates a new thread
*
* \param[in] name Name of the thread
* \param[in] stack_size Size of stack to be allocated for this thread. It can
- * be OS_WRAPPER_DEFAULT_STACK_SIZE to use the default
- * value provided by the underlying RTOS
+ * be \ref OS_WRAPPER_DEFAULT_STACK_SIZE to use the
+ * default value provided by the underlying RTOS
* \param[in] func Pointer to the function invoked by thread
* \param[in] arg Argument to pass to the function invoked by thread
* \param[in] priority Initial thread priority
*
- * \return Returns thread ID, or OS_WRAPPER_ERROR in case of error
+ * \return Returns thread ID, or \ref OS_WRAPPER_ERROR in case of error
*/
uint32_t os_wrapper_thread_new(const char *name, int32_t stack_size,
os_wrapper_thread_func func, void *arg,
@@ -82,23 +126,22 @@
/**
* \brief Gets current thread ID
*
- * \return Returns thread ID, or OS_WRAPPER_ERROR in case of error
+ * \return Returns thread ID, or \ref OS_WRAPPER_ERROR in case of error
*/
uint32_t os_wrapper_thread_get_id(void);
/**
* \brief Gets thread priority
*
- * \param[in] id Thread ID
+ * \param[in] id Thread ID
*
- * \return Returns thread priority value, or OS_WRAPPER_ERROR in case of error
+ * \return Returns thread priority value, or \ref OS_WRAPPER_ERROR in case of
+ * error
*/
uint32_t os_wrapper_thread_get_priority(uint32_t id);
/**
* \brief Exits the calling thread
- *
- * \return void
*/
void os_wrapper_thread_exit(void);