Merge remote branch 'libmc1322x/master'

Conflicts:
	cpu/mc1322x/board/redbee-econotag.h

cpu/mc1322x/lib/include/crm.h

@@ -220,6 +220,11 @@ struct CRM_struct {
 
 static volatile struct CRM_struct * const CRM = (void *) (CRM_BASE);
 
+/* COP watchdog timer helpers */
+
+/* set the cop timout in milliseconds */
+#define cop_timeout_ms(x) (CRM->COP_CNTLbits.COP_TIMEOUT = x/87) 
+#define cop_service() (CRM->COP_SERVICE = 0xc0de5afe)
 
 /* Old register definitions, for compatibility */
 #ifndef REG_NO_COMPAT

cpu/mc1322x/tests/Makefile

@@ -13,7 +13,8 @@ TARGETS := blink-red blink-green blink-blue blink-white blink-allio \
            printf \
 	   asm \
 	   adc \
-	   pwm
+	   pwm \
+           wdt
 
 # these targets are built with space reserved for variables needed by ROM services
 # this space is initialized with a rom call to rom_data_init

cpu/mc1322x/tests/wdt.c

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2010, Mariano Alvira <mar@devl.org> and other contributors
+ * to the MC1322x project (http://mc1322x.devl.org)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of libmc1322x: see http://mc1322x.devl.org
+ * for details. 
+ *
+ *
+ */
+
+#include <mc1322x.h>
+#include <board.h>
+#include <stdio.h>
+
+#include "config.h"
+
+#define DELAY 400000
+
+#define LED GPIO_LED_RED
+
+void main(void) {	
+	volatile uint32_t i;
+
+	uart1_init(INC,MOD,SAMP);
+
+	printf("reset\n\r");
+
+	/* set the watchdog timer timeout to 1 sec */
+	cop_timeout_ms(1000);
+
+	/* enable the watchdog timer */
+	CRM->COP_CNTLbits.COP_EN = 1;
+
+	GPIO->PAD_DIR.LED = 1;
+
+	while(1) {
+		/* uncomment cop_service for normal operation */
+		//cop_service();
+
+		GPIO->DATA.LED = 1;
+		
+		for(i=0; i<DELAY; i++) { continue; }
+		
+		GPIO->DATA.LED = 0;
+
+		for(i=0; i<DELAY; i++) { continue; }
+
+	};
+
+}
+

cpu/mc1322x/tools/mc1322x-load.pl

@@ -24,7 +24,7 @@ GetOptions ('file=s' => \$filename,
 	    'zerolen' => \$zerolen,
 	    'terminal=s' => \$term, 
 	    'verbose' => \$verbose, 
-	    'baud=s' => \$baud,
+	    'u|baud=s' => \$baud,
 	    'rts=s' => \$rts,
 	    'command=s' => \$command,
 	    'a=s' => \$first_delay,
@@ -41,8 +41,8 @@ if($filename eq '') {
     print "       -f required: binary file to load\n";
     print "       -s optional: secondary binary file to send\n";
     print "       -z optional: send a zero length file as secondary\n";
-    print "       -t terminal default: /dev/ttyUSB0\n";
+    print "       -t, terminal default: /dev/ttyUSB0\n";
-    print "       -b baud rate default: 115200\n";
+    print "       -u, --baud baud rate default: 115200\n";
     print "       -r [none|rts] flow control default: rts\n";
     print "       -c command to run for autoreset: \n";
     print "              e.g. -c 'bbmc -l redbee-econotag -i 0 reset'\n";