Permalink
Browse files

Changed the name of the rimeaddr module to linkaddr

  • Loading branch information...
1 parent 765e9ac commit 45265249fc2d3c8cdf8494414ad946a30876d943 @adamdunkels adamdunkels committed Dec 12, 2013
Showing with 930 additions and 930 deletions.
  1. +2 −2 apps/collect-view/collect-view.c
  2. +2 −2 apps/collect-view/collect-view.h
  3. +7 −7 apps/deluge/deluge.c
  4. +1 −1 apps/deluge/deluge.h
  5. +5 −5 apps/powertrace/powertrace.c
  6. +1 −1 apps/serial-shell/serial-shell.c
  7. +4 −4 apps/shell/shell-download.c
  8. +14 −14 apps/shell/shell-netperf.c
  9. +4 −4 apps/shell/shell-rime-debug-runicast.c
  10. +3 −3 apps/shell/shell-rime-debug.c
  11. +2 −2 apps/shell/shell-rime-neighbors.c
  12. +2 −2 apps/shell/shell-rime-ping.c
  13. +2 −2 apps/shell/shell-rime-sendcmd.c
  14. +3 −3 apps/shell/shell-rime-sniff.c
  15. +3 −3 apps/shell/shell-rime-unicast.c
  16. +4 −4 apps/shell/shell-rime.c
  17. +1 −1 apps/shell/shell-rsh.c
  18. +1 −1 apps/shell/shell-sendtest.c
  19. +1 −1 core/dev/slip.c
  20. +2 −2 core/lib/print-stats.c
  21. +22 −22 core/net/ipv4/uip-over-mesh.c
  22. +1 −1 core/net/ipv4/uip-over-mesh.h
  23. +11 −11 core/net/ipv6/sicslowpan.c
  24. +6 −6 core/net/ipv6/uip-ds6-nbr.c
  25. +3 −3 core/net/ipv6/uip-ds6-route.c
  26. +16 −16 core/net/{rimeaddr.c → linkaddr.c}
  27. +18 −18 core/net/{rimeaddr.h → linkaddr.h}
  28. +6 −6 core/net/mac/contikimac/contikimac.c
  29. +5 −5 core/net/mac/csma.c
  30. +33 −33 core/net/mac/cxmac/cxmac.c
  31. +4 −4 core/net/mac/frame802154.c
  32. +1 −1 core/net/mac/frame802154.h
  33. +10 −10 core/net/mac/framer-802154.c
  34. +4 −4 core/net/mac/framer-nullmac.c
  35. +4 −4 core/net/mac/mac-sequence.c
  36. +9 −9 core/net/mac/nullrdc.c
  37. +3 −3 core/net/mac/phase.c
  38. +4 −4 core/net/mac/phase.h
  39. +8 −8 core/net/mac/sicslowmac/sicslowmac.c
  40. +11 −11 core/net/nbr-table.c
  41. +4 −4 core/net/nbr-table.h
  42. +4 −4 core/net/packetbuf.c
  43. +10 −10 core/net/packetbuf.h
  44. +1 −1 core/net/queuebuf.c
  45. +1 −1 core/net/queuebuf.h
  46. +3 −3 core/net/rime/abc.c
  47. +1 −1 core/net/rime/announcement.c
  48. +3 −3 core/net/rime/announcement.h
  49. +4 −4 core/net/rime/broadcast-announcement.c
  50. +6 −6 core/net/rime/broadcast.c
  51. +2 −2 core/net/rime/broadcast.h
  52. +7 −7 core/net/rime/chameleon-bitopt.c
  53. +11 −11 core/net/rime/chameleon-raw.c
  54. +4 −4 core/net/rime/chameleon.c
  55. +7 −7 core/net/rime/collect-neighbor.c
  56. +5 −5 core/net/rime/collect-neighbor.h
  57. +61 −61 core/net/rime/collect.c
  58. +3 −3 core/net/rime/collect.h
  59. +5 −5 core/net/rime/ipolite.c
  60. +1 −1 core/net/rime/ipolite.h
  61. +11 −11 core/net/rime/mesh.c
  62. +3 −3 core/net/rime/mesh.h
  63. +12 −12 core/net/rime/multihop.c
  64. +9 −9 core/net/rime/multihop.h
  65. +4 −4 core/net/rime/neighbor-discovery.c
  66. +1 −1 core/net/rime/neighbor-discovery.h
  67. +9 −9 core/net/rime/netflood.c
  68. +3 −3 core/net/rime/netflood.h
  69. +3 −3 core/net/rime/polite-announcement.c
  70. +1 −1 core/net/rime/rime.h
  71. +12 −12 core/net/rime/rmh.c
  72. +7 −7 core/net/rime/rmh.h
  73. +34 −34 core/net/rime/route-discovery.c
  74. +3 −3 core/net/rime/route-discovery.h
  75. +6 −6 core/net/rime/route.c
  76. +5 −5 core/net/rime/route.h
  77. +15 −15 core/net/rime/rucb.c
  78. +2 −2 core/net/rime/rucb.h
  79. +15 −15 core/net/rime/rudolph1.c
  80. +9 −9 core/net/rime/rudolph2.c
  81. +13 −13 core/net/rime/runicast.c
  82. +4 −4 core/net/rime/runicast.h
  83. +1 −1 core/net/rime/stbroadcast.c
  84. +10 −10 core/net/rime/stunicast.c
  85. +5 −5 core/net/rime/stunicast.h
  86. +1 −1 core/net/rime/timesynch.c
  87. +4 −4 core/net/rime/trickle.c
  88. +6 −6 core/net/rime/unicast.c
  89. +2 −2 core/net/rime/unicast.h
  90. +5 −5 core/net/rpl/rpl-dag.c
  91. +1 −1 core/net/rpl/rpl.c
  92. +9 −9 cpu/avr/radio/mac/sicslowmac.c
  93. +6 −6 cpu/cc2538/dev/cc2538-rf.c
  94. +1 −1 cpu/cc2538/dev/cc2538-rf.h
  95. +1 −1 cpu/cc2538/ieee-addr.c
  96. +1 −1 cpu/cc2538/usb/usb-serial.c
  97. +6 −6 cpu/cc253x/dev/cc2530-rf.c
  98. +5 −5 cpu/mc1322x/contiki-maca.c
  99. +1 −1 cpu/stm32w108/dev/stm32w-radio.c
  100. +2 −2 examples/antelope/netdb/netdb-client.c
  101. +3 −3 examples/antelope/netdb/netdb-server.c
  102. +1 −1 examples/cc2538dk/cc2538-demo.c
  103. +1 −1 examples/ipv6/native-border-router/border-router-rdc.c
  104. +1 −1 examples/ipv6/native-border-router/border-router.c
  105. +1 −1 examples/ipv6/rpl-collect/collect-common.c
  106. +2 −2 examples/ipv6/rpl-collect/collect-common.h
  107. +5 −5 examples/ipv6/rpl-collect/udp-sender.c
  108. +2 −2 examples/ipv6/rpl-collect/udp-sink.c
  109. +2 −2 examples/ipv6/slip-radio/no-framer.c
  110. +9 −9 examples/mbxxx/webserver-ajax/ajax-cgi.c
  111. +1 −1 examples/powertrace/example-powertrace.c
  112. +2 −2 examples/rime/example-announcement.c
  113. +1 −1 examples/rime/example-broadcast.c
  114. +9 −9 examples/rime/example-collect.c
  115. +2 −2 examples/rime/example-mesh.c
  116. +12 −12 examples/rime/example-multihop.c
  117. +5 −5 examples/rime/example-neighbors.c
  118. +5 −5 examples/rime/example-rucb.c
  119. +5 −5 examples/rime/example-rudolph1.c
  120. +8 −8 examples/rime/example-rudolph2.c
  121. +11 −11 examples/rime/example-runicast.c
  122. +1 −1 examples/rime/example-trickle.c
  123. +3 −3 examples/rime/example-unicast.c
  124. +1 −1 examples/sensinode/broadcast-rime.c
  125. +1 −1 examples/sensinode/cc2431-location-engine/blind-node.c
  126. +1 −1 examples/sensinode/sensors/sensors-example.c
  127. +2 −2 examples/sky-ip/ajax-cgi.c
  128. +1 −1 examples/sky-ip/sky-telnet-server.c
  129. +1 −1 examples/sky-ip/telnet-webserver.c
  130. +4 −4 examples/sky/sky-collect.c
  131. +2 −2 examples/z1/tutorials/example-unicast-temp.c
  132. +3 −3 examples/z1/tutorials/example-unicast2.c
  133. +2 −2 platform/avr-atmega128rfa1/contiki-conf.h
  134. +4 −4 platform/avr-atmega128rfa1/contiki-main.c
  135. +2 −2 platform/avr-atmega128rfa1/params.c
  136. +2 −2 platform/avr-raven/contiki-conf.h
  137. +6 −6 platform/avr-raven/contiki-raven-main.c
  138. +2 −2 platform/avr-raven/params.c
  139. +1 −1 platform/avr-ravenusb/Makefile.avr-ravenusb
  140. +2 −2 platform/avr-ravenusb/contiki-conf.h
  141. +3 −3 platform/avr-ravenusb/contiki-raven-main.c
  142. +4 −4 platform/avr-ravenusb/sicslow_ethernet.c
  143. +1 −1 platform/avr-rcb/contiki-conf.h
  144. +3 −3 platform/avr-zigbit/contiki-avr-zigbit-main.c
  145. +1 −1 platform/avr-zigbit/contiki-conf.h
  146. +1 −1 platform/cc2530dk/contiki-conf.h
  147. +8 −8 platform/cc2530dk/contiki-main.c
  148. +1 −1 platform/cc2538dk/contiki-conf.h
  149. +5 −5 platform/cc2538dk/contiki-main.c
  150. +2 −2 platform/cooja/contiki-conf.h
  151. +10 −10 platform/cooja/contiki-cooja-main.c
  152. +2 −2 platform/econotag/contiki-conf.h
  153. +2 −2 platform/econotag/main.c
  154. +4 −4 platform/eval-adf7xxxmb4z/contiki-main.c
  155. +1 −1 platform/exp5438/contiki-conf.h
  156. +8 −8 platform/exp5438/contiki-exp5438-main.c
  157. +1 −1 platform/iris/contiki-conf.h
  158. +11 −11 platform/iris/init-net.c
  159. +1 −1 platform/mbxxx/contiki-conf.h
  160. +7 −7 platform/mbxxx/contiki-main.c
  161. +1 −1 platform/micaz/contiki-conf.h
  162. +11 −11 platform/micaz/init-net.c
  163. +1 −1 platform/native/contiki-conf.h
  164. +4 −4 platform/native/contiki-main.c
  165. +2 −2 platform/seedeye/contiki-conf.h
  166. +4 −4 platform/seedeye/init-net.c
  167. +1 −1 platform/sensinode/contiki-conf.h
  168. +14 −14 platform/sensinode/contiki-sensinode-main.c
  169. +1 −1 platform/sky/contiki-conf.h
  170. +11 −11 platform/sky/contiki-sky-main.c
  171. +1 −1 platform/wismote/contiki-conf.h
  172. +13 −13 platform/wismote/contiki-wismote-main.c
  173. +1 −1 platform/z1/contiki-conf.h
  174. +11 −11 platform/z1/contiki-z1-main.c
  175. +1 −1 platform/z1sp/contiki-conf.h
  176. +3 −3 regression-tests/04-rime/code/mesh-node.c
  177. +1 −1 regression-tests/04-rime/code/trickle-node.c
  178. +3 −3 tools/sky/uip6-bridge/sicslow_ethernet.c
  179. +4 −4 tools/stm32w/uip6_bridge/dev/slip.c
  180. +3 −3 tools/stm32w/uip6_bridge/sicslow_ethernet.c
