From ae271a7f2f0cb35d6968996d14caba3d40fde248 Mon Sep 17 00:00:00 2001 From: zhitao Date: Tue, 25 Nov 2008 09:20:54 +0000 Subject: [PATCH] replaced the TMOTE_SKY macros with CONTIKI_TARGET_SKY, in conformance to the latest target hint rules --- core/dev/ds2411.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/dev/ds2411.c b/core/dev/ds2411.c index ae6ed5430..e9125d344 100644 --- a/core/dev/ds2411.c +++ b/core/dev/ds2411.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: ds2411.c,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $ + * @(#)$Id: ds2411.c,v 1.2 2008/11/25 09:20:54 zhitao Exp $ */ /* * Device driver for the Dallas Semiconductor DS2411 chip. Heavily @@ -59,7 +59,7 @@ unsigned char ds2411_id[8]; -#ifdef TMOTE_SKY +#ifdef CONTIKI_TARGET_SKY /* 1-wire is at p2.4 */ #define PIN BV(4) @@ -97,7 +97,7 @@ unsigned char ds2411_id[8]; */ #define udelay_6() { _NOP(); _NOP(); _NOP(); _NOP(); _NOP(); } -#endif /* TMOTE_SKY */ +#endif /* CONTIKI_TARGET_SKY */ /* * Recommended delay times in us. @@ -213,12 +213,12 @@ ds2411_init() for (i = 7; i >= 2; i--) acc = crc8_add(acc, ds2411_id[i]); if (acc == crc) { -#ifdef TMOTE_SKY +#ifdef CONTIKI_TARGET_SKY /* 00:12:75 Moteiv # Moteiv Corporation */ ds2411_id[0] = 0x00; ds2411_id[1] = 0x12; ds2411_id[2] = 0x75; -#endif /* TMOTE_SKY */ +#endif /* CONTIKI_TARGET_SKY */ return 1; /* Success! */ } }