Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-07-29 13:28:58 +00:00
Code Issues Projects Releases Wiki Activity

fixed conflicting types: nbh.c vs nbh.h

Browse Source
This commit is contained in:
fros4943 2007-11-15 08:10:42 +00:00
parent 33e565d20a
commit c645cad175
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/net/rime/nbh.c
View File

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: nbh.c,v 1.1 2007/11/13 21:01:54 adamdunkels Exp $ * $Id: nbh.c,v 1.2 2007/11/15 08:10:42 fros4943 Exp $
*/ */
/** /**
@ -139,7 +139,7 @@ static const struct ibc_callbacks ibc_callbacks =
{adv_packet_received}; {adv_packet_received};
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
nbh_open(struct nbh_conn *c, u16_t channel, nbh_open(struct nbh_conn *c, uint16_t channel,
const struct nbh_callbacks *cb) const struct nbh_callbacks *cb)
{ {
ibc_open(&c->c, channel, &ibc_callbacks); ibc_open(&c->c, channel, &ibc_callbacks);
@ -154,7 +154,7 @@ nbh_close(struct nbh_conn *c)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
nbh_start(struct nbh_conn *c, u16_t val) nbh_start(struct nbh_conn *c, uint16_t val)
{ {
c->val = val; c->val = val;
ctimer_set(&c->t, random_rand() % MIN_INTERVAL, send_timer, c); ctimer_set(&c->t, random_rand() % MIN_INTERVAL, send_timer, c);