riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
Conflicts:
	core/sched.c
	sys/auto_init.c
This commit is contained in:
Oliver Hahm 2012-11-05 19:15:57 -05:00
commit 92281753ad
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/sched.c
View File

@ -36,7 +36,11 @@ volatile int last_pid = -1;
clist_node_t *runqueues[SCHED_PRIO_LEVELS]; clist_node_t *runqueues[SCHED_PRIO_LEVELS];
static uint32_t runqueue_bitcache = 0; static uint32_t runqueue_bitcache = 0;
void sched_register_cb(void (*callback)(uint32_t, uint32_t));
#if SCHEDSTATISTICS #if SCHEDSTATISTICS
static void (*sched_cb)(uint32_t timestamp, uint32_t value) = NULL;
schedstat pidlist[MAXTHREADS]; schedstat pidlist[MAXTHREADS];
#endif #endif
@ -134,6 +138,11 @@ void sched_run() {
DEBUG("scheduler: done.\n"); DEBUG("scheduler: done.\n");
} }
#if SCHEDSTATISTICS
void sched_register_cb(void (*callback)(uint32_t, uint32_t)) {
sched_cb = callback;
}
#endif
void sched_set_status(tcb_t *process, unsigned int status) { void sched_set_status(tcb_t *process, unsigned int status) {
if (status & STATUS_ON_RUNQUEUE) { if (status & STATUS_ON_RUNQUEUE) {

2
cpu/lpc2387/include/lpc2387-rtc.h
View File

@ -51,7 +51,7 @@ and the mailinglist (subscription via web site)
#include <rtc.h> #include <rtc.h>
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <lpc2387.h> #include "lpc2387.h"
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/** /**

8
drivers/cc110x/cc1100-csmaca-mac.c
View File

@ -41,10 +41,10 @@ and the mailinglist (subscription via web site)
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "cc1100.h" #include <cc1100.h>
#include "cc1100_phy.h" #include <cc1100_phy.h>
#include "cc1100-csmaca-mac.h" #include <cc1100-csmaca-mac.h>
#include "protocol-multiplex.h" #include <protocol-multiplex.h>
#include "hwtimer.h" #include "hwtimer.h"
#include <vtimer.h> #include <vtimer.h>

4
projects/cc110x/main.c
View File

@ -4,8 +4,8 @@
#include <msg.h> #include <msg.h>
#include <kernel.h> #include <kernel.h>
#include "drivers/cc110x/cc1100.h" #include <cc1100.h>
#include "radio/radio.h" #include <radio/radio.h>
#include "gpioint.h" #include "gpioint.h"
#include "hwtimer.h" #include "hwtimer.h"

1
sys/shell/shell_commands.c
View File

@ -49,7 +49,6 @@ extern void _get_blocksize(char* unused);
extern void _get_sectorcount(char* unused); extern void _get_sectorcount(char* unused);
extern void _read_sector(char* sector); extern void _read_sector(char* sector);
extern void _read_bytes(char* bytes); extern void _read_bytes(char* bytes);
extern void _write_bytes(char* bytes);
#endif #endif
const shell_command_t _shell_command_list[] = { const shell_command_t _shell_command_list[] = {