Fixed compiler warnings to make code compile with gcc's -pedantic switch
This commit is contained in:
adamdunkels
parent
607d27e0c6
commit
1e1e44a3f8
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: cfs-eeprom.c,v 1.2 2007/05/19 21:05:48 oliverschmidt Exp $
|
||||
* $Id: cfs-eeprom.c,v 1.3 2007/11/17 18:01:00 adamdunkels Exp $
|
||||
*/
|
||||
#include "contiki.h"
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ cfs_close(int f)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_read(int f, char *buf, unsigned int len)
|
||||
cfs_read(int f, void *buf, unsigned int len)
|
||||
{
|
||||
if(f == 1) {
|
||||
eeprom_read(CFS_EEPROM_OFFSET + file.fileptr, buf, len);
|
||||
|
|
@ -84,7 +84,7 @@ cfs_read(int f, char *buf, unsigned int len)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_write(int f, char *buf, unsigned int len)
|
||||
cfs_write(int f, void *buf, unsigned int len)
|
||||
{
|
||||
if(f == 1) {
|
||||
eeprom_write(CFS_EEPROM_OFFSET + file.fileptr, buf, len);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: cfs-posix.c,v 1.3 2007/05/19 21:05:49 oliverschmidt Exp $
|
||||
* $Id: cfs-posix.c,v 1.4 2007/11/17 18:01:00 adamdunkels Exp $
|
||||
*/
|
||||
#include "contiki.h"
|
||||
|
||||
|
|
@ -76,13 +76,13 @@ cfs_close(int f)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_read(int f, char *b, unsigned int l)
|
||||
cfs_read(int f, void *b, unsigned int l)
|
||||
{
|
||||
return read(f, b, l);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_write(int f, char *b, unsigned int l)
|
||||
cfs_write(int f, void *b, unsigned int l)
|
||||
{
|
||||
return write(f, b, l);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: cfs-ram.c,v 1.3 2007/05/19 21:05:49 oliverschmidt Exp $
|
||||
* $Id: cfs-ram.c,v 1.4 2007/11/17 18:01:00 adamdunkels Exp $
|
||||
*/
|
||||
#include "contiki.h"
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ cfs_close(int f)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_read(int f, char *buf, unsigned int len)
|
||||
cfs_read(int f, void *buf, unsigned int len)
|
||||
{
|
||||
if(file.fileptr + len > sizeof(filemem)) {
|
||||
len = sizeof(filemem) - file.fileptr;
|
||||
|
|
@ -97,7 +97,7 @@ cfs_read(int f, char *buf, unsigned int len)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_write(int f, char *buf, unsigned int len)
|
||||
cfs_write(int f, void *buf, unsigned int len)
|
||||
{
|
||||
if(file.fileptr >= sizeof(filemem)) {
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: cfs-xmem.c,v 1.4 2007/05/19 21:05:49 oliverschmidt Exp $
|
||||
* $Id: cfs-xmem.c,v 1.5 2007/11/17 18:01:00 adamdunkels Exp $
|
||||
*/
|
||||
#include "contiki.h"
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ cfs_close(int f)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_read(int f, char *buf, unsigned int len)
|
||||
cfs_read(int f, void *buf, unsigned int len)
|
||||
{
|
||||
if(file.fileptr + len > CFS_XMEM_SIZE) {
|
||||
len = CFS_XMEM_SIZE - file.fileptr;
|
||||
|
|
@ -104,7 +104,7 @@ cfs_read(int f, char *buf, unsigned int len)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
cfs_write(int f, char *buf, unsigned int len)
|
||||
cfs_write(int f, void *buf, unsigned int len)
|
||||
{
|
||||
if(file.fileptr >= CFS_XMEM_SIZE) {
|
||||
return 0;
|
||||
|
|
@ -159,4 +159,3 @@ cfs_closedir(struct cfs_dir *p)
|
|||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: cfs.h,v 1.5 2007/05/19 21:05:49 oliverschmidt Exp $
|
||||
* $Id: cfs.h,v 1.6 2007/11/17 18:01:00 adamdunkels Exp $
|
||||
*/
|
||||
#ifndef __CFS_H__
|
||||
#define __CFS_H__
|
||||
|
|
@ -146,7 +146,7 @@ CCIF void cfs_close(int fd);
|
|||
* buffer. The file must have first been opened with
|
||||
* cfs_open() and the CFS_READ flag.
|
||||
*/
|
||||
CCIF int cfs_read(int fd, char *buf, unsigned int len);
|
||||
CCIF int cfs_read(int fd, void *buf, unsigned int len);
|
||||
|
||||
/**
|
||||
* \brief Write data to an open file.
|
||||
|
|
@ -159,7 +159,7 @@ CCIF int cfs_read(int fd, char *buf, unsigned int len);
|
|||
* an open file. The file must have been opened with
|
||||
* cfs_open() and the CFS_WRITE flag.
|
||||
*/
|
||||
CCIF int cfs_write(int fd, char *buf, unsigned int len);
|
||||
CCIF int cfs_write(int fd, void *buf, unsigned int len);
|
||||
|
||||
/**
|
||||
* \brief Seek to a specified position in an open file.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: sensors.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
|
||||
* @(#)$Id: sensors.h,v 1.2 2007/11/17 18:05:56 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
#ifndef __SENSORS_H__
|
||||
|
|
@ -47,7 +47,7 @@ const struct sensors_sensor name = { type , \
|
|||
#define SENSORS(...) \
|
||||
const struct sensors_sensor *sensors[] = {__VA_ARGS__, NULL}; \
|
||||
unsigned char sensors_flags[SENSORS_NUM]; \
|
||||
struct process *sensors_selecting_proc[SENSORS_NUM];
|
||||
struct process *sensors_selecting_proc[SENSORS_NUM]
|
||||
|
||||
struct sensors_sensor {
|
||||
char * type;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: psock.c,v 1.4 2007/09/08 16:12:54 matsutsuka Exp $
|
||||
* $Id: psock.c,v 1.5 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -171,7 +171,7 @@ data_acked(CC_REGISTER_ARG struct psock *s)
|
|||
return 0;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PT_THREAD(psock_send(CC_REGISTER_ARG struct psock *s, const char *buf,
|
||||
PT_THREAD(psock_send(CC_REGISTER_ARG struct psock *s, const uint8_t *buf,
|
||||
unsigned int len))
|
||||
{
|
||||
PT_BEGIN(&s->psockpt);
|
||||
|
|
@ -322,7 +322,8 @@ PT_THREAD(psock_readbuf(CC_REGISTER_ARG struct psock *psock))
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
psock_init(CC_REGISTER_ARG struct psock *psock, char *buffer, unsigned int buffersize)
|
||||
psock_init(CC_REGISTER_ARG struct psock *psock,
|
||||
uint8_t *buffer, unsigned int buffersize)
|
||||
{
|
||||
psock->state = STATE_NONE;
|
||||
psock->readlen = 0;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: psock.h,v 1.3 2007/09/04 12:39:00 nvt-se Exp $
|
||||
* $Id: psock.h,v 1.4 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -117,7 +117,7 @@ struct psock {
|
|||
const u8_t *sendptr; /* Pointer to the next data to be sent. */
|
||||
u8_t *readptr; /* Pointer to the next data to be read. */
|
||||
|
||||
char *bufptr; /* Pointer to the buffer used for buffering
|
||||
uint8_t *bufptr; /* Pointer to the buffer used for buffering
|
||||
incoming data. */
|
||||
|
||||
u16_t sendlen; /* The number of bytes left to be sent. */
|
||||
|
|
@ -130,7 +130,7 @@ struct psock {
|
|||
unsigned char state; /* The state of the protosocket. */
|
||||
};
|
||||
|
||||
void psock_init(struct psock *psock, char *buffer, unsigned int buffersize);
|
||||
void psock_init(struct psock *psock, uint8_t *buffer, unsigned int buffersize);
|
||||
/**
|
||||
* Initialize a protosocket.
|
||||
*
|
||||
|
|
@ -141,7 +141,7 @@ void psock_init(struct psock *psock, char *buffer, unsigned int buffersize);
|
|||
* \param psock (struct psock *) A pointer to the protosocket to be
|
||||
* initialized
|
||||
*
|
||||
* \param buffer (char *) A pointer to the input buffer for the
|
||||
* \param buffer (uint8_t *) A pointer to the input buffer for the
|
||||
* protosocket.
|
||||
*
|
||||
* \param buffersize (unsigned int) The size of the input buffer.
|
||||
|
|
@ -164,7 +164,7 @@ void psock_init(struct psock *psock, char *buffer, unsigned int buffersize);
|
|||
*/
|
||||
#define PSOCK_BEGIN(psock) PT_BEGIN(&((psock)->pt))
|
||||
|
||||
PT_THREAD(psock_send(struct psock *psock, const char *buf, unsigned int len));
|
||||
PT_THREAD(psock_send(struct psock *psock, const uint8_t *buf, unsigned int len));
|
||||
/**
|
||||
* Send data.
|
||||
*
|
||||
|
|
@ -175,7 +175,7 @@ PT_THREAD(psock_send(struct psock *psock, const char *buf, unsigned int len));
|
|||
* \param psock (struct psock *) A pointer to the protosocket over which
|
||||
* data is to be sent.
|
||||
*
|
||||
* \param data (char *) A pointer to the data that is to be sent.
|
||||
* \param data (uint8_t *) A pointer to the data that is to be sent.
|
||||
*
|
||||
* \param datalen (unsigned int) The length of the data that is to be
|
||||
* sent.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
c/*
|
||||
* Copyright (c) 2006, Swedish Institute of Computer Science.
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rawpacket-udp.c,v 1.2 2007/09/29 03:54:18 matsutsuka Exp $
|
||||
* $Id: rawpacket-udp.c,v 1.3 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
* Adam Dunkels <adam@sics.se>
|
||||
*/
|
||||
|
||||
#if UIP_UDP
|
||||
#include "contiki.h"
|
||||
#include "contiki-net.h"
|
||||
|
||||
#include "net/rawpacket-udp.h"
|
||||
|
|
@ -70,4 +70,3 @@ rawpacket_received(struct rawpacket_conn *c)
|
|||
return uip_newdata() && (struct uip_udp_conn *)c == uip_udp_conn;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#endif /* UIP_UDP */
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
*
|
||||
* This file is part of the uIP TCP/IP stack.
|
||||
*
|
||||
* $Id: resolv.c,v 1.6 2007/09/29 03:54:18 matsutsuka Exp $
|
||||
* $Id: resolv.c,v 1.7 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -246,7 +246,7 @@ check_entries(void)
|
|||
static void
|
||||
newdata(void)
|
||||
{
|
||||
char *nameptr;
|
||||
unsigned char *nameptr;
|
||||
struct dns_answer *ans;
|
||||
struct dns_hdr *hdr;
|
||||
static u8_t nquestions, nanswers;
|
||||
|
|
@ -290,7 +290,7 @@ newdata(void)
|
|||
/* Skip the name in the question. XXX: This should really be
|
||||
checked agains the name in the question, to be sure that they
|
||||
match. */
|
||||
nameptr = parse_name((char *)uip_appdata + 12) + 4;
|
||||
nameptr = parse_name((uint8_t *)uip_appdata + 12) + 4;
|
||||
|
||||
while(nanswers > 0) {
|
||||
/* The first byte in the answer resource record determines if it
|
||||
|
|
@ -301,7 +301,7 @@ newdata(void)
|
|||
/* printf("Compressed anwser\n");*/
|
||||
} else {
|
||||
/* Not compressed name. */
|
||||
nameptr = parse_name((char *)nameptr);
|
||||
nameptr = parse_name((uint8_t *)nameptr);
|
||||
}
|
||||
|
||||
ans = (struct dns_answer *)nameptr;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: queuebuf.c,v 1.9 2007/05/15 08:09:21 adamdunkels Exp $
|
||||
* $Id: queuebuf.c,v 1.10 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -110,9 +110,9 @@ queuebuf_new_from_rimebuf(void)
|
|||
#if QUEUEBUF_STATS
|
||||
++queuebuf_ref_len;
|
||||
#if NETSIM
|
||||
node_log("%d %d\n",
|
||||
/* node_log("%d %d\n",
|
||||
queuebuf_len,
|
||||
queuebuf_ref_len);
|
||||
queuebuf_ref_len);*/
|
||||
#endif /* NETSIM */
|
||||
#endif /* QUEUEBUF_STATS */
|
||||
rbuf->len = rimebuf_datalen();
|
||||
|
|
@ -133,9 +133,9 @@ queuebuf_new_from_rimebuf(void)
|
|||
return NULL;
|
||||
}
|
||||
#if NETSIM
|
||||
node_log("%d %d\n",
|
||||
/* node_log("%d %d\n",
|
||||
queuebuf_len,
|
||||
queuebuf_ref_len);
|
||||
queuebuf_ref_len);*/
|
||||
#endif /* NETSIM */
|
||||
#endif /* QUEUEBUF_STATS */
|
||||
buf->len = rimebuf_copyto(buf->data);
|
||||
|
|
@ -154,9 +154,9 @@ queuebuf_free(struct queuebuf *buf)
|
|||
#if QUEUEBUF_STATS
|
||||
--queuebuf_len;
|
||||
#if NETSIM
|
||||
node_log("%d %d\n",
|
||||
/* node_log("%d %d\n",
|
||||
queuebuf_len,
|
||||
queuebuf_ref_len);
|
||||
queuebuf_ref_len);*/
|
||||
#endif /* NETSIM */
|
||||
#endif /* QUEUEBUF_STATS */
|
||||
} else if(memb_inmemb(&refbufmem, buf)) {
|
||||
|
|
@ -164,9 +164,9 @@ queuebuf_free(struct queuebuf *buf)
|
|||
#if QUEUEBUF_STATS
|
||||
--queuebuf_ref_len;
|
||||
#if NETSIM
|
||||
node_log("%d %d\n",
|
||||
/* node_log("%d %d\n",
|
||||
queuebuf_len,
|
||||
queuebuf_ref_len);
|
||||
queuebuf_ref_len);*/
|
||||
#endif /* NETSIM */
|
||||
#endif /* QUEUEBUF_STATS */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rimebuf.c,v 1.9 2007/10/25 12:48:46 adamdunkels Exp $
|
||||
* $Id: rimebuf.c,v 1.10 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -75,7 +75,7 @@ rimebuf_clear(void)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
rimebuf_copyfrom(const u8_t *from, u16_t len)
|
||||
rimebuf_copyfrom(const void *from, u16_t len)
|
||||
{
|
||||
u16_t l;
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ rimebuf_copyto_hdr(u8_t *to)
|
|||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
rimebuf_copyto(u8_t *to)
|
||||
rimebuf_copyto(void *to)
|
||||
{
|
||||
#if DEBUG_LEVEL > 0
|
||||
{
|
||||
|
|
@ -139,7 +139,7 @@ rimebuf_copyto(u8_t *to)
|
|||
}
|
||||
#endif /* DEBUG_LEVEL */
|
||||
memcpy(to, rimebuf + hdrptr, RIMEBUF_HDR_SIZE - hdrptr);
|
||||
memcpy(to + RIMEBUF_HDR_SIZE - hdrptr, rimebufptr + bufptr,
|
||||
memcpy((u8_t *)to + RIMEBUF_HDR_SIZE - hdrptr, rimebufptr + bufptr,
|
||||
buflen);
|
||||
return RIMEBUF_HDR_SIZE - hdrptr + buflen;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rimebuf.h,v 1.10 2007/10/25 12:48:46 adamdunkels Exp $
|
||||
* $Id: rimebuf.h,v 1.11 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -232,7 +232,7 @@ void rimebuf_compact(void);
|
|||
* copied into the rimbuf is returned.
|
||||
*
|
||||
*/
|
||||
int rimebuf_copyfrom(const u8_t *from, u16_t len);
|
||||
int rimebuf_copyfrom(const void *from, u16_t len);
|
||||
|
||||
/**
|
||||
* \brief Copy the entire rimebuf to an external buffer
|
||||
|
|
@ -252,7 +252,7 @@ int rimebuf_copyfrom(const u8_t *from, u16_t len);
|
|||
* returned.
|
||||
*
|
||||
*/
|
||||
int rimebuf_copyto(u8_t *to);
|
||||
int rimebuf_copyto(void *to);
|
||||
|
||||
/**
|
||||
* \brief Copy the header portion of the rimebuf to an external buffer
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph0.h,v 1.5 2007/11/16 09:17:22 fros4943 Exp $
|
||||
* $Id: rudolph0.h,v 1.6 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -75,8 +75,8 @@ enum {
|
|||
|
||||
struct rudolph0_callbacks {
|
||||
void (* write_chunk)(struct rudolph0_conn *c, int offset, int flag,
|
||||
char *data, int len);
|
||||
int (* read_chunk)(struct rudolph0_conn *c, int offset, char *to,
|
||||
uint8_t *data, int len);
|
||||
int (* read_chunk)(struct rudolph0_conn *c, int offset, uint8_t *to,
|
||||
int maxsize);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph1.c,v 1.9 2007/05/15 08:09:21 adamdunkels Exp $
|
||||
* $Id: rudolph1.c,v 1.10 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -86,7 +86,7 @@ enum {
|
|||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int
|
||||
read_data(struct rudolph1_conn *c, char *dataptr, int chunk)
|
||||
read_data(struct rudolph1_conn *c, uint8_t *dataptr, int chunk)
|
||||
{
|
||||
int len = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph1.h,v 1.5 2007/05/15 08:09:21 adamdunkels Exp $
|
||||
* $Id: rudolph1.h,v 1.6 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -75,8 +75,8 @@ enum {
|
|||
|
||||
struct rudolph1_callbacks {
|
||||
void (* write_chunk)(struct rudolph1_conn *c, int offset, int flag,
|
||||
char *data, int len);
|
||||
int (* read_chunk)(struct rudolph1_conn *c, int offset, char *to,
|
||||
uint8_t *data, int len);
|
||||
int (* read_chunk)(struct rudolph1_conn *c, int offset, uint8_t *to,
|
||||
int maxsize);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph2.c,v 1.2 2007/11/17 10:13:17 adamdunkels Exp $
|
||||
* $Id: rudolph2.c,v 1.3 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -94,7 +94,7 @@ enum {
|
|||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int
|
||||
read_data(struct rudolph2_conn *c, char *dataptr, int chunk)
|
||||
read_data(struct rudolph2_conn *c, uint8_t *dataptr, int chunk)
|
||||
{
|
||||
int len = 0;
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ format_data(struct rudolph2_conn *c, int chunk)
|
|||
hdr->hops_from_base = c->hops_from_base;
|
||||
hdr->version = c->version;
|
||||
hdr->chunk = chunk;
|
||||
len = read_data(c, (char *)hdr + sizeof(struct rudolph2_hdr), chunk);
|
||||
len = read_data(c, (uint8_t *)hdr + sizeof(struct rudolph2_hdr), chunk);
|
||||
rimebuf_set_datalen(sizeof(struct rudolph2_hdr) + len);
|
||||
|
||||
return len;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph2.h,v 1.1 2007/05/15 08:07:46 adamdunkels Exp $
|
||||
* $Id: rudolph2.h,v 1.2 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -75,8 +75,8 @@ enum {
|
|||
|
||||
struct rudolph2_callbacks {
|
||||
void (* write_chunk)(struct rudolph2_conn *c, int offset, int flag,
|
||||
char *data, int len);
|
||||
int (* read_chunk)(struct rudolph2_conn *c, int offset, char *to,
|
||||
uint8_t *data, int len);
|
||||
int (* read_chunk)(struct rudolph2_conn *c, int offset, uint8_t *to,
|
||||
int maxsize);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: tree.c,v 1.14 2007/11/17 10:32:54 adamdunkels Exp $
|
||||
* $Id: tree.c,v 1.15 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -139,7 +139,7 @@ update_rtmetric(struct tree_conn *tc)
|
|||
if(tc->local_rtmetric == RTMETRIC_MAX) {
|
||||
strcpy(buf, " ");
|
||||
} else {
|
||||
snprintf(buf, sizeof(buf), "%d", tc->local_rtmetric);
|
||||
sprintf(buf, "%d", tc->local_rtmetric);
|
||||
}
|
||||
ether_set_text(buf);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: uaodv.c,v 1.32 2007/09/29 03:54:18 matsutsuka Exp $
|
||||
* $Id: uaodv.c,v 1.33 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
* Adam Dunkels <adam@sics.se>
|
||||
*/
|
||||
|
||||
#if UIP_UDP
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
|
|
@ -626,4 +625,3 @@ PROCESS_THREAD(uaodv_process, ev, data)
|
|||
PROCESS_END();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#endif /* UIP_UDP */
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: uip-udp-packet.c,v 1.4 2007/09/29 03:54:18 matsutsuka Exp $
|
||||
* $Id: uip-udp-packet.c,v 1.5 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -38,17 +38,19 @@
|
|||
* Adam Dunkels <adam@sics.se>
|
||||
*/
|
||||
|
||||
#if UIP_UDP
|
||||
#include "contiki-conf.h"
|
||||
|
||||
extern u16_t uip_slen;
|
||||
|
||||
#include "net/uip-udp-packet.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
extern u16_t uip_slen;
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len)
|
||||
{
|
||||
#if UIP_UDP
|
||||
uip_udp_conn = c;
|
||||
uip_slen = len;
|
||||
memcpy(&uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN], data, len > UIP_BUFSIZE? UIP_BUFSIZE: len);
|
||||
|
|
@ -57,6 +59,6 @@ uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len)
|
|||
tcpip_output();
|
||||
}
|
||||
uip_slen = 0;
|
||||
#endif /* UIP_UDP */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#endif /* UIP_UDP */
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: profile-aggregates.c,v 1.2 2007/11/17 10:14:19 adamdunkels Exp $
|
||||
* $Id: profile-aggregates.c,v 1.3 2007/11/17 18:07:40 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
#include <stdio.h>
|
||||
|
||||
struct aggregate {
|
||||
const unsigned char *ptr;
|
||||
const char *ptr;
|
||||
unsigned short episodes;
|
||||
unsigned long cycles;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ LD = gcc
|
|||
AS = as
|
||||
OBJCOPY = objcopy
|
||||
STRIP = strip
|
||||
CFLAGSNO = -Wall -Werror -g -I/usr/local/include
|
||||
CFLAGSNO = -pedantic -std=c99 -Wall -Werror -g -I/usr/local/include
|
||||
CFLAGS += $(CFLAGSNO) -O
|
||||
LDFLAGS = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Oliver Schmidt <ol.sc@web.de>
|
||||
*
|
||||
* $Id: wpcap.c,v 1.8 2007/05/22 22:01:03 oliverschmidt Exp $
|
||||
* $Id: wpcap.c,v 1.9 2007/11/17 18:08:15 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
|
|
@ -42,6 +42,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
#include <alloca.h>
|
||||
|
||||
/* Avoid 'conflicting types' errors. */
|
||||
#define htonl
|
||||
|
|
@ -207,10 +208,10 @@ wpcap_init(void)
|
|||
log_message("wpcap_init: cmdline address: ", inet_ntoa(addr));
|
||||
|
||||
wpcap = LoadLibrary("wpcap.dll");
|
||||
(FARPROC)pcap_findalldevs = GetProcAddress(wpcap, "pcap_findalldevs");
|
||||
(FARPROC)pcap_open_live = GetProcAddress(wpcap, "pcap_open_live");
|
||||
(FARPROC)pcap_next_ex = GetProcAddress(wpcap, "pcap_next_ex");
|
||||
(FARPROC)pcap_sendpacket = GetProcAddress(wpcap, "pcap_sendpacket");
|
||||
pcap_findalldevs = (int (*)(struct pcap_if **, char *))GetProcAddress(wpcap, "pcap_findalldevs");
|
||||
pcap_open_live = (struct pcap *(*)(char *, int, int, int, char *))GetProcAddress(wpcap, "pcap_open_live");
|
||||
pcap_next_ex = (int (*)(struct pcap *, struct pcap_pkthdr **, unsigned char **))GetProcAddress(wpcap, "pcap_next_ex");
|
||||
pcap_sendpacket = (int (*)(struct pcap *, unsigned char *, int))GetProcAddress(wpcap, "pcap_sendpacket");
|
||||
|
||||
if(pcap_findalldevs == NULL || pcap_open_live == NULL ||
|
||||
pcap_next_ex == NULL || pcap_sendpacket == NULL) {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: test-rucb.c,v 1.1 2007/09/27 22:21:27 adamdunkels Exp $
|
||||
* $Id: test-rucb.c,v 1.2 2007/11/17 18:09:56 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -46,11 +46,16 @@
|
|||
#include "dev/leds.h"
|
||||
|
||||
#include "cfs/cfs.h"
|
||||
|
||||
#include "lib/print-stats.h"
|
||||
#include "sys/profile.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#if NETSIM
|
||||
#include "ether.h"
|
||||
#include "node.h"
|
||||
#endif /* NETSIM */
|
||||
|
||||
#define FILESIZE 40000
|
||||
|
||||
static unsigned long bytecount;
|
||||
|
|
@ -87,7 +92,7 @@ read_chunk(struct rucb_conn *c, int offset, char *to, int maxsize)
|
|||
bytecount += size;
|
||||
|
||||
if(bytecount == FILESIZE) {
|
||||
printf("Completion time %u / %u\n", clock_time() - start_time, CLOCK_SECOND);
|
||||
printf("Completion time %lu / %u\n", (unsigned long)clock_time() - start_time, CLOCK_SECOND);
|
||||
/* profile_aggregates_print(); */
|
||||
/* profile_print_stats(); */
|
||||
print_stats();
|
||||
|
|
@ -104,7 +109,6 @@ static struct rucb_conn rucb;
|
|||
|
||||
PROCESS_THREAD(test_rucb_process, ev, data)
|
||||
{
|
||||
static int fd;
|
||||
PROCESS_EXITHANDLER(rucb_close(&rucb);)
|
||||
PROCESS_BEGIN();
|
||||
|
||||
|
|
@ -116,11 +120,11 @@ PROCESS_THREAD(test_rucb_process, ev, data)
|
|||
|
||||
PROCESS_PAUSE();
|
||||
|
||||
if(rimeaddr_node_addr.u8[0] == 10 &&
|
||||
if(rimeaddr_node_addr.u8[0] == 51 &&
|
||||
rimeaddr_node_addr.u8[1] == 0) {
|
||||
rimeaddr_t recv;
|
||||
|
||||
recv.u8[0] = 20;
|
||||
recv.u8[0] = 52;
|
||||
recv.u8[1] = 0;
|
||||
start_time = clock_time();
|
||||
rucb_send(&rucb, &recv);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: test-rudolph0.c,v 1.5 2007/05/22 21:04:19 adamdunkels Exp $
|
||||
* $Id: test-rudolph0.c,v 1.6 2007/11/17 18:09:56 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -39,6 +39,7 @@
|
|||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "cfs/cfs.h"
|
||||
#include "net/rime/rudolph0.h"
|
||||
|
||||
#include "dev/button-sensor.h"
|
||||
|
|
@ -55,7 +56,7 @@ AUTOSTART_PROCESSES(&test_rudolph0_process);
|
|||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
write_chunk(struct rudolph0_conn *c, int offset, int flag,
|
||||
char *data, int datalen)
|
||||
uint8_t *data, int datalen)
|
||||
{
|
||||
int fd;
|
||||
|
||||
|
|
@ -94,7 +95,7 @@ write_chunk(struct rudolph0_conn *c, int offset, int flag,
|
|||
}
|
||||
}
|
||||
static int
|
||||
read_chunk(struct rudolph0_conn *c, int offset, char *to, int maxsize)
|
||||
read_chunk(struct rudolph0_conn *c, int offset, uint8_t *to, int maxsize)
|
||||
{
|
||||
int fd;
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: test-rudolph1.c,v 1.7 2007/05/15 08:10:32 adamdunkels Exp $
|
||||
* $Id: test-rudolph1.c,v 1.8 2007/11/17 18:09:56 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -51,6 +51,11 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#if NETSIM
|
||||
#include "ether.h"
|
||||
#include "node.h"
|
||||
#endif /* NETSIM */
|
||||
|
||||
#define FILESIZE 2000
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
|
@ -59,7 +64,7 @@ AUTOSTART_PROCESSES(&test_rudolph1_process);
|
|||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
write_chunk(struct rudolph1_conn *c, int offset, int flag,
|
||||
char *data, int datalen)
|
||||
uint8_t *data, int datalen)
|
||||
{
|
||||
int fd;
|
||||
#if NETSIM
|
||||
|
|
@ -111,7 +116,7 @@ write_chunk(struct rudolph1_conn *c, int offset, int flag,
|
|||
}
|
||||
}
|
||||
static int
|
||||
read_chunk(struct rudolph1_conn *c, int offset, char *to, int maxsize)
|
||||
read_chunk(struct rudolph1_conn *c, int offset, uint8_t *to, int maxsize)
|
||||
{
|
||||
int fd;
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: test-rudolph2.c,v 1.1 2007/05/15 08:10:32 adamdunkels Exp $
|
||||
* $Id: test-rudolph2.c,v 1.2 2007/11/17 18:09:56 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -49,6 +49,11 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#if NETSIM
|
||||
#include "ether.h"
|
||||
#include "node.h"
|
||||
#endif /* NETSIM */
|
||||
|
||||
#define FILESIZE 2000
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
|
@ -57,7 +62,7 @@ AUTOSTART_PROCESSES(&test_rudolph2_process);
|
|||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
write_chunk(struct rudolph2_conn *c, int offset, int flag,
|
||||
char *data, int datalen)
|
||||
uint8_t *data, int datalen)
|
||||
{
|
||||
int fd;
|
||||
#if NETSIM
|
||||
|
|
@ -109,7 +114,7 @@ write_chunk(struct rudolph2_conn *c, int offset, int flag,
|
|||
}
|
||||
}
|
||||
static int
|
||||
read_chunk(struct rudolph2_conn *c, int offset, char *to, int maxsize)
|
||||
read_chunk(struct rudolph2_conn *c, int offset, uint8_t *to, int maxsize)
|
||||
{
|
||||
int fd;
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: test-cfs.c,v 1.2 2007/05/19 21:07:07 oliverschmidt Exp $
|
||||
* $Id: test-cfs.c,v 1.3 2007/11/17 18:10:54 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -41,6 +41,10 @@
|
|||
#include "contiki.h"
|
||||
#include "cfs/cfs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
PROCESS(cfs_process, "Test CFS process");
|
||||
AUTOSTART_PROCESSES(&cfs_process);
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PROCESS_THREAD(cfs_process, ev, data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: contiki-conf.h,v 1.5 2007/05/12 21:01:20 oliverschmidt Exp $
|
||||
* @(#)$Id: contiki-conf.h,v 1.6 2007/11/17 18:08:56 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
#ifndef __CONTIKI_CONF_H__
|
||||
|
|
@ -51,6 +51,7 @@ typedef uint32_t u32_t;
|
|||
typedef int32_t s32_t;
|
||||
typedef unsigned short uip_stats_t;
|
||||
|
||||
#define UIP_UDP 1
|
||||
#define UIP_CONF_MAX_CONNECTIONS 40
|
||||
#define UIP_CONF_MAX_LISTENPORTS 40
|
||||
#define UIP_CONF_BUFFER_SIZE 420
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: contiki-main.c,v 1.18 2007/11/15 13:11:42 nifi Exp $
|
||||
* $Id: contiki-main.c,v 1.19 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
|
|
@ -49,11 +49,13 @@
|
|||
#include "net/ethernode.h"
|
||||
#include "net/uip-over-mesh.h"
|
||||
|
||||
#include "net/mac/nullmac.h"
|
||||
|
||||
#include "ether.h"
|
||||
|
||||
/*#include <stdio.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>*/
|
||||
#include <unistd.h>
|
||||
|
||||
#include "dev/button-sensor.h"
|
||||
#include "dev/pir-sensor.h"
|
||||
|
|
@ -118,7 +120,7 @@ contiki_main(int flag)
|
|||
|
||||
rtimer_init();
|
||||
|
||||
autostart_start(autostart_processes);
|
||||
autostart_start((struct process **)autostart_processes);
|
||||
|
||||
while(1) {
|
||||
int n;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: eeprom.c,v 1.1 2006/06/17 22:41:36 adamdunkels Exp $
|
||||
* $Id: eeprom.c,v 1.2 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
#include "dev/eeprom.h"
|
||||
#include "node.h"
|
||||
|
|
@ -49,7 +49,7 @@ eeprom_write(eeprom_addr_t addr, unsigned char *buf, int size)
|
|||
int f;
|
||||
char name[400];
|
||||
|
||||
snprintf(name, sizeof(name), "eeprom.%d.%d", node_x(), node_y());
|
||||
sprintf(name, "eeprom.%d.%d", node_x(), node_y());
|
||||
f = open(name, O_WRONLY | O_APPEND | O_CREAT, 0644);
|
||||
lseek(f, addr, SEEK_SET);
|
||||
write(f, buf, size);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
||||
* OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: display.c,v 1.5 2007/04/02 17:58:43 adamdunkels Exp $
|
||||
* $Id: display.c,v 1.6 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
static GdkPixmap *pixmap = NULL;
|
||||
|
|
@ -87,12 +88,10 @@ static struct nodes_node *marked_node;
|
|||
void
|
||||
display_redraw(void)
|
||||
{
|
||||
int i, j;
|
||||
struct nodes_node *n, *m;
|
||||
char string[20];
|
||||
int i;
|
||||
struct nodes_node *n;
|
||||
int x, y;
|
||||
struct dot *d;
|
||||
GdkGC *color;
|
||||
|
||||
if(!window_is_open) {
|
||||
return;
|
||||
|
|
@ -503,7 +502,7 @@ display_init(void (* idlefunc)(void), int time, int with_gui)
|
|||
gtk_init(NULL, NULL);
|
||||
|
||||
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
gtk_window_set_title(window, "Contiki simulation display");
|
||||
gtk_window_set_title(GTK_WINDOW(window), "Contiki simulation display");
|
||||
|
||||
vbox = gtk_vbox_new(FALSE, 0);
|
||||
gtk_container_add(GTK_CONTAINER (window), vbox);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: ether.c,v 1.9 2007/11/14 11:17:30 nvt-se Exp $
|
||||
* $Id: ether.c,v 1.10 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
/**
|
||||
* \file
|
||||
|
|
@ -117,7 +117,7 @@ static int num_drops = 0;
|
|||
|
||||
static struct timeval t1;
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
int
|
||||
void
|
||||
ether_print_stats(void)
|
||||
{
|
||||
unsigned long time;
|
||||
|
|
@ -132,8 +132,6 @@ ether_print_stats(void)
|
|||
printf("Total collisions: %d\n", num_collisions);
|
||||
printf("Total packets receptions: %d\n", num_received);
|
||||
printf("Total randomly dropped packets: %d\n", num_drops);
|
||||
|
||||
return 0;
|
||||
}
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
void
|
||||
|
|
@ -178,7 +176,7 @@ ether_server_init(void)
|
|||
perror("ether_server_init: socket");
|
||||
}
|
||||
|
||||
bzero((char *)&sa, sizeof(sa));
|
||||
memset((char *)&sa, 0, sizeof(sa));
|
||||
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_addr.s_addr = inet_addr("127.0.0.1");/*htonl(INADDR_ANY);*/
|
||||
|
|
@ -206,7 +204,7 @@ ether_client_init(int port)
|
|||
perror("socket");
|
||||
}
|
||||
|
||||
bzero((char *)&sa, sizeof(sa));
|
||||
memset((char *)&sa, 0, sizeof(sa));
|
||||
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_addr.s_addr = inet_addr("127.0.0.1");/*htonl(INADDR_ANY);*/
|
||||
|
|
@ -322,7 +320,7 @@ ether_server_poll(void)
|
|||
case PTYPE_DATA:
|
||||
PRINTF("ether_poll: read %d bytes from (%d, %d)\n",
|
||||
ret, hdr->srcx, hdr->srcy);
|
||||
ether_put(rxbuffer, ret, hdr->srcx, hdr->srcy);
|
||||
ether_put((char *)rxbuffer, ret, hdr->srcx, hdr->srcy);
|
||||
break;
|
||||
case PTYPE_LEDS:
|
||||
nodes_set_leds(hdr->srcx, hdr->srcy, hdr->leds);
|
||||
|
|
@ -369,7 +367,7 @@ send_packet(char *data, int len, int port)
|
|||
{
|
||||
struct sockaddr_in sa;
|
||||
|
||||
bzero((char *)&sa , sizeof(sa));
|
||||
memset((char *)&sa, 0, sizeof(sa));
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_addr.s_addr = inet_addr("127.0.0.1");
|
||||
sa.sin_port = htons(port);
|
||||
|
|
@ -492,7 +490,7 @@ node_send_packet(char *data, int len)
|
|||
{
|
||||
struct sockaddr_in sa;
|
||||
|
||||
bzero((char *)&sa , sizeof(sa));
|
||||
memset((char *)&sa, 0, sizeof(sa));
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_addr.s_addr = inet_addr("127.0.0.1");
|
||||
sa.sin_port = htons(ETHER_PORT);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: ether.h,v 1.5 2007/03/22 18:59:34 adamdunkels Exp $
|
||||
* $Id: ether.h,v 1.6 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
#ifndef __ETHER_H__
|
||||
#define __ETHER_H__
|
||||
|
|
@ -67,6 +67,8 @@ void ether_put(char *packet, int len, int src_x, int src_y);
|
|||
void ether_send_sensor_data(struct sensor_data *d, int srcx, int srcy, int strength);
|
||||
|
||||
|
||||
int ether_client_poll(void);
|
||||
|
||||
struct ether_packet * ether_packets(void);
|
||||
|
||||
clock_time_t ether_time(void);
|
||||
|
|
@ -78,6 +80,6 @@ void ether_set_strength(int s);
|
|||
void ether_set_collisions(int c);
|
||||
void ether_set_drop_probability(double p);
|
||||
|
||||
int ether_print_stats(void);
|
||||
void ether_print_stats(void);
|
||||
|
||||
#endif /* __ETHER_H__ */
|
||||
|
|
|
|||
|
|
@ -28,11 +28,13 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: init.h,v 1.2 2006/10/06 08:25:30 adamdunkels Exp $
|
||||
* @(#)$Id: init.h,v 1.3 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
#ifndef __INIT_H__
|
||||
#define __INIT_H__
|
||||
|
||||
#include "ether.h"
|
||||
|
||||
void init(void);
|
||||
|
||||
int main_add_node(int x, int y);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: main.c,v 1.5 2007/03/22 18:59:34 adamdunkels Exp $
|
||||
* $Id: main.c,v 1.6 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -60,6 +60,8 @@
|
|||
#include <stdio.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
void netsim_init(void);
|
||||
|
||||
static int main_process = 0;
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
|
@ -118,7 +120,7 @@ start_node(int x, int y, int b)
|
|||
/* This is the sensor process. */
|
||||
main_process = 0;
|
||||
|
||||
srandom(getpid());
|
||||
srand(getpid());
|
||||
|
||||
usleep(1000 * (rand() % 1000));
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: ethernode.c,v 1.8 2007/05/22 21:09:19 adamdunkels Exp $
|
||||
* $Id: ethernode.c,v 1.9 2007/11/17 18:09:19 adamdunkels Exp $
|
||||
*/
|
||||
/**
|
||||
* \file
|
||||
|
|
@ -145,8 +145,8 @@ ethernode_poll(void)
|
|||
return ether_client_poll();
|
||||
}
|
||||
/*-------------------------------------------------------------------------------*/
|
||||
u16_t
|
||||
ethernode_read(u8_t *buf, u16_t bufsize)
|
||||
int
|
||||
ethernode_read(void *buf, unsigned short bufsize)
|
||||
{
|
||||
int len;
|
||||
u8_t tmpbuf[2048];
|
||||
|
|
@ -216,7 +216,7 @@ ethernode_send(void)
|
|||
}
|
||||
/*-------------------------------------------------------------------------------*/
|
||||
int
|
||||
ethernode_send_buf(const u8_t *buf, u16_t len)
|
||||
ethernode_send_buf(const void *buf, unsigned short len)
|
||||
{
|
||||
char tmpbuf[2048];
|
||||
struct hdr *hdr = (struct hdr *)tmpbuf;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: ethernode.h,v 1.3 2007/05/22 21:09:19 adamdunkels Exp $
|
||||
* $Id: ethernode.h,v 1.4 2007/11/17 18:09:19 adamdunkels Exp $
|
||||
*/
|
||||
#ifndef __ETHERNODE_H__
|
||||
#define __ETHERNODE_H__
|
||||
|
|
@ -40,9 +40,9 @@
|
|||
#include "dev/radio.h"
|
||||
|
||||
void ethernode_init(int port);
|
||||
u16_t ethernode_read(u8_t *buf, u16_t bufsize);
|
||||
int ethernode_read(void *buf, unsigned short bufsize);
|
||||
u8_t ethernode_send(void);
|
||||
int ethernode_send_buf(const u8_t *buf, u16_t len);
|
||||
int ethernode_send_buf(const void *buf, unsigned short len);
|
||||
void ethernode_periodic(void);
|
||||
void ethernode_set_receiver(void (* recv)(const struct radio_driver *));
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: node.c,v 1.7 2007/03/29 22:25:39 adamdunkels Exp $
|
||||
* $Id: node.c,v 1.8 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
#include "node.h"
|
||||
#include "contiki.h"
|
||||
|
|
@ -76,7 +76,7 @@ node_init(int id, int posx, int posy, int b)
|
|||
|
||||
|
||||
|
||||
drift = random() % 95726272;
|
||||
drift = rand() % 95726272;
|
||||
|
||||
init_node_log();
|
||||
}
|
||||
|
|
@ -141,9 +141,9 @@ node_log(const char *fmt, ...)
|
|||
char buf[4096];
|
||||
int len;
|
||||
|
||||
len = snprintf(buf, sizeof(buf), "Node %d (%d, %d): ", node.id, node.x, node.y);
|
||||
len = sprintf(buf, "Node %d (%d, %d): ", node.id, node.x, node.y);
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(&buf[len], sizeof(buf) - len, fmt, ap);
|
||||
vsprintf(&buf[len], fmt, ap);
|
||||
write(fd, buf, strlen(buf));
|
||||
va_end(ap);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,11 +30,12 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: nodes.c,v 1.4 2007/04/02 10:03:35 adamdunkels Exp $
|
||||
* $Id: nodes.c,v 1.5 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "nodes.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
* $Id: random.c,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $
|
||||
* $Id: random.c,v 1.2 2007/11/17 18:09:18 adamdunkels Exp $
|
||||
*/
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/*
|
||||
|
|
@ -41,19 +41,20 @@
|
|||
*
|
||||
*/
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
void
|
||||
random_init(void)
|
||||
{
|
||||
srandom(getpid());
|
||||
srand(getpid());
|
||||
}
|
||||
/*----------------------------------------------------------------------------*/
|
||||
unsigned short
|
||||
random_rand(void)
|
||||
{
|
||||
return (random() >> 4) & 0xffff;
|
||||
return (rand() >> 4) & 0xffff;
|
||||
}
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue