r2maeh2/kosmos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Develop



See merge request !27
This commit is contained in:
tkl 2016-08-21 10:39:40 +00:00
commit e22c0629b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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

2
source/firmware/kernel/application.c
View File

@ -8,7 +8,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include "board.h"
#include "queue.h" #include "queue.h"
#include "stack.h" #include "stack.h"
#include "kernel.h" #include "kernel.h"
@ -17,6 +16,7 @@ static struct thread_context main_task;
static stack_t main_stack[0xFF]; static stack_t main_stack[0xFF];
extern void main(void *arg); extern void main(void *arg);
extern void board_init(void);
int start_application (int argc, char* argv[]) int start_application (int argc, char* argv[])
{ {