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

Removed the combined name of CSMA and NETSTACK_RDC. The name of NETSTACK_RDC can be accessed separately if needed.

Browse source
This commit is contained in:
nifi 2010-02-23 20:42:45 +00:00
parent c20047f657
commit 1cfcc8a73a
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/net/mac/csma.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: csma.c,v 1.7 2010/02/23 18:49:45 adamdunkels Exp $ * $Id: csma.c,v 1.8 2010/02/23 20:42:45 nifi Exp $
*/ */
/** /**
@ -256,21 +256,14 @@ channel_check_interval(void)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define NAMEBUF_LEN 16
static char namebuf[NAMEBUF_LEN];
static void static void
init(void) init(void)
{ {
memb_init(&packet_memb); memb_init(&packet_memb);
/* PRINTF("CSMA with MAC %s, channel check rate %d Hz\n", mac->name,
CLOCK_SECOND / channel_check_interval());*/
memcpy(namebuf, "CSMA ", 5);
memcpy(namebuf + 5, NETSTACK_RDC.name, NAMEBUF_LEN - 6);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct mac_driver csma_driver = { const struct mac_driver csma_driver = {
namebuf, "CSMA",
init, init,
send_packet, send_packet,
input_packet, input_packet,