From 671629dea0331a72bb13c977d01a4adc078e74a9 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Mon, 29 Mar 2010 11:48:09 +0000 Subject: [PATCH] moved packet_sent function, it was in a HC06-specific unit --- core/net/sicslowpan.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/core/net/sicslowpan.c b/core/net/sicslowpan.c index 0c64271fd..68025e82c 100644 --- a/core/net/sicslowpan.c +++ b/core/net/sicslowpan.c @@ -32,7 +32,7 @@ * * This file is part of the Contiki operating system. * - * $Id: sicslowpan.c,v 1.34 2010/03/26 12:29:29 nifi Exp $ + * $Id: sicslowpan.c,v 1.35 2010/03/29 11:48:09 fros4943 Exp $ */ /** * \file @@ -302,18 +302,6 @@ addr_context_lookup_by_number(u8_t number) { #endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 0 */ return NULL; } -/*--------------------------------------------------------------------*/ -/** - * Callback function for the MAC packet sent callback - */ -static void -packet_sent(void *ptr, int status, int transmissions) -{ -#if SICSLOWPAN_CONF_NEIGHBOR_INFO - neighbor_info_packet_sent(status, transmissions); -#endif /* SICSLOWPAN_CONF_NEIGHBOR_INFO */ -} - /*--------------------------------------------------------------------*/ static void compress_addr_64(uint8_t bitpos, uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr) { @@ -1294,6 +1282,17 @@ compress_hdr_ipv6(rimeaddr_t *rime_destaddr) { /** \name Input/output functions common to all compression schemes * @{ */ /*--------------------------------------------------------------------*/ +/** + * Callback function for the MAC packet sent callback + */ +static void +packet_sent(void *ptr, int status, int transmissions) +{ +#if SICSLOWPAN_CONF_NEIGHBOR_INFO + neighbor_info_packet_sent(status, transmissions); +#endif /* SICSLOWPAN_CONF_NEIGHBOR_INFO */ +} +/*--------------------------------------------------------------------*/ /** * \brief This function is called by the 6lowpan code to send out a * packet.