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

Changed the name of the rimeaddr module to linkaddr

Browse source
This commit is contained in:
Adam Dunkels 2013-12-12 23:58:52 +01:00
parent 765e9acded
commit 45265249fc
180 changed files with 930 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

16
examples/rime/example-rudolph2.c
View file

@ -93,7 +93,7 @@ write_chunk(struct rudolph2_conn *c, int offset, int flag,
if(flag == RUDOLPH2_FLAG_LASTCHUNK) {
int i;
printf("+++ rudolph2 entire file received at %d, %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1]);
leds_off(LEDS_RED);
leds_on(LEDS_YELLOW);
@ -103,13 +103,13 @@ write_chunk(struct rudolph2_conn *c, int offset, int flag,
int r = cfs_read(fd, &buf, 1);
if (r != 1) {
printf("%d.%d: error: read failed at %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
i);
break;
}
else if(buf != (unsigned char)i) {
printf("%d.%d: error: diff at %d, %d != %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
i, (unsigned char)i, buf);
break;
}
@ -131,7 +131,7 @@ read_chunk(struct rudolph2_conn *c, int offset, uint8_t *to, int maxsize)
cfs_seek(fd, offset, CFS_SEEK_SET);
ret = cfs_read(fd, to, maxsize);
/* printf("%d.%d: read_chunk %d bytes at %d, %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
ret, offset, (unsigned char)to[0]);*/
cfs_close(fd);
return ret;
@ -156,13 +156,13 @@ PROCESS_THREAD(example_rudolph2_process, ev, data)
PROCESS_PAUSE();
if(rimeaddr_node_addr.u8[0] == 1 &&
rimeaddr_node_addr.u8[1] == 0) {
if(linkaddr_node_addr.u8[0] == 1 &&
linkaddr_node_addr.u8[1] == 0) {
{
int i;
printf("%d.%d: selected data source\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1]);
fd = cfs_open("hej", CFS_WRITE);
for(i = 0; i < FILESIZE; i++) {
@ -170,7 +170,7 @@ PROCESS_THREAD(example_rudolph2_process, ev, data)
int w = cfs_write(fd, &buf, 1);
if (w != 1) {
printf("%d.%d: error: write failed at %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
i);
break;
}