@@ -48,7 +48,7 @@
/*---------------------------------------------------------------------------*/
void
collect_view_construct_message(struct collect_view_data_msg *msg,
- const rimeaddr_t *parent,
+ const linkaddr_t *parent,
uint16_t parent_etx,
uint16_t current_rtmetric,
uint16_t num_neighbors,
@@ -93,7 +93,7 @@ collect_view_construct_message(struct collect_view_data_msg *msg,
last_transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT);
last_listen = energest_type_time(ENERGEST_TYPE_LISTEN);
- memcpy(&msg->parent, &parent->u8[RIMEADDR_SIZE - 2], 2);
+ memcpy(&msg->parent, &parent->u8[LINKADDR_SIZE - 2], 2);
msg->parent_etx = parent_etx;
msg->current_rtmetric = current_rtmetric;
msg->num_neighbors = num_neighbors;
@@ -2,7 +2,7 @@
#define COLLECT_VIEW_H
#include "contiki-conf.h"
-#include "net/rimeaddr.h"
+#include "net/linkaddr.h"
#include "net/rime/collect.h"
struct collect_view_data_msg {
@@ -23,7 +23,7 @@ struct collect_view_data_msg {
};
void collect_view_construct_message(struct collect_view_data_msg *msg,
- const rimeaddr_t *parent,
+ const linkaddr_t *parent,
uint16_t etx_to_parent,
uint16_t current_rtmetric,
uint16_t num_neighbors,
View
@@ -91,8 +91,8 @@ static struct ctimer profile_timer;
static deluge_object_id_t next_object_id;
/* Rime callbacks. */
-static void broadcast_recv(struct broadcast_conn *, const rimeaddr_t *);
-static void unicast_recv(struct unicast_conn *, const rimeaddr_t *);
+static void broadcast_recv(struct broadcast_conn *, const linkaddr_t *);
+static void unicast_recv(struct unicast_conn *, const linkaddr_t *);
static const struct broadcast_callbacks broadcast_call = {broadcast_recv, NULL};
static const struct unicast_callbacks unicast_call = {unicast_recv, NULL};
@@ -288,7 +288,7 @@ advertise_summary(struct deluge_object *obj)
}
static void
-handle_summary(struct deluge_msg_summary *msg, const rimeaddr_t *sender)
+handle_summary(struct deluge_msg_summary *msg, const linkaddr_t *sender)
{
int highest_available, i;
clock_time_t oldest_request, oldest_data, now;
@@ -332,7 +332,7 @@ handle_summary(struct deluge_msg_summary *msg, const rimeaddr_t *sender)
return;
}
- rimeaddr_copy(&current_object.summary_from, sender);
+ linkaddr_copy(&current_object.summary_from, sender);
transition(DELUGE_STATE_RX);
if(ctimer_expired(&rx_timer)) {
@@ -579,7 +579,7 @@ handle_profile(struct deluge_msg_profile *msg)
}
static void
-command_dispatcher(const rimeaddr_t *sender)
+command_dispatcher(const linkaddr_t *sender)
{
char *msg;
int len;
@@ -615,13 +615,13 @@ command_dispatcher(const rimeaddr_t *sender)
}
static void
-unicast_recv(struct unicast_conn *c, const rimeaddr_t *sender)
+unicast_recv(struct unicast_conn *c, const linkaddr_t *sender)
{
command_dispatcher(sender);
}
static void
-broadcast_recv(struct broadcast_conn *c, const rimeaddr_t *sender)
+broadcast_recv(struct broadcast_conn *c, const linkaddr_t *sender)
{
command_dispatcher(sender);
}
@@ -142,7 +142,7 @@ struct deluge_object {
uint8_t current_page[S_PAGE];
uint8_t tx_set;
int cfs_fd;
- rimeaddr_t summary_from;
+ linkaddr_t summary_from;
};
struct deluge_page {
@@ -117,7 +117,7 @@ powertrace_print(char *str)
printf("%s %lu P %d.%d %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu (radio %d.%02d%% / %d.%02d%% tx %d.%02d%% / %d.%02d%% listen %d.%02d%% / %d.%02d%%)\n",
str,
- clock_time(), rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], seqno,
+ clock_time(), linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1], seqno,
all_cpu, all_lpm, all_transmit, all_listen, all_idle_transmit, all_idle_listen,
cpu, lpm, transmit, listen, idle_transmit, idle_listen,
(int)((100L * (all_transmit + all_listen)) / all_time),
@@ -137,7 +137,7 @@ powertrace_print(char *str)
#if ! UIP_CONF_IPV6
printf("%s %lu SP %d.%d %lu %u %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu (channel %d radio %d.%02d%% / %d.%02d%%)\n",
- str, clock_time(), rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], seqno,
+ str, clock_time(), linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1], seqno,
s->channel,
s->num_input, s->input_txtime, s->input_rxtime,
s->input_txtime - s->last_input_txtime,
@@ -160,7 +160,7 @@ powertrace_print(char *str)
radio));
#else
printf("%s %lu SP %d.%d %lu %u %u %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu (proto %u(%u) radio %d.%02d%% / %d.%02d%%)\n",
- str, clock_time(), rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], seqno,
+ str, clock_time(), linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1], seqno,
s->proto, s->channel,
s->num_input, s->input_txtime, s->input_rxtime,
s->input_txtime - s->last_input_txtime,
@@ -287,7 +287,7 @@ output_sniffer(int mac_status)
static void
sniffprint(char *prefix, int seqno)
{
- const rimeaddr_t *sender, *receiver, *esender, *ereceiver;
+ const linkaddr_t *sender, *receiver, *esender, *ereceiver;
sender = packetbuf_addr(PACKETBUF_ADDR_SENDER);
receiver = packetbuf_addr(PACKETBUF_ADDR_RECEIVER);
@@ -298,7 +298,7 @@ sniffprint(char *prefix, int seqno)
printf("%lu %s %d %u %d %d %d.%d %u %u\n",
clock_time(),
prefix,
- rimeaddr_node_addr.u8[0], seqno,
+ linkaddr_node_addr.u8[0], seqno,
packetbuf_attr(PACKETBUF_ATTR_CHANNEL),
packetbuf_attr(PACKETBUF_ATTR_PACKET_TYPE),
esender->u8[0], esender->u8[1],
@@ -81,7 +81,7 @@ shell_default_output(const char *text1, int len1, const char *text2, int len2)
void
shell_prompt(char *str)
{
- printf("%d.%d: %s\r\n", rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
+ printf("%d.%d: %s\r\n", linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
str);
}
/*---------------------------------------------------------------------------*/
@@ -130,7 +130,7 @@ static const struct rucb_callbacks rucb_call = { write_chunk, read_chunk, timedo
PROCESS_THREAD(shell_download_process, ev, data)
{
const char *nextptr;
- static rimeaddr_t addr;
+ static linkaddr_t addr;
int len;
char buf[32];
@@ -185,7 +185,7 @@ PROCESS_THREAD(shell_download_process, ev, data)
}
/*---------------------------------------------------------------------------*/
static void
-request_recv(struct runicast_conn *c, const rimeaddr_t *from, uint8_t seqno)
+request_recv(struct runicast_conn *c, const linkaddr_t *from, uint8_t seqno)
{
const char *filename;
uint8_t seq;
@@ -224,14 +224,14 @@ request_recv(struct runicast_conn *c, const rimeaddr_t *from, uint8_t seqno)
}
/*---------------------------------------------------------------------------*/
static void
-request_sent(struct runicast_conn *c, const rimeaddr_t *to,
+request_sent(struct runicast_conn *c, const linkaddr_t *to,
uint8_t retransmissions)
{
process_poll(&shell_download_process);
}
/*---------------------------------------------------------------------------*/
static void
-request_timedout(struct runicast_conn *c, const rimeaddr_t *to,
+request_timedout(struct runicast_conn *c, const linkaddr_t *to,
uint8_t retransmissions)
{
shell_output_str(&download_command, "download: request timed out", "");
@@ -76,7 +76,7 @@ enum {
} datapath_commands;
struct datapath_msg {
- rimeaddr_t receiver;
+ linkaddr_t receiver;
rtimer_clock_t tx, rx;
uint8_t datapath_command;
uint8_t received;
@@ -99,7 +99,7 @@ static struct broadcast_conn broadcast;
static struct mesh_conn mesh;
static struct rucb_conn rucb;
-static rimeaddr_t receiver;
+static linkaddr_t receiver;
static uint8_t is_sender;
static int left_to_send;
@@ -230,11 +230,11 @@ clear_stats(void)
}
/*---------------------------------------------------------------------------*/
static void
-setup_sending(rimeaddr_t *to, int num)
+setup_sending(linkaddr_t *to, int num)
{
is_sender = 1;
left_to_send = num;
- rimeaddr_copy(&receiver, to);
+ linkaddr_copy(&receiver, to);
clear_stats();
}
/*---------------------------------------------------------------------------*/
@@ -291,7 +291,7 @@ construct_next_packet(void)
#else /* TIMESYNCH_CONF_ENABLED */
msg->tx = msg->rx = 0;
#endif /* TIMESYNCH_CONF_ENABLED */
- rimeaddr_copy(&msg->receiver, &receiver);
+ linkaddr_copy(&msg->receiver, &receiver);
left_to_send--;
return 1;
}
@@ -344,7 +344,7 @@ process_incoming_packet(void)
}
/*---------------------------------------------------------------------------*/
static int
-construct_reply(const rimeaddr_t *from)
+construct_reply(const linkaddr_t *from)
{
struct datapath_msg *msg = packetbuf_dataptr();
#if TIMESYNCH_CONF_ENABLED
@@ -390,7 +390,7 @@ timedout_mesh(struct mesh_conn *c)
stats.timedout++;
}
static void
-recv_mesh(struct mesh_conn *c, const rimeaddr_t *from, uint8_t hops)
+recv_mesh(struct mesh_conn *c, const linkaddr_t *from, uint8_t hops)
{
process_incoming_packet();
if(is_sender) {
@@ -407,18 +407,18 @@ const static struct mesh_callbacks mesh_callbacks =
{ recv_mesh, sent_mesh, timedout_mesh };
/*---------------------------------------------------------------------------*/
static void
-sent_ctrl(struct runicast_conn *c, const rimeaddr_t *to, uint8_t rexmits)
+sent_ctrl(struct runicast_conn *c, const linkaddr_t *to, uint8_t rexmits)
{
process_post(&shell_netperf_process, CONTINUE_EVENT, NULL);
}
static void
-timedout_ctrl(struct runicast_conn *c, const rimeaddr_t *to, uint8_t rexmits)
+timedout_ctrl(struct runicast_conn *c, const linkaddr_t *to, uint8_t rexmits)
{
shell_output_str(&netperf_command, "netperf control connection failed", "");
process_exit(&shell_netperf_process);
}
static void
-recv_ctrl(struct runicast_conn *c, const rimeaddr_t *from, uint8_t seqno)
+recv_ctrl(struct runicast_conn *c, const linkaddr_t *from, uint8_t seqno)
{
static uint8_t last_seqno = -1;
struct stats s;
@@ -450,7 +450,7 @@ const static struct runicast_callbacks runicast_callbacks =
{ recv_ctrl, sent_ctrl, timedout_ctrl };
/*---------------------------------------------------------------------------*/
static int
-send_ctrl_command(const rimeaddr_t *to, uint8_t command)
+send_ctrl_command(const linkaddr_t *to, uint8_t command)
{
struct ctrl_msg *msg;
packetbuf_clear();
@@ -461,7 +461,7 @@ send_ctrl_command(const rimeaddr_t *to, uint8_t command)
}
/*---------------------------------------------------------------------------*/
static void
-recv_broadcast(struct broadcast_conn *c, const rimeaddr_t *from)
+recv_broadcast(struct broadcast_conn *c, const linkaddr_t *from)
{
process_incoming_packet();
if(is_sender) {
@@ -473,7 +473,7 @@ const static struct broadcast_callbacks broadcast_callbacks =
{ recv_broadcast };
/*---------------------------------------------------------------------------*/
static void
-recv_unicast(struct unicast_conn *c, const rimeaddr_t *from)
+recv_unicast(struct unicast_conn *c, const linkaddr_t *from)
{
process_incoming_packet();
if(is_sender) {
@@ -517,7 +517,7 @@ shell_netperf_init(void)
PROCESS_THREAD(shell_netperf_process, ev, data)
{
static struct etimer e;
- static rimeaddr_t receiver;
+ static linkaddr_t receiver;
const char *nextptr;
const char *args;
static char recvstr[40];
@@ -74,7 +74,7 @@ SHELL_COMMAND(runicast_command,
PROCESS_THREAD(shell_runicast_process, ev, data)
{
struct shell_input *input;
- static rimeaddr_t receiver;
+ static linkaddr_t receiver;
int len;
const char *nextptr;
struct collect_msg *msg;
@@ -122,7 +122,7 @@ PROCESS_THREAD(shell_runicast_process, ev, data)
PROCESS_END();
}
static void
-recv_ruc(struct runicast_conn *c, const rimeaddr_t *from, uint8_t seqno)
+recv_ruc(struct runicast_conn *c, const linkaddr_t *from, uint8_t seqno)
{
struct collect_msg *msg;
rtimer_clock_t latency;
@@ -147,14 +147,14 @@ recv_ruc(struct runicast_conn *c, const rimeaddr_t *from, uint8_t seqno)
msg->data);
}
static void
-sent_ruc(struct runicast_conn *c, const rimeaddr_t *to, uint8_t tx)
+sent_ruc(struct runicast_conn *c, const linkaddr_t *to, uint8_t tx)
{
printf("runicast message sent to %d.%d, %d transmissions\n",
to->u8[0], to->u8[1],
tx);
}
static void
-timedout_ruc(struct runicast_conn *c, const rimeaddr_t *to, uint8_t tx)
+timedout_ruc(struct runicast_conn *c, const linkaddr_t *to, uint8_t tx)
{
printf("runicast message to %d.%d timed out after %d transmissions\n",
to->u8[0], to->u8[1],
@@ -114,7 +114,7 @@ PROCESS_THREAD(shell_broadcast_process, ev, data)
PROCESS_END();
}
static void
-recv_broadcast(struct broadcast_conn *c, const rimeaddr_t *from)
+recv_broadcast(struct broadcast_conn *c, const linkaddr_t *from)
{
struct collect_msg *msg;
rtimer_clock_t latency;
@@ -138,7 +138,7 @@ static const struct broadcast_callbacks broadcast_callbacks = {recv_broadcast};
PROCESS_THREAD(shell_unicast_process, ev, data)
{
struct shell_input *input;
- static rimeaddr_t receiver;
+ static linkaddr_t receiver;
int len;
const char *nextptr;
struct collect_msg *msg;
@@ -186,7 +186,7 @@ PROCESS_THREAD(shell_unicast_process, ev, data)
PROCESS_END();
}
static void
-recv_uc(struct unicast_conn *c, const rimeaddr_t *from)
+recv_uc(struct unicast_conn *c, const linkaddr_t *from)
{
struct collect_msg *msg;
rtimer_clock_t latency;
@@ -51,7 +51,7 @@ static uint8_t listening_for_neighbors = 0;
/*---------------------------------------------------------------------------*/
static void
-received_announcement(struct announcement *a, const rimeaddr_t *from,
+received_announcement(struct announcement *a, const linkaddr_t *from,
uint16_t id, uint16_t value)
{
struct {
@@ -64,7 +64,7 @@ received_announcement(struct announcement *a, const rimeaddr_t *from,
if(listening_for_neighbors) {
memset(&msg, 0, sizeof(msg));
msg.len = 3;
- rimeaddr_copy((rimeaddr_t *)&msg.addr, from);
+ linkaddr_copy((linkaddr_t *)&msg.addr, from);
msg.rssi = packetbuf_attr(PACKETBUF_ATTR_RSSI);
msg.lqi = packetbuf_attr(PACKETBUF_ATTR_LINK_QUALITY);
shell_output(&neighbors_command, &msg, sizeof(msg), "", 0);
Oops, something went wrong.

0 comments on commit 4526524

Please sign in to comment.