Merge branch 'contiki' into osd

This commit is contained in:
Harald Pichler 2014-11-26 13:04:26 +01:00
commit 079e46f427
2 changed files with 3 additions and 4 deletions

View file

@ -46,10 +46,6 @@
#include "sys/mt.h" #include "sys/mt.h"
#include "sys/cc.h" #include "sys/cc.h"
#define MT_STATE_READY 1
#define MT_STATE_RUNNING 2
#define MT_STATE_EXITED 5
static struct mt_thread *current; static struct mt_thread *current;
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/

View file

@ -84,6 +84,9 @@
#include "contiki.h" #include "contiki.h"
#define MT_STATE_READY 1
#define MT_STATE_RUNNING 2
#define MT_STATE_EXITED 5
/** /**
* An opaque structure that is used for holding the state of a thread. * An opaque structure that is used for holding the state of a thread.