From 1cfcc8a73adb7e3d9c6e040ef519a3df84817c63 Mon Sep 17 00:00:00 2001 From: nifi Date: Tue, 23 Feb 2010 20:42:45 +0000 Subject: [PATCH] Removed the combined name of CSMA and NETSTACK_RDC. The name of NETSTACK_RDC can be accessed separately if needed. --- core/net/mac/csma.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c index d7a041c02..00204c2b6 100644 --- a/core/net/mac/csma.c +++ b/core/net/mac/csma.c @@ -28,7 +28,7 @@ * * 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; } /*---------------------------------------------------------------------------*/ -#define NAMEBUF_LEN 16 -static char namebuf[NAMEBUF_LEN]; static void init(void) { 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 = { - namebuf, + "CSMA", init, send_packet, input_packet,