diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-10 14:57:26 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-10 14:57:26 +0000 |
| commit | ade53fbc15fcf754ccb29e90f19cb2f921a90288 (patch) | |
| tree | 85d37e1a28065648ba0244046479f2a62da03b37 /os/common | |
| parent | 6495240dcd6df5d7026429f75f2d0a2bfd87018a (diff) | |
| download | ChibiOS-ade53fbc15fcf754ccb29e90f19cb2f921a90288.tar.gz ChibiOS-ade53fbc15fcf754ccb29e90f19cb2f921a90288.tar.bz2 ChibiOS-ade53fbc15fcf754ccb29e90f19cb2f921a90288.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9065 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common')
| -rw-r--r-- | os/common/abstractions/nasa_osal/src/osapi.c | 57 |
1 files changed, 39 insertions, 18 deletions
diff --git a/os/common/abstractions/nasa_osal/src/osapi.c b/os/common/abstractions/nasa_osal/src/osapi.c index 25e2d9702..c4b55ed14 100644 --- a/os/common/abstractions/nasa_osal/src/osapi.c +++ b/os/common/abstractions/nasa_osal/src/osapi.c @@ -215,6 +215,31 @@ uint32 queue_find(const char *queue_name) { return 0;
}
+/**
+ * @brief Finds a timer by name.
+ */
+uint32 timer_find(const char *timer_name) {
+ osal_timer_t *otp;
+
+ /* Searching the queue in the table.*/
+ for (otp = &osal.timers[0]; otp < &osal.timers[OS_MAX_TIMERS]; otp++) {
+ /* Entering a reentrant critical zone.*/
+ syssts_t sts = chSysGetStatusAndLockX();
+
+ if (!otp->is_free &&
+ (strncmp(otp->name, timer_name, OS_MAX_API_NAME - 1) == 0)) {
+ /* Leaving the critical zone.*/
+ chSysRestoreStatusX(sts);
+ return (uint32)otp;
+ }
+
+ /* Leaving the critical zone.*/
+ chSysRestoreStatusX(sts);
+ }
+
+ return 0;
+}
+
/*===========================================================================*/
/* Module exported functions. */
/*===========================================================================*/
@@ -429,23 +454,32 @@ int32 OS_TimerCreate(uint32 *timer_id, const char *timer_name, /* NULL pointer checks.*/
if ((timer_id == NULL) || (timer_name == NULL) ||
- (clock_accuracy == NULL) || (callback_ptr == NULL)) {
+ (clock_accuracy == NULL)) {
return OS_INVALID_POINTER;
}
/* NULL callback check.*/
if (callback_ptr == NULL) {
+ *timer_id = 0;
return OS_TIMER_ERR_INVALID_ARGS;
}
/* Checking timer name length.*/
if (strlen(timer_name) >= OS_MAX_API_NAME) {
+ *timer_id = 0;
return OS_ERR_NAME_TOO_LONG;
}
+ /* Checking if the name is already taken.*/
+ if (timer_find(timer_name) > 0) {
+ *timer_id = 0;
+ return OS_ERR_NAME_TAKEN;
+ }
+
/* Getting object.*/
otp = chPoolAlloc(&osal.timers_pool);
if (otp == NULL) {
+ *timer_id = 0;
return OS_ERR_NO_FREE_IDS;
}
@@ -552,7 +586,6 @@ int32 OS_TimerSet(uint32 timer_id, uint32 start_time, uint32 interval_time) { * @api
*/
int32 OS_TimerGetIdByName(uint32 *timer_id, const char *timer_name) {
- osal_timer_t *otp;
/* NULL pointer checks.*/
if ((timer_id == NULL) || (timer_name == NULL)) {
@@ -564,22 +597,10 @@ int32 OS_TimerGetIdByName(uint32 *timer_id, const char *timer_name) { return OS_ERR_NAME_TOO_LONG;
}
- /* Searching the timer in the table.*/
- for (otp = &osal.timers[0]; otp < &osal.timers[OS_MAX_QUEUES]; otp++) {
- /* Entering a reentrant critical zone.*/
- syssts_t sts = chSysGetStatusAndLockX();
-
- if (!otp->is_free &&
- (strncmp(otp->name, timer_name, OS_MAX_API_NAME - 1) == 0)) {
- *timer_id = (uint32)otp;
-
- /* Leaving the critical zone.*/
- chSysRestoreStatusX(sts);
- return OS_SUCCESS;
- }
-
- /* Leaving the critical zone.*/
- chSysRestoreStatusX(sts);
+ /* Searching the queue.*/
+ *timer_id = timer_find(timer_name);
+ if (*timer_id > 0) {
+ return OS_SUCCESS;
}
return OS_ERR_NAME_NOT_FOUND;
|