fixed a few compiler warnings

This commit is contained in:
Markus Fröschle
2012-12-15 18:50:15 +00:00
parent 68194329d2
commit e298e1b4c9
4 changed files with 30 additions and 119 deletions

View File

@@ -29,8 +29,35 @@
#include <bas_types.h>
extern inline void wait(uint32_t us);
extern inline bool waitfor(uint32_t us, int (*condition)(void));
typedef uint32_t (*checker_func)(void);
extern __inline__ void wait(uint32_t) __attribute__((always_inline));
extern __inline__ uint32_t waitfor(uint32_t us, checker_func condition) __attribute__((always_inline));
/*
* wait for the specified number of us on slice timer 0. Replaces the original routines that had
* the number of useconds to wait for hardcoded in their name.
*/
extern __inline__ void wait(uint32_t us)
{
uint32_t target = MCF_SLT_SCNT(0) - (us * 132);
while (MCF_SLT_SCNT(0) > target);
}
/*
* the same as above, with a checker function which gets called while
* busy waiting and allows for an early return if it returns true
*/
extern __inline__ uint32_t waitfor(uint32_t us, checker_func condition)
{
uint32_t target = MCF_SLT_SCNT(0) - (us * 132);
uint32_t res;
do
{
if ((res = (*condition)()))
return res;
} while (MCF_SLT_SCNT(0) > target);
return 0;
}
#endif /* _WAIT_H_ */