sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAM3/4, SAMA5, SAMv7 Tickless: Refuse to call lower-level timer logic if not yet initialized

Browse Source
This commit is contained in:
Gregory Nutt 2016-02-05 10:22:11 -06:00
parent 341fbe1186
commit 03b382d443
9 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/sam34/sam4cm_freerun.h
View File

@ -49,6 +49,12 @@
#ifdef CONFIG_SAM34_FREERUN
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define FREERUN_INITIALIZED(s) (((s)->tch) != NULL)
/****************************************************************************
* Public Types
****************************************************************************/

6
arch/arm/src/sam34/sam4cm_oneshot.h
View File

@ -49,6 +49,12 @@
#ifdef CONFIG_SAM34_ONESHOT
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ONESHOT_INITIALIZED(s) (((s)->tch) != NULL)
/****************************************************************************
* Public Types
****************************************************************************/

17
arch/arm/src/sam34/sam4cm_tickless.c
View File

@ -84,6 +84,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <errno.h>
#include <nuttx/arch.h>
@ -247,6 +248,8 @@ void up_timer_initialize(void)
PANIC();
}
DEBUGASSERT(ONESHOT_INITIALIZED(&g_tickless.oneshot));
#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
/* Get the maximum delay of the one-shot timer in microseconds */
@ -280,6 +283,8 @@ void up_timer_initialize(void)
tclldbg("ERROR: sam_freerun_initialize failed\n");
PANIC();
}
DEBUGASSERT(FREERUN_INITIALIZED(&g_tickless.freerun));
}
/****************************************************************************
@ -317,7 +322,9 @@ void up_timer_initialize(void)
int up_timer_gettime(FAR struct timespec *ts)
{
return sam_freerun_counter(&g_tickless.freerun, ts);
return FREERUN_INITIALIZED(&g_tickless.freerun) ?
sam_freerun_counter(&g_tickless.freerun, ts) :
-EAGAIN;
}
/****************************************************************************
@ -358,7 +365,9 @@ int up_timer_gettime(FAR struct timespec *ts)
int up_timer_cancel(FAR struct timespec *ts)
{
return sam_oneshot_cancel(&g_tickless.oneshot, ts);
return ONESHOT_INITIALIZED(&g_tickless.oneshot) ?
sam_oneshot_cancel(&g_tickless.oneshot, ts) :
-EAGAIN;
}
/****************************************************************************
@ -388,6 +397,8 @@ int up_timer_cancel(FAR struct timespec *ts)
int up_timer_start(FAR const struct timespec *ts)
{
return sam_oneshot_start(&g_tickless.oneshot, sam_oneshot_handler, NULL, ts);
return ONESHOT_INITIALIZED(&g_tickless.oneshot) ?
sam_oneshot_start(&g_tickless.oneshot, sam_oneshot_handler, NULL, ts) :
-EAGAIN;
}
#endif /* CONFIG_SCHED_TICKLESS */

2
arch/arm/src/sama5/sam_freerun.h
View File

@ -53,6 +53,8 @@
* Pre-processor Definitions
****************************************************************************/
#define FREERUN_INITIALIZED(s) (((s)->tch) != NULL)
/****************************************************************************
* Public Types
****************************************************************************/

2
arch/arm/src/sama5/sam_oneshot.h
View File

@ -53,6 +53,8 @@
* Pre-processor Definitions
****************************************************************************/
#define ONESHOT_INITIALIZED(s) (((s)->tch) != NULL)
/****************************************************************************
* Public Types
****************************************************************************/

17
arch/arm/src/sama5/sam_tickless.c
View File

