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

API change for Rime: *_setup() renamed to *_open()

Browse source
This commit is contained in:
adamdunkels 2007-03-19 19:24:36 +00:00
parent a97285863e
commit 43326b5ae6
27 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/rime/abc.c
View file

@ -30,7 +30,7 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: abc.c,v 1.4 2007/03/15 21:24:11 adamdunkels Exp $
* $Id: abc.c,v 1.5 2007/03/19 19:24:36 adamdunkels Exp $
*/
/**
@ -56,7 +56,7 @@ LIST(channels);
/*---------------------------------------------------------------------------*/
void
abc_setup(struct abc_conn *c, u16_t channel,
abc_open(struct abc_conn *c, u16_t channel,
const struct abc_callbacks *callbacks)
{
c->channel = channel;

6
core/net/rime/abc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: abc.h,v 1.5 2007/03/15 21:24:29 adamdunkels Exp $
* $Id: abc.h,v 1.6 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -77,7 +77,7 @@ struct abc_conn {
* when a packet arrives on the channel.
*
*/
void abc_setup(struct abc_conn *c, u16_t channel,
void abc_open(struct abc_conn *c, u16_t channel,
const struct abc_callbacks *u);
/**
@ -90,7 +90,7 @@ void abc_setup(struct abc_conn *c, u16_t channel,
* before this function is called.
*
* The parameter c must point to an abc connection that
* must have previously been set up with abc_setup().
* must have previously been set up with abc_open().
*
*/
int abc_send(struct abc_conn *c);

6
core/net/rime/ccsabc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ccsabc.c,v 1.2 2007/03/15 10:01:04 adamdunkels Exp $
* $Id: ccsabc.c,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -65,10 +65,10 @@ sent_from_sabc(struct sabc_conn *sabc)
static const struct sabc_callbacks ccsabc = {recv_from_sabc, sent_from_sabc};
/*---------------------------------------------------------------------------*/
void
ccsabc_setup(struct ccsabc_conn *c, u16_t channel,
ccsabc_open(struct ccsabc_conn *c, u16_t channel,
const struct ccsabc_callbacks *u)
{
sabc_setup(&c->c, channel, &ccsabc);
sabc_open(&c->c, channel, &ccsabc);
}
/*---------------------------------------------------------------------------*/
int

4
core/net/rime/ccsabc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ccsabc.h,v 1.2 2007/03/15 10:01:04 adamdunkels Exp $
* $Id: ccsabc.h,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -58,7 +58,7 @@ struct ccsabc_conn {
unsigned char c;
};
void ccsabc_setup(struct ccsabc_conn *c, u16_t channel,
void ccsabc_open(struct ccsabc_conn *c, u16_t channel,
const struct ccsabc_callbacks *u);
int ccsabc_send_stubborn(struct ccsabc_conn *c, clock_time_t t);

6
core/net/rime/ibc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ibc.c,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: ibc.c,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -64,10 +64,10 @@ recv_from_abc(struct abc_conn *bc)
static const struct abc_callbacks ibc = {recv_from_abc};
/*---------------------------------------------------------------------------*/
void
ibc_setup(struct ibc_conn *c, u16_t channel,
ibc_open(struct ibc_conn *c, u16_t channel,
const struct ibc_callbacks *u)
{
abc_setup(&c->c, channel, &ibc);
abc_open(&c->c, channel, &ibc);
c->u = u;
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/ibc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ibc.h,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: ibc.h,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -55,7 +55,7 @@ struct ibc_conn {
const struct ibc_callbacks *u;
};
void ibc_setup(struct ibc_conn *c, u16_t channel,
void ibc_open(struct ibc_conn *c, u16_t channel,
const struct ibc_callbacks *u);
int ibc_send(struct ibc_conn *c);

10
core/net/rime/mesh.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: mesh.c,v 1.2 2007/03/15 20:04:30 adamdunkels Exp $
* $Id: mesh.c,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -281,12 +281,12 @@ static const struct uc_callbacks rrep_callbacks = {rrep_packet_received};
static const struct nf_callbacks rreq_callbacks = {rreq_packet_received, NULL};
/*---------------------------------------------------------------------------*/
void
mesh_setup(const struct mesh_callbacks *callbacks,
mesh_open(const struct mesh_callbacks *callbacks,
void (* send_datapacket)(rimeaddr_t *next))
{
uc_setup(&mc.dataconn, CHANNEL_MESH_DATA, &data_callbacks);
uc_setup(&mc.rrepconn, CHANNEL_MESH_RREP, &rrep_callbacks);
nf_setup(&mc.rreqconn, CHANNEL_MESH_RREQ, &rreq_callbacks);
uc_open(&mc.dataconn, CHANNEL_MESH_DATA, &data_callbacks);
uc_open(&mc.rrepconn, CHANNEL_MESH_RREP, &rrep_callbacks);
nf_open(&mc.rreqconn, CHANNEL_MESH_RREQ, &rreq_callbacks);
mc.cb = callbacks;
send_datapacket_handler = send_datapacket;

4
core/net/rime/mesh.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: mesh.h,v 1.2 2007/03/15 20:04:30 adamdunkels Exp $
* $Id: mesh.h,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -48,7 +48,7 @@ struct mesh_callbacks {
void (* recv)(rimeaddr_t *from);
};
void mesh_setup(const struct mesh_callbacks *callbacks,
void mesh_open(const struct mesh_callbacks *callbacks,
void (* data_send_function)(rimeaddr_t *next));
int mesh_send(rimeaddr_t *dest);

6
core/net/rime/nf.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: nf.c,v 1.4 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: nf.c,v 1.5 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -150,10 +150,10 @@ recv_from_ibc(struct ibc_conn *ibc, rimeaddr_t *from)
static const struct ibc_callbacks nf = {recv_from_ibc};
/*---------------------------------------------------------------------------*/
void
nf_setup(struct nf_conn *c, u16_t channel,
nf_open(struct nf_conn *c, u16_t channel,
const struct nf_callbacks *u)
{
ibc_setup(&c->c, channel, &nf);
ibc_open(&c->c, channel, &nf);
c->u = u;
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/nf.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: nf.h,v 1.4 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: nf.h,v 1.5 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -63,7 +63,7 @@ struct nf_conn {
const struct nf_callbacks *u;
};
void nf_setup(struct nf_conn *c, u16_t channel,
void nf_open(struct nf_conn *c, u16_t channel,
const struct nf_callbacks *u);
int nf_send(struct nf_conn *c);

6
core/net/rime/rbc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rbc.c,v 1.1 2007/02/28 16:38:52 adamdunkels Exp $
* $Id: rbc.c,v 1.2 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -64,10 +64,10 @@ PROCESS_THREAD(rbc_process, ev, data)
}
/*---------------------------------------------------------------------------*/
void
rbc_setup(struct rbc_conn *c, u16_t id)
rbc_open(struct rbc_conn *c, u16_t id)
{
PROCESS_CONTEXT_BEGIN(&rbc_process);
llbc_setup(&c->c, id);
llbc_open(&c->c, id);
PROCESS_CONTEXT_END(&rbc_process);
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/rbc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rbc.h,v 1.1 2007/02/28 16:38:52 adamdunkels Exp $
* $Id: rbc.h,v 1.2 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -49,7 +49,7 @@ struct rbc_conn {
u16_t num_acked;
};
void rbc_setup(struct rbc_conn *c, u16_t channel);
void rbc_open(struct rbc_conn *c, u16_t channel);
int rbc_send(struct rbc_conn *c, struct lcpbuf *buf);
int rbc_received(struct rbc_conn *c, u8_t **data, u16_t *len);

6
core/net/rime/ruc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ruc.c,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: ruc.c,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -113,10 +113,10 @@ recv_from_suc(struct suc_conn *suc, rimeaddr_t *from)
static const struct suc_callbacks ruc = {recv_from_suc, sent_by_suc};
/*---------------------------------------------------------------------------*/
void
ruc_setup(struct ruc_conn *c, u16_t channel,
ruc_open(struct ruc_conn *c, u16_t channel,
const struct ruc_callbacks *u)
{
suc_setup(&c->c, channel, &ruc);
suc_open(&c->c, channel, &ruc);
c->u = u;
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/ruc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ruc.h,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: ruc.h,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -56,7 +56,7 @@ struct ruc_conn {
u8_t state;
};
void ruc_setup(struct ruc_conn *c, u16_t channel,
void ruc_open(struct ruc_conn *c, u16_t channel,
const struct ruc_callbacks *u);
int ruc_send(struct ruc_conn *c, rimeaddr_t *receiver);

6
core/net/rime/sabc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: sabc.c,v 1.2 2007/03/15 10:01:04 adamdunkels Exp $
* $Id: sabc.c,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -57,10 +57,10 @@ recv_from_abc(struct abc_conn *abc)
static const struct abc_callbacks sabc = {recv_from_abc};
/*---------------------------------------------------------------------------*/
void
sabc_setup(struct sabc_conn *c, u16_t channel,
sabc_open(struct sabc_conn *c, u16_t channel,
const struct sabc_callbacks *u)
{
abc_setup(&c->c, channel, &sabc);
abc_open(&c->c, channel, &sabc);
c->u = u;
}
/*---------------------------------------------------------------------------*/

12
core/net/rime/sabc.h
View file

@ -44,7 +44,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: sabc.h,v 1.2 2007/03/15 10:01:04 adamdunkels Exp $
* $Id: sabc.h,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -70,7 +70,7 @@ struct sabc_callbacks {
/**
* A sabc connection. This is an opaque structure with no user-visible
* fields. The sabc_setup() function is used for setting up a sabc
* fields. The sabc_open() function is used for setting up a sabc
* connection.
*/
struct sabc_conn {
@ -96,14 +96,14 @@ struct sabc_conn {
* that operates on the connection is called.
*
*/
void sabc_setup(struct sabc_conn *c, u16_t channel,
void sabc_open(struct sabc_conn *c, u16_t channel,
const struct sabc_callbacks *u);
/**
* \brief Send a stubborn message.
* \param c A sabc connection that must have been previously set up
* with sabc_setup()
* with sabc_open()
* \param t The time between message retransmissions.
*
* This function sends a message from the Rime buffer. The
@ -121,7 +121,7 @@ int sabc_send_stubborn(struct sabc_conn *c, clock_time_t t);
/**
* \brief Cancel the current stubborn message.
* \param c A sabc connection that must have been previously set up
* with sabc_setup()
* with sabc_open()
*
* This function cancels a stubborn message that has
* previously been sent with the sabc_send_stubborn()
@ -135,7 +135,7 @@ void sabc_cancel(struct sabc_conn *c);
/**
* \brief Set the retransmission time of the current stubborn message.
* \param c A sabc connection that must have been previously set up
* with sabc_setup()
* with sabc_open()
* \param t The new time between message retransmissions.
*
* This function sets the retransmission timer for the

6
core/net/rime/sibc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: sibc.c,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: sibc.c,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -56,10 +56,10 @@ recv_from_ibc(struct ibc_conn *ibc, rimeaddr_t *from)
static const struct ibc_callbacks sibc = {recv_from_ibc};
/*---------------------------------------------------------------------------*/
void
sibc_setup(struct sibc_conn *c, u16_t channel,
sibc_open(struct sibc_conn *c, u16_t channel,
const struct sibc_callbacks *u)
{
ibc_setup(&c->c, channel, &sibc);
ibc_open(&c->c, channel, &sibc);
c->u = u;
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/sibc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: sibc.h,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: sibc.h,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -59,7 +59,7 @@ struct sibc_conn {
const struct sibc_callbacks *u;
};
void sibc_setup(struct sibc_conn *c, u16_t channel,
void sibc_open(struct sibc_conn *c, u16_t channel,
const struct sibc_callbacks *u);
int sibc_send_stubborn(struct sibc_conn *c, clock_time_t t);

6
core/net/rime/suc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: suc.c,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: suc.c,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -56,10 +56,10 @@ recv_from_uc(struct uc_conn *uc, rimeaddr_t *from)
static const struct uc_callbacks suc = {recv_from_uc};
/*---------------------------------------------------------------------------*/
void
suc_setup(struct suc_conn *c, u16_t channel,
suc_open(struct suc_conn *c, u16_t channel,
const struct suc_callbacks *u)
{
uc_setup(&c->c, channel, &suc);
uc_open(&c->c, channel, &suc);
c->u = u;
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/suc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: suc.h,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: suc.h,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -60,7 +60,7 @@ struct suc_conn {
rimeaddr_t receiver;
};
void suc_setup(struct suc_conn *c, u16_t channel,
void suc_open(struct suc_conn *c, u16_t channel,
const struct suc_callbacks *u);
int suc_send_stubborn(struct suc_conn *c, rimeaddr_t *receiver);

8
core/net/rime/tree.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: tree.c,v 1.2 2007/03/15 21:25:06 adamdunkels Exp $
* $Id: tree.c,v 1.3 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -181,10 +181,10 @@ static const struct ruc_callbacks ruc_callbacks = {node_packet_received,
node_packet_sent};
/*---------------------------------------------------------------------------*/
void
tree_setup(const struct tree_callbacks *cb)
tree_open(const struct tree_callbacks *cb)
{
sibc_setup(&sibc_conn, CHANNEL_TREE_META, &sibc_callbacks);
ruc_setup(&ruc_conn, CHANNEL_TREE_DATA, &ruc_callbacks);
sibc_open(&sibc_conn, CHANNEL_TREE_META, &sibc_callbacks);
ruc_open(&ruc_conn, CHANNEL_TREE_DATA, &ruc_callbacks);
tc.hello.hopcount = HOPCOUNT_MAX;
rimebuf_clear();
rimebuf_reference(&tc.hello, sizeof(tc.hello));

4
core/net/rime/tree.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: tree.h,v 1.1 2007/03/15 20:04:30 adamdunkels Exp $
* $Id: tree.h,v 1.2 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -46,7 +46,7 @@ struct tree_callbacks {
u8_t hops, u8_t retransmissions);
};
void tree_setup(const struct tree_callbacks *callbacks);
void tree_open(const struct tree_callbacks *callbacks);
void tree_send(void);

6
core/net/rime/uc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: uc.c,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: uc.c,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -63,10 +63,10 @@ recv_from_ibc(struct ibc_conn *ibc, rimeaddr_t *from)
static const struct ibc_callbacks uc = {recv_from_ibc};
/*---------------------------------------------------------------------------*/
void
uc_setup(struct uc_conn *c, u16_t channel,
uc_open(struct uc_conn *c, u16_t channel,
const struct uc_callbacks *u)
{
ibc_setup(&c->c, channel, &uc);
ibc_open(&c->c, channel, &uc);
c->u = u;
}
/*---------------------------------------------------------------------------*/

4
core/net/rime/uc.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: uc.h,v 1.3 2007/03/15 19:43:07 adamdunkels Exp $
* $Id: uc.h,v 1.4 2007/03/19 19:24:37 adamdunkels Exp $
*/
/**
@ -54,7 +54,7 @@ struct uc_conn {
const struct uc_callbacks *u;
};
void uc_setup(struct uc_conn *c, u16_t channel,
void uc_open(struct uc_conn *c, u16_t channel,
const struct uc_callbacks *u);
int uc_send(struct uc_conn *c, rimeaddr_t *receiver);

4
examples/meshroute/test-abc.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: test-abc.c,v 1.1 2007/03/15 22:11:11 adamdunkels Exp $
* $Id: test-abc.c,v 1.2 2007/03/19 19:24:36 adamdunkels Exp $
*/
/**
@ -62,7 +62,7 @@ PROCESS_THREAD(test_abc_process, ev, data)
{
PROCESS_BEGIN();
abc_setup(&abc, 128, &abc_call);
abc_open(&abc, 128, &abc_call);
while(1) {
static struct etimer et;

4
examples/meshroute/test-meshroute.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: test-meshroute.c,v 1.1 2007/03/15 22:06:19 adamdunkels Exp $
* $Id: test-meshroute.c,v 1.2 2007/03/19 19:24:36 adamdunkels Exp $
*/
/**
@ -71,7 +71,7 @@ PROCESS_THREAD(test_mesh_process, ev, data)
{
PROCESS_BEGIN();
mesh_setup(&callbacks, NULL);
mesh_open(&callbacks, NULL);
button_sensor.activate();

4
examples/treeroute/test-treeroute.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: test-treeroute.c,v 1.1 2007/03/15 22:03:58 adamdunkels Exp $
* $Id: test-treeroute.c,v 1.2 2007/03/19 19:24:36 adamdunkels Exp $
*/
/**
@ -83,7 +83,7 @@ PROCESS_THREAD(test_tree_process, ev, data)
{
PROCESS_BEGIN();
tree_setup(NULL);
tree_open(NULL);
while(1) {