[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot/telos hardware.h, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/telos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv338/telos

Modified Files:
	hardware.h 
Log Message:
- Added mica2 support to TOSBoot for Deluge 2.0.



Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/telos/hardware.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hardware.h	17 Jul 2005 20:53:19 -0000	1.1
--- hardware.h	21 Jul 2005 18:54:26 -0000	1.2
***************
*** 1,4 ****
! #ifndef _H_hardware_h
! #define _H_hardware_h
  
  #include "msp430hardware.h"
--- 1,34 ----
! // $Id$
! 
! /*									tab:2
!  *
!  *
!  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
!  * All rights reserved.
!  *
!  * Permission to use, copy, modify, and distribute this software and its
!  * documentation for any purpose, without fee, and without written agreement is
!  * hereby granted, provided that the above copyright notice, the following
!  * two paragraphs and the author appear in all copies of this software.
!  * 
!  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
!  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
!  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
!  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!  * 
!  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
!  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
!  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
!  * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
!  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
!  *
!  */
! 
! /**
!  * @author Jonathan Hui <jwhui at cs.berkeley.edu>
!  */
! 
! #ifndef __HARDWARE_H__
! #define __HARDWARE_H__
  
  #include "msp430hardware.h"
***************
*** 8,15 ****
  }
  
- void jumpToTOSApp() {
-   __asm__ __volatile__ ("br #0x3000\n\t" ::);
- }
- 
  // LEDs
  TOSH_ASSIGN_PIN(RED_LED, 5, 4);
--- 38,41 ----
***************
*** 27,37 ****
  {
    //LEDS
-   TOSH_SET_RED_LED_PIN();
-   TOSH_SET_GREEN_LED_PIN();
-   TOSH_SET_YELLOW_LED_PIN();
    TOSH_MAKE_RED_LED_OUTPUT();
    TOSH_MAKE_GREEN_LED_OUTPUT();
    TOSH_MAKE_YELLOW_LED_OUTPUT();
! 
    //FLASH PINS
    TOSH_MAKE_FLASH_OUT_OUTPUT();
--- 53,60 ----
  {
    //LEDS
    TOSH_MAKE_RED_LED_OUTPUT();
    TOSH_MAKE_GREEN_LED_OUTPUT();
    TOSH_MAKE_YELLOW_LED_OUTPUT();
!   
    //FLASH PINS
    TOSH_MAKE_FLASH_OUT_OUTPUT();
***************
*** 44,47 ****
  }
  
! #endif // _H_hardware_h
! 
--- 67,69 ----
  }
  
! #endif