andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed SB initialization function. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14900 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-10-12 07:31:09 +00:00
parent b84aca5137
commit 5664a8ffd0
4 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/various/SB-CLIENT-32k-08070000-4k-2001E000/main.c
View File

@ -26,9 +26,6 @@
*/
int main(void) {
/* API layer initialization.*/
sbApiInit();
#if 0
/* Test for exception on interrupt.*/
asm volatile ("mov r0, #64");

3
demos/various/SB-CLIENT-32k-08078000-4k-2001F000/main.c
View File

@ -26,9 +26,6 @@
*/
int main(void) {
/* API layer initialization.*/
sbApiInit();
#if 0
/* Test for exception on interrupt.*/
asm volatile ("mov r0, #64");

16
os/sb/user/sbuser.c
View File

@ -39,11 +39,6 @@
/* Module exported variables. */
/*===========================================================================*/
/**
* @brief Sandbox API internal state.
*/
sbapi_state_t sb;
/*===========================================================================*/
/* Module local types. */
/*===========================================================================*/
@ -60,15 +55,4 @@ sbapi_state_t sb;
/* Module exported functions. */
/*===========================================================================*/
/**
* @brief API layer initialization.
* @note To be called before any other call to the "sb" functions.
*
* @init
*/
void sbApiInit(void) {
sb.frequency = (time_conv_t)sbGetFrequency();
}
/** @} */

39
os/sb/user/sbuser.h
View File

@ -91,16 +91,6 @@ typedef uint32_t eventmask_t;
*/
typedef uint32_t eventflags_t;
/**
* @brief Type of a sandbox API internal state variables.
*/
typedef struct {
/**
* @brief System tick frequency.
*/
time_conv_t frequency;
} sbapi_state_t;
/*===========================================================================*/
/* Module macros. */
/*===========================================================================*/
@ -172,12 +162,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
extern sbapi_state_t sb;
#ifdef __cplusplus
extern "C" {
#endif
void sbApiInit(void);
#ifdef __cplusplus
}
#endif
@ -452,8 +440,9 @@ static inline uint32_t sbEventBroadcastFlags(eventflags_t flags) {
*/
static inline sysinterval_t sbTimeS2I(time_secs_t secs) {
time_conv_t ticks;
uint32_t f = sbGetFrequency();
ticks = (time_conv_t)secs * sb.frequency;
ticks = (time_conv_t)secs * f;
/* sbDbgAssert(ticks <= (time_conv_t)TIME_MAX_INTERVAL,
"conversion overflow");*/
@ -473,9 +462,9 @@ static inline sysinterval_t sbTimeS2I(time_secs_t secs) {
*/
static inline sysinterval_t sbTimeMS2I(time_msecs_t msec) {
time_conv_t ticks;
uint32_t f = sbGetFrequency();
ticks = (((time_conv_t)msec * sb.frequency) +
(time_conv_t)999) / (time_conv_t)1000;
ticks = (((time_conv_t)msec * f) + (time_conv_t)999) / (time_conv_t)1000;
/* chDbgAssert(ticks <= (time_conv_t)TIME_MAX_INTERVAL,
"conversion overflow");*/
@ -495,9 +484,9 @@ static inline sysinterval_t sbTimeMS2I(time_msecs_t msec) {
*/
static inline sysinterval_t sbTimeUS2I(time_usecs_t usec) {
time_conv_t ticks;
uint32_t f = sbGetFrequency();
ticks = (((time_conv_t)usec * sb.frequency) +
(time_conv_t)999999) / (time_conv_t)1000000;
ticks = (((time_conv_t)usec * f) + (time_conv_t)999999) / (time_conv_t)1000000;
/* chDbgAssert(ticks <= (time_conv_t)TIME_MAX_INTERVAL,
"conversion overflow");*/
@ -517,10 +506,9 @@ static inline sysinterval_t sbTimeUS2I(time_usecs_t usec) {
*/
static inline time_secs_t sbTimeI2S(sysinterval_t interval) {
time_conv_t secs;
uint32_t f = sbGetFrequency();
secs = ((time_conv_t)interval +
sb.frequency -
(time_conv_t)1) / sb.frequency;
secs = ((time_conv_t)interval + f - (time_conv_t)1) / f;
/* sbDbgAssert(secs < (time_conv_t)((time_secs_t)-1),
"conversion overflow");*/
@ -540,10 +528,9 @@ static inline time_secs_t sbTimeI2S(sysinterval_t interval) {
*/
static inline time_msecs_t sbTimeI2MS(sysinterval_t interval) {
time_conv_t msecs;
uint32_t f = sbGetFrequency();
msecs = (((time_conv_t)interval * (time_conv_t)1000) +
sb.frequency - (time_conv_t)1) /
sb.frequency;
msecs = (((time_conv_t)interval * (time_conv_t)1000) + f - (time_conv_t)1) / f;
/* sbDbgAssert(msecs < (time_conv_t)((time_msecs_t)-1),
"conversion overflow");*/
@ -563,9 +550,9 @@ static inline time_msecs_t sbTimeI2MS(sysinterval_t interval) {
*/
static inline time_usecs_t sbTimeI2US(sysinterval_t interval) {
time_conv_t usecs;
uint32_t f = sbGetFrequency();
usecs = (((time_conv_t)interval * (time_conv_t)1000000) +
sb.frequency - (time_conv_t)1) / sb.frequency;
usecs = (((time_conv_t)interval * (time_conv_t)1000000) + f - (time_conv_t)1) / f;
/* sbDbgAssert(usecs <= (time_conv_t)((time_usecs_t)-1),
"conversion overflow");*/