@ -84,6 +84,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <errno.h>
#include <nuttx/arch.h>
@ -259,6 +260,8 @@ void up_timer_initialize(void)
PANIC();
}
DEBUGASSERT(ONESHOT_INITIALIZED(&g_tickless.oneshot));
#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
/* Get the maximum delay of the one-shot timer in microseconds */
@ -292,6 +295,8 @@ void up_timer_initialize(void)
tclldbg("ERROR: sam_freerun_initialize failed\n");
PANIC();
}
DEBUGASSERT(FREERUN_INITIALIZED(&g_tickless.freerun));
}
/****************************************************************************
@ -329,7 +334,9 @@ void up_timer_initialize(void)
int up_timer_gettime(FAR struct timespec *ts)
{
return sam_freerun_counter(&g_tickless.freerun, ts);
return FREERUN_INITIALIZED(&g_tickless.freerun) ?
sam_freerun_counter(&g_tickless.freerun, ts) :
-EAGAIN;
}
/****************************************************************************
@ -370,7 +377,9 @@ int up_timer_gettime(FAR struct timespec *ts)
int up_timer_cancel(FAR struct timespec *ts)
{
return sam_oneshot_cancel(&g_tickless.oneshot, ts);
return ONESHOT_INITIALIZED(&g_tickless.oneshot) ?
sam_oneshot_cancel(&g_tickless.oneshot, ts) :
-EAGAIN;
}
/****************************************************************************
@ -400,6 +409,8 @@ int up_timer_cancel(FAR struct timespec *ts)
int up_timer_start(FAR const struct timespec *ts)
{
return sam_oneshot_start(&g_tickless.oneshot, sam_oneshot_handler, NULL, ts);
return ONESHOT_INITIALIZED(&g_tickless.oneshot) ?
sam_oneshot_start(&g_tickless.oneshot, sam_oneshot_handler, NULL, ts) :
-EAGAIN;
}
#endif /* CONFIG_SCHED_TICKLESS */

2
arch/arm/src/samv7/sam_freerun.h
View File

@ -53,6 +53,8 @@
* Pre-processor Definitions
****************************************************************************/
#define FREERUN_INITIALIZED(s) (((s)->tch) != NULL)
/****************************************************************************
* Public Types
****************************************************************************/

2
arch/arm/src/samv7/sam_oneshot.h
View File

@ -53,6 +53,8 @@
* Pre-processor Definitions
****************************************************************************/
#define ONESHOT_INITIALIZED(s) (((s)->tch) != NULL)
/****************************************************************************
* Public Types
****************************************************************************/

17
arch/arm/src/samv7/sam_tickless.c
View File

@ -84,6 +84,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <errno.h>
#include <nuttx/arch.h>
@ -268,6 +269,8 @@ void up_timer_initialize(void)
PANIC();
}
DEBUGASSERT(ONESHOT_INITIALIZED(&g_tickless.oneshot));
/* Initialize the free-running timer */
ret = sam_freerun_initialize(&g_tickless.freerun,
@ -278,6 +281,8 @@ void up_timer_initialize(void)
tclldbg("ERROR: sam_freerun_initialize failed\n");
PANIC();
}
DEBUGASSERT(FREERUN_INITIALIZED(&g_tickless.freerun));
}
/****************************************************************************
@ -315,7 +320,9 @@ void up_timer_initialize(void)
int up_timer_gettime(FAR struct timespec *ts)
{
return sam_freerun_counter(&g_tickless.freerun, ts);
return FREERUN_INITIALIZED(&g_tickless.freerun) ?
sam_freerun_counter(&g_tickless.freerun, ts) :
-EAGAIN;
}
/****************************************************************************
@ -356,7 +363,9 @@ int up_timer_gettime(FAR struct timespec *ts)
int up_timer_cancel(FAR struct timespec *ts)
{
return sam_oneshot_cancel(&g_tickless.oneshot, ts);
return ONESHOT_INITIALIZED(&g_tickless.oneshot) ?
sam_oneshot_cancel(&g_tickless.oneshot, ts) :
-EAGAIN;
}
/****************************************************************************
@ -386,6 +395,8 @@ int up_timer_cancel(FAR struct timespec *ts)
int up_timer_start(FAR const struct timespec *ts)
{
return sam_oneshot_start(&g_tickless.oneshot, sam_oneshot_handler, NULL, ts);
return ONESHOT_INITIALIZED(&g_tickless.oneshot) ?
sam_oneshot_start(&g_tickless.oneshot, sam_oneshot_handler, NULL, ts) :
-EAGAIN;
}
#endif /* CONFIG_SCHED_TICKLESS */