Updated for the changed Rime API

This commit is contained in:
nvt-se 2010-03-18 14:25:54 +00:00
parent ef5a4a6ad7
commit cfcb6c6b71

View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: deluge.c,v 1.7 2009/05/15 23:04:15 nvt-se Exp $ * $Id: deluge.c,v 1.8 2010/03/18 14:25:54 nvt-se Exp $
*/ */
/** /**
@ -74,8 +74,8 @@
PROCESS(deluge_process, "Deluge process"); PROCESS(deluge_process, "Deluge process");
static void broadcast_recv(struct broadcast_conn *, rimeaddr_t *); static void broadcast_recv(struct broadcast_conn *, const rimeaddr_t *);
static void unicast_recv(struct unicast_conn *, rimeaddr_t *); static void unicast_recv(struct unicast_conn *, const rimeaddr_t *);
/* Implementation-specific variables. */ /* Implementation-specific variables. */
static struct broadcast_conn deluge_broadcast; static struct broadcast_conn deluge_broadcast;
@ -98,8 +98,8 @@ static struct ctimer profile_timer;
static unsigned next_object_id; static unsigned next_object_id;
static const struct broadcast_callbacks broadcast_call = {broadcast_recv}; static const struct broadcast_callbacks broadcast_call = {broadcast_recv, NULL};
static const struct unicast_callbacks unicast_call = {unicast_recv}; static const struct unicast_callbacks unicast_call = {unicast_recv, NULL};
#if ENERGEST_CONF_ON #if ENERGEST_CONF_ON
static long cpu_start_time, tx_start_time, listen_start_time; static long cpu_start_time, tx_start_time, listen_start_time;
@ -296,7 +296,7 @@ advertise_summary(struct deluge_object *obj)
} }
static void static void
handle_summary(struct deluge_msg_summary *msg, rimeaddr_t *sender) handle_summary(struct deluge_msg_summary *msg, const rimeaddr_t *sender)
{ {
int highest_available, i; int highest_available, i;
clock_time_t oldest_request, oldest_data, now; clock_time_t oldest_request, oldest_data, now;
@ -505,7 +505,7 @@ handle_packet(struct deluge_msg_packet *msg)
} }
static void static void
unicast_recv(struct unicast_conn *c, rimeaddr_t *sender) unicast_recv(struct unicast_conn *c, const rimeaddr_t *sender)
{ {
char *msg; char *msg;
int len; int len;
@ -614,7 +614,7 @@ handle_profile(struct deluge_msg_profile *msg)
} }
static void static void
broadcast_recv(struct broadcast_conn *c, rimeaddr_t *sender) broadcast_recv(struct broadcast_conn *c, const rimeaddr_t *sender)
{ {
char *msg; char *msg;
int len; int len;