deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Oliver Schmidt 2011-05-21 11:50:56 +02:00
commit 3d9771403e
54 changed files with 1205 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/powertrace/powertrace.c
View file

@ -90,8 +90,8 @@ powertrace_print(char *str)
all_lpm = energest_type_time(ENERGEST_TYPE_LPM);
all_transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT);
all_listen = energest_type_time(ENERGEST_TYPE_LISTEN);
all_idle_transmit = compower_idle_activity.transmit - last_idle_transmit;
all_idle_listen = compower_idle_activity.listen - last_idle_listen;
all_idle_transmit = compower_idle_activity.transmit;
all_idle_listen = compower_idle_activity.listen;
cpu = all_cpu - last_cpu;
lpm = all_lpm - last_lpm;
@ -267,7 +267,7 @@ input_sniffer(void)
}
/*---------------------------------------------------------------------------*/
static void
output_sniffer(void)
output_sniffer(int mac_status)
{
add_packet_stats(OUTPUT);
}
@ -293,7 +293,7 @@ input_printsniffer(void)
}
/*---------------------------------------------------------------------------*/
static void
output_printsniffer(void)
output_printsniffer(int mac_status)
{
static int seqno = 0;
sniffprint("O", seqno++);

2
apps/shell/shell-rime-sniff.c
View file

@ -114,7 +114,7 @@ input_sniffer(void)
}
/*---------------------------------------------------------------------------*/
static void
output_sniffer(void)
output_sniffer(int mac_status)
{
if(sniff_for_attributes) {
sniff_attributes_output(SNIFFER_ATTRIBUTES_OUTPUT);