[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge TOSBoot.h, NONE, 1.1 Deluge.h, 1.11, 1.12 NetProg.h, 1.5, 1.6 NetProgM.nc, 1.12, 1.13

[Jonathan Hui]

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

Modified Files:
	Deluge.h NetProg.h NetProgM.nc 
Added Files:
	TOSBoot.h 
Log Message:
- Added support for mica2 platform.



--- NEW FILE: TOSBoot.h ---
// $Id: TOSBoot.h,v 1.1 2005/07/21 19:18:13 jwhui Exp $

/*									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 __TOSBOOT_H__
#define __TOSBOOT_H__

#include "TOSBoot_platform.h"

typedef struct tosboot_args_t {
  uint32_t imageAddr;
  uint8_t  gestureCount;
  bool     noReprogram;
} tosboot_args_t;

#endif

Index: Deluge.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/Deluge.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Deluge.h	17 Jul 2005 21:09:28 -0000	1.11
--- Deluge.h	21 Jul 2005 19:18:13 -0000	1.12
***************
*** 1,8 ****
  // $Id$
  
! /*									tab:4
   *
   *
!  * "Copyright (c) 2000-2004 The Regents of the University  of California.  
   * All rights reserved.
   *
--- 1,8 ----
  // $Id$
  
! /*									tab:2
   *
   *
!  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
   * All rights reserved.
   *
***************
*** 33,36 ****
--- 33,37 ----
  
  #include "DelugeMetadata.h"
+ #include "TOSBoot.h"
  
  #ifndef DELUGE_NUM_IMAGES
***************
*** 40,44 ****
  enum {
    DELUGE_VERSION                    = 2,
-   DELUGE_MIN_ADV_PERIOD_LOG2        = 8,
    DELUGE_MAX_ADV_PERIOD_LOG2        = 20,
    DELUGE_NUM_NEWDATA_ADVS_REQUIRED  = 2,
--- 41,44 ----

Index: NetProg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/NetProg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NetProg.h	17 Jul 2005 21:09:37 -0000	1.5
--- NetProg.h	21 Jul 2005 19:18:13 -0000	1.6
***************
*** 1,8 ****
  // $Id$
  
! /*									tab:4
   *
   *
!  * "Copyright (c) 2000-2004 The Regents of the University  of California.  
   * All rights reserved.
   *
--- 1,8 ----
  // $Id$
  
! /*									tab:2
   *
   *
!  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
   * All rights reserved.
   *
***************
*** 26,31 ****
  
  /**
-  * Allows rebooting of multiple images.
-  *
   * @author Jonathan Hui <jwhui at cs.berkeley.edu>
   */
--- 26,29 ----
***************
*** 34,37 ****
--- 32,37 ----
  #define __NETPROG_H__
  
+ #include "NetProg_platform.h"
+ 
  #ifndef IDENT_UID_HASH
  #define IDENT_UID_HASH 0
***************
*** 40,48 ****
  static const uint32_t DELUGE_IMAGE_UID = IDENT_UID_HASH;
  
- enum {
-   IFLASH_TOS_INFO_ADDR = 0x60,  // 6 bytes
-   IFLASH_NODE_DESC_ADDR = 0x66, // 10 bytes
- };
- 
  typedef struct NetProg_TOSInfo {
    uint16_t addr;
--- 40,43 ----
***************
*** 51,56 ****
  } NetProg_TOSInfo;
  
- #define NETPROG_DISABLE_WDT()    WDTCTL = WDTPW + WDTHOLD;
- #define NETPROG_ACTUAL_REBOOT()  WDTCTL = WDT_ARST_1_9; while(1);
- 
  #endif
--- 46,48 ----

Index: NetProgM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/NetProgM.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NetProgM.nc	17 Jul 2005 21:09:37 -0000	1.12
--- NetProgM.nc	21 Jul 2005 19:18:13 -0000	1.13
***************
*** 101,107 ****
  #ifndef PLATFORM_PC
      atomic {
-       NETPROG_DISABLE_WDT();
        writeTOSinfo();
!       NETPROG_ACTUAL_REBOOT();
      }
  #endif
--- 101,106 ----
  #ifndef PLATFORM_PC
      atomic {
        writeTOSinfo();
!       netprog_reboot();
      }
  #endif
***************
*** 115,119 ****
      
      atomic {
-       NETPROG_DISABLE_WDT();
        writeTOSinfo();
        
--- 114,117 ----
***************
*** 124,128 ****
        
        // reboot
!       NETPROG_ACTUAL_REBOOT();
      }
  #endif
--- 122,126 ----
        
        // reboot
!       netprog_reboot();
      }
  #endif