Merge branch 'develop' into 'master'

Develop



See merge request !40
This commit is contained in:
tkl 2016-09-21 08:14:49 +00:00
commit a77a4e9040
3 changed files with 7 additions and 2 deletions

View File

@ -1,7 +1,7 @@
variables:
SW_KERNEL: "0"
SW_MAJOR: "1"
SW_MINOR: "9"
SW_MINOR: "10"
before_script:
- "echo $CI_BUILD_ID"

View File

@ -60,5 +60,6 @@ struct thread_context *thread_create(
void thread_exit(void);
void sleep_ms(unsigned int ms);
unsigned long sys_tick_get_ms(void);
#endif /* SOURCE_FIRMWARE_KERNEL_INTERFACE_KERNEL_H_ */

View File

@ -54,6 +54,11 @@ void sys_tick_init(const struct loki_timer *hw_timer)
timer_set_it_callback(hw_timer, timer_cb, NULL);
}
unsigned long sys_tick_get_ms(void)
{
return sys_tick_obj.tick;
}
void sleep_ms(unsigned int ms)
{
int irq;
@ -68,4 +73,3 @@ void sleep_ms(unsigned int ms)
restore_irq(irq);
schedule();